From 790e18d98a72ac87a5d824166bee1f2093789383 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Sun, 21 Apr 2024 08:32:57 +0200 Subject: [PATCH] fix selection ranges on elixir 1.16.2 the fix for map position did not make it to the release --- apps/language_server/lib/language_server/ast_utils.ex | 2 +- .../lib/language_server/providers/selection_ranges.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/language_server/lib/language_server/ast_utils.ex b/apps/language_server/lib/language_server/ast_utils.ex index ba474c7f0..d9c0305f3 100644 --- a/apps/language_server/lib/language_server/ast_utils.ex +++ b/apps/language_server/lib/language_server/ast_utils.ex @@ -130,7 +130,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do cond do form == :%{} -> column = - if Version.match?(System.version(), "< 1.16.2") do + if Version.match?(System.version(), "< 1.17.0") do # workaround elixir bug # https://github.com/elixir-lang/elixir/commit/fd4e6b530c0e010712b06909c89820b08e49c238 column - 1 diff --git a/apps/language_server/lib/language_server/providers/selection_ranges.ex b/apps/language_server/lib/language_server/providers/selection_ranges.ex index 574b9d0ac..91f5a33bf 100644 --- a/apps/language_server/lib/language_server/providers/selection_ranges.ex +++ b/apps/language_server/lib/language_server/providers/selection_ranges.ex @@ -362,7 +362,7 @@ defmodule ElixirLS.LanguageServer.Providers.SelectionRanges do range(start_line, start_character, end_line, end_character) -> start_character = if match?({:%{}, _, _}, ast) and match?({:%, _, _}, parent_ast_from_stack) and - Version.match?(System.version(), "< 1.16.2") do + Version.match?(System.version(), "< 1.17.0") do # workaround elixir bug # https://github.com/elixir-lang/elixir/commit/fd4e6b530c0e010712b06909c89820b08e49c238 # undo column offset for structs inner map node