From 0f569174fd256d78b416606c0b380f0241985285 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Sun, 13 Feb 2022 23:12:50 +0100 Subject: [PATCH 1/2] add utility functions for utf8-utf16 conversions --- .../lib/language_server/source_file.ex | 65 +++++++++++++++++-- .../language_server/test/source_file_test.exs | 53 +++++++++++++++ 2 files changed, 114 insertions(+), 4 deletions(-) diff --git a/apps/language_server/lib/language_server/source_file.ex b/apps/language_server/lib/language_server/source_file.ex index 5d3782623..5f02ea1c4 100644 --- a/apps/language_server/lib/language_server/source_file.ex +++ b/apps/language_server/lib/language_server/source_file.ex @@ -172,10 +172,7 @@ defmodule ElixirLS.LanguageServer.SourceFile do |> List.last() |> line_length_utf16() - %{ - "start" => %{"line" => 0, "character" => 0}, - "end" => %{"line" => Enum.count(lines) - 1, "character" => utf16_size} - } + range(0, 0, Enum.count(lines) - 1, utf16_size) end def line_length_utf16(line) do @@ -373,4 +370,64 @@ defmodule ElixirLS.LanguageServer.SourceFile do end defp remove_indentation(lines, _), do: lines + + def lsp_character_to_elixir(_utf8_line, lsp_character) when lsp_character <= 0, do: 1 + + def lsp_character_to_elixir(utf8_line, lsp_character) do + utf16_line = + utf8_line + |> characters_to_binary!(:utf8, :utf16) + + byte_size = byte_size(utf16_line) + + # if character index is over the length of the string assume we pad it with spaces (1 byte in utf8) + diff = div(max(lsp_character * 2 - byte_size, 0), 2) + + utf8_character = + utf16_line + |> (&binary_part( + &1, + 0, + min(lsp_character * 2, byte_size) + )).() + |> characters_to_binary!(:utf16, :utf8) + |> String.length() + + utf8_character + 1 + diff + end + + def lsp_position_to_elixr(_urf8_text, {lsp_line, lsp_character}) when lsp_character <= 0, + do: {max(lsp_line + 1, 1), 1} + + def lsp_position_to_elixr(urf8_text, {lsp_line, lsp_character}) do + utf8_character = + lines(urf8_text) + |> Enum.at(max(lsp_line, 0)) + |> lsp_character_to_elixir(lsp_character) + + {lsp_line + 1, utf8_character} + end + + def elixir_character_to_lsp(_utf8_line, elixir_character) when elixir_character <= 1, do: 0 + + def elixir_character_to_lsp(utf8_line, elixir_character) do + utf8_line + |> String.slice(0..(elixir_character - 2)) + |> characters_to_binary!(:utf8, :utf16) + |> byte_size() + |> div(2) + end + + def elixir_position_to_lsp(_urf8_text, {elixir_line, elixir_character}) + when elixir_character <= 1, + do: {max(elixir_line - 1, 0), 0} + + def elixir_position_to_lsp(urf8_text, {elixir_line, elixir_character}) do + utf16_character = + lines(urf8_text) + |> Enum.at(max(elixir_line - 1, 0)) + |> elixir_character_to_lsp(elixir_character) + + {elixir_line - 1, utf16_character} + end end diff --git a/apps/language_server/test/source_file_test.exs b/apps/language_server/test/source_file_test.exs index f5b79a56a..6a79087d8 100644 --- a/apps/language_server/test/source_file_test.exs +++ b/apps/language_server/test/source_file_test.exs @@ -822,4 +822,57 @@ defmodule ElixirLS.LanguageServer.SourceFileTest do end end end + + describe "positions" do + test "lsp_position_to_elixr empty" do + assert {1, 1} == SourceFile.lsp_position_to_elixr("", {0, 0}) + end + + test "lsp_position_to_elixr single first char" do + assert {1, 1} == SourceFile.lsp_position_to_elixr("abcde", {0, 0}) + end + + test "lsp_position_to_elixr single line" do + assert {1, 2} == SourceFile.lsp_position_to_elixr("abcde", {0, 1}) + end + + test "lsp_position_to_elixr single line utf8" do + assert {1, 2} == SourceFile.lsp_position_to_elixr("🏳️‍🌈abcde", {0, 6}) + end + + test "lsp_position_to_elixr multi line" do + assert {2, 2} == SourceFile.lsp_position_to_elixr("abcde\n1234", {1, 1}) + end + + test "elixir_position_to_lsp empty" do + assert {0, 0} == SourceFile.elixir_position_to_lsp("", {1, 1}) + end + + test "elixir_position_to_lsp single line first char" do + assert {0, 0} == SourceFile.elixir_position_to_lsp("abcde", {1, 1}) + end + + test "elixir_position_to_lsp single line" do + assert {0, 1} == SourceFile.elixir_position_to_lsp("abcde", {1, 2}) + end + + test "elixir_position_to_lsp single line utf8" do + assert {0, 6} == SourceFile.elixir_position_to_lsp("🏳️‍🌈abcde", {1, 2}) + end + + test "elixir_position_to_lsp multi line" do + assert {1, 1} == SourceFile.elixir_position_to_lsp("abcde\n1234", {2, 2}) + end + + test "sanity check" do + text = "aąłsd🏳️‍🌈abcde" + + for i <- 0..String.length(text) do + elixir_pos = {1, i + 1} + lsp_pos = SourceFile.elixir_position_to_lsp(text, elixir_pos) + + assert elixir_pos == SourceFile.lsp_position_to_elixr(text, lsp_pos) + end + end + end end From cf5e28275eae45967a1a691e0cf4745a94ec74c5 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Sun, 13 Feb 2022 23:13:34 +0100 Subject: [PATCH 2/2] fix numerous cases of incorrect utf16 positions --- .../lib/language_server/build.ex | 22 +- .../lib/language_server/protocol/location.ex | 26 +- .../language_server/providers/code_lens.ex | 1 + .../language_server/providers/completion.ex | 14 +- .../language_server/providers/definition.ex | 8 +- .../providers/document_symbols.ex | 53 +- .../providers/execute_command/apply_spec.ex | 1 + .../lib/language_server/providers/hover.ex | 19 +- .../providers/implementation.ex | 7 +- .../providers/on_type_formatting.ex | 4 +- .../language_server/providers/references.ex | 50 +- .../providers/signature_help.ex | 4 +- .../providers/workspace_symbols.ex | 3 + .../test/providers/document_symbols_test.exs | 1338 ++++++++++++----- 14 files changed, 1067 insertions(+), 483 deletions(-) diff --git a/apps/language_server/lib/language_server/build.ex b/apps/language_server/lib/language_server/build.ex index 31c0edc6c..e8d050cc2 100644 --- a/apps/language_server/lib/language_server/build.ex +++ b/apps/language_server/lib/language_server/build.ex @@ -281,6 +281,7 @@ defmodule ElixirLS.LanguageServer.Build do defp range(position, nil) when is_integer(position) do line = position - 1 + # we don't care about utf16 positions here as we send 0 %{ "start" => %{"line" => line, "character" => 0}, "end" => %{"line" => line, "character" => 0} @@ -290,23 +291,24 @@ defmodule ElixirLS.LanguageServer.Build do defp range(position, source_file) when is_integer(position) do line = position - 1 text = Enum.at(SourceFile.lines(source_file), line) || "" - start_idx = String.length(text) - String.length(String.trim_leading(text)) - length = Enum.max([String.length(String.trim(text)), 1]) - %{ - "start" => %{"line" => line, "character" => start_idx}, - "end" => %{"line" => line, "character" => start_idx + length} - } - end + start_idx = String.length(text) - String.length(String.trim_leading(text)) + 1 + length = max(String.length(String.trim(text)), 1) - defp range({start_line, start_col, end_line, end_col}, _) do %{ - "start" => %{"line" => start_line - 1, "character" => start_col}, - "end" => %{"line" => end_line - 1, "character" => end_col} + "start" => %{ + "line" => line, + "character" => SourceFile.elixir_character_to_lsp(text, start_idx) + }, + "end" => %{ + "line" => line, + "character" => SourceFile.elixir_character_to_lsp(text, start_idx + length) + } } end defp range(_, nil) do + # we don't care about utf16 positions here as we send 0 %{"start" => %{"line" => 0, "character" => 0}, "end" => %{"line" => 0, "character" => 0}} end diff --git a/apps/language_server/lib/language_server/protocol/location.ex b/apps/language_server/lib/language_server/protocol/location.ex index 8f3bf9baa..6e76f4a09 100644 --- a/apps/language_server/lib/language_server/protocol/location.ex +++ b/apps/language_server/lib/language_server/protocol/location.ex @@ -8,26 +8,30 @@ defmodule ElixirLS.LanguageServer.Protocol.Location do defstruct [:uri, :range] alias ElixirLS.LanguageServer.SourceFile - alias ElixirLS.LanguageServer.Protocol + require ElixirLS.LanguageServer.Protocol, as: Protocol - def new(%ElixirSense.Location{file: file, line: line, column: column}, uri) do + def new( + %ElixirSense.Location{file: file, line: line, column: column}, + current_file_uri, + current_file_text + ) do uri = case file do - nil -> uri + nil -> current_file_uri _ -> SourceFile.path_to_uri(file) end - # LSP messages are 0 indexed whilst elixir/erlang is 1 indexed. - # Guard against malformed line or column values. - line = max(line - 1, 0) - column = max(column - 1, 0) + text = + case file do + nil -> current_file_text + file -> File.read!(file) + end + + {line, column} = SourceFile.elixir_position_to_lsp(text, {line, column}) %Protocol.Location{ uri: uri, - range: %{ - "start" => %{"line" => line, "character" => column}, - "end" => %{"line" => line, "character" => column} - } + range: Protocol.range(line, column, line, column) } end end diff --git a/apps/language_server/lib/language_server/providers/code_lens.ex b/apps/language_server/lib/language_server/providers/code_lens.ex index 0d035d772..6367677c7 100644 --- a/apps/language_server/lib/language_server/providers/code_lens.ex +++ b/apps/language_server/lib/language_server/providers/code_lens.ex @@ -17,6 +17,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeLens do def build_code_lens(line, title, command, argument) do %{ + # we don't care about utf16 positions here as we send 0 "range" => range(line - 1, 0, line - 1, 0), "command" => %{ "title" => title, diff --git a/apps/language_server/lib/language_server/providers/completion.ex b/apps/language_server/lib/language_server/providers/completion.ex index 7ea6f767a..b50f3c1d6 100644 --- a/apps/language_server/lib/language_server/providers/completion.ex +++ b/apps/language_server/lib/language_server/providers/completion.ex @@ -90,16 +90,20 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do |> SourceFile.lines() |> Enum.at(line) - text_before_cursor = String.slice(line_text, 0, character) - text_after_cursor = String.slice(line_text, character..-1) + # convert to 1 based utf8 position + line = line + 1 + character = SourceFile.lsp_character_to_elixir(line_text, character) + + text_before_cursor = String.slice(line_text, 0, character - 1) + text_after_cursor = String.slice(line_text, (character - 1)..-1) prefix = get_prefix(text_before_cursor) # TODO: Don't call into here directly # Can we use ElixirSense.Providers.Suggestion? ElixirSense.suggestions/3 env = - ElixirSense.Core.Parser.parse_string(text, true, true, line + 1) - |> ElixirSense.Core.Metadata.get_env(line + 1) + ElixirSense.Core.Parser.parse_string(text, true, true, line) + |> ElixirSense.Core.Metadata.get_env(line) scope = case env.scope do @@ -135,7 +139,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do } items = - ElixirSense.suggestions(text, line + 1, character + 1) + ElixirSense.suggestions(text, line, character) |> maybe_reject_derived_functions(context, options) |> Enum.map(&from_completion_item(&1, context, options)) |> maybe_add_do(context) diff --git a/apps/language_server/lib/language_server/providers/definition.ex b/apps/language_server/lib/language_server/providers/definition.ex index 3b64c0f92..65dd62128 100644 --- a/apps/language_server/lib/language_server/providers/definition.ex +++ b/apps/language_server/lib/language_server/providers/definition.ex @@ -3,16 +3,18 @@ defmodule ElixirLS.LanguageServer.Providers.Definition do Go-to-definition provider utilizing Elixir Sense """ - alias ElixirLS.LanguageServer.Protocol + alias ElixirLS.LanguageServer.{Protocol, SourceFile} def definition(uri, text, line, character) do + {line, character} = SourceFile.lsp_position_to_elixr(text, {line, character}) + result = - case ElixirSense.definition(text, line + 1, character + 1) do + case ElixirSense.definition(text, line, character) do nil -> nil %ElixirSense.Location{} = location -> - Protocol.Location.new(location, uri) + Protocol.Location.new(location, uri, text) end {:ok, result} diff --git a/apps/language_server/lib/language_server/providers/document_symbols.ex b/apps/language_server/lib/language_server/providers/document_symbols.ex index 0df6357ac..9bb4b3ae1 100644 --- a/apps/language_server/lib/language_server/providers/document_symbols.ex +++ b/apps/language_server/lib/language_server/providers/document_symbols.ex @@ -6,7 +6,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do """ alias ElixirLS.LanguageServer.Providers.SymbolUtils - alias ElixirLS.LanguageServer.Protocol + alias ElixirLS.LanguageServer.SourceFile + require ElixirLS.LanguageServer.Protocol, as: Protocol defmodule Info do defstruct [:type, :name, :location, :children] @@ -25,22 +26,22 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do def symbols(uri, text, hierarchical) do case list_symbols(text) do {:ok, symbols} -> - {:ok, build_symbols(symbols, uri, hierarchical)} + {:ok, build_symbols(symbols, uri, text, hierarchical)} {:error, :compilation_error} -> {:error, :server_error, "[DocumentSymbols] Compilation error while parsing source file"} end end - defp build_symbols(symbols, uri, hierarchical) + defp build_symbols(symbols, uri, text, hierarchical) - defp build_symbols(symbols, uri, true) do - Enum.map(symbols, &build_symbol_information_hierarchical(uri, &1)) + defp build_symbols(symbols, uri, text, true) do + Enum.map(symbols, &build_symbol_information_hierarchical(uri, text, &1)) end - defp build_symbols(symbols, uri, false) do + defp build_symbols(symbols, uri, text, false) do symbols - |> Enum.map(&build_symbol_information_flat(uri, &1)) + |> Enum.map(&build_symbol_information_flat(uri, text, &1)) |> List.flatten() end @@ -283,25 +284,27 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do defp extract_symbol(_, _), do: nil - defp build_symbol_information_hierarchical(uri, info) when is_list(info), - do: Enum.map(info, &build_symbol_information_hierarchical(uri, &1)) + defp build_symbol_information_hierarchical(uri, text, info) when is_list(info), + do: Enum.map(info, &build_symbol_information_hierarchical(uri, text, &1)) + + defp build_symbol_information_hierarchical(uri, text, %Info{} = info) do + range = location_to_range(info.location, text) - defp build_symbol_information_hierarchical(uri, %Info{} = info) do %Protocol.DocumentSymbol{ name: info.name, kind: SymbolUtils.symbol_kind_to_code(info.type), - range: location_to_range(info.location), - selectionRange: location_to_range(info.location), - children: build_symbol_information_hierarchical(uri, info.children) + range: range, + selectionRange: range, + children: build_symbol_information_hierarchical(uri, text, info.children) } end - defp build_symbol_information_flat(uri, info, parent_name \\ nil) + defp build_symbol_information_flat(uri, text, info, parent_name \\ nil) - defp build_symbol_information_flat(uri, info, parent_name) when is_list(info), - do: Enum.map(info, &build_symbol_information_flat(uri, &1, parent_name)) + defp build_symbol_information_flat(uri, text, info, parent_name) when is_list(info), + do: Enum.map(info, &build_symbol_information_flat(uri, text, &1, parent_name)) - defp build_symbol_information_flat(uri, %Info{} = info, parent_name) do + defp build_symbol_information_flat(uri, text, %Info{} = info, parent_name) do case info.children do [_ | _] -> [ @@ -310,11 +313,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do kind: SymbolUtils.symbol_kind_to_code(info.type), location: %{ uri: uri, - range: location_to_range(info.location) + range: location_to_range(info.location, text) }, containerName: parent_name } - | Enum.map(info.children, &build_symbol_information_flat(uri, &1, info.name)) + | Enum.map(info.children, &build_symbol_information_flat(uri, text, &1, info.name)) ] _ -> @@ -323,18 +326,18 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do kind: SymbolUtils.symbol_kind_to_code(info.type), location: %{ uri: uri, - range: location_to_range(info.location) + range: location_to_range(info.location, text) }, containerName: parent_name } end end - defp location_to_range(location) do - %{ - start: %{line: location[:line] - 1, character: location[:column] - 1}, - end: %{line: location[:line] - 1, character: location[:column] - 1} - } + defp location_to_range(location, text) do + {line, character} = + SourceFile.elixir_position_to_lsp(text, {location[:line], location[:column]}) + + Protocol.range(line, character, line, character) end defp extract_module_name(protocol: protocol, implementations: implementations) do diff --git a/apps/language_server/lib/language_server/providers/execute_command/apply_spec.ex b/apps/language_server/lib/language_server/providers/execute_command/apply_spec.ex index 96fbdae2b..12b8d34fc 100644 --- a/apps/language_server/lib/language_server/providers/execute_command/apply_spec.ex +++ b/apps/language_server/lib/language_server/providers/execute_command/apply_spec.ex @@ -78,6 +78,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ApplySpec do "label" => "Add @spec to #{mod}.#{fun}/#{arity}", "edit" => %{ "changes" => %{ + # we don't care about utf16 positions here as we send 0 uri => [%{"range" => range(line - 1, 0, line - 1, 0), "newText" => formatted}] } } diff --git a/apps/language_server/lib/language_server/providers/hover.ex b/apps/language_server/lib/language_server/providers/hover.ex index 53d295aad..8e9b0c1ec 100644 --- a/apps/language_server/lib/language_server/providers/hover.ex +++ b/apps/language_server/lib/language_server/providers/hover.ex @@ -1,5 +1,6 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do alias ElixirLS.LanguageServer.SourceFile + import ElixirLS.LanguageServer.Protocol @moduledoc """ Hover provider utilizing Elixir Sense @@ -17,14 +18,16 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do |> Enum.map(fn x -> "lib/#{x}/lib" end) def hover(text, line, character, project_dir) do + {line, character} = SourceFile.lsp_position_to_elixr(text, {line, character}) + response = - case ElixirSense.docs(text, line + 1, character + 1) do + case ElixirSense.docs(text, line, character) do %{subject: ""} -> nil %{subject: subject, docs: docs} -> - line_text = Enum.at(SourceFile.lines(text), line) - range = highlight_range(line_text, line, character, subject) + line_text = Enum.at(SourceFile.lines(text), line - 1) + range = highlight_range(line_text, line - 1, character - 1, subject) %{"contents" => contents(docs, subject, project_dir), "range" => range} end @@ -45,10 +48,12 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do Enum.find_value(regex_ranges, fn [{start, length}] when start <= character and character <= start + length -> - %{ - "start" => %{"line" => line, "character" => start}, - "end" => %{"line" => line, "character" => start + length} - } + range( + line, + SourceFile.elixir_character_to_lsp(line_text, start + 1), + line, + SourceFile.elixir_character_to_lsp(line_text, start + 1 + length) + ) _ -> nil diff --git a/apps/language_server/lib/language_server/providers/implementation.ex b/apps/language_server/lib/language_server/providers/implementation.ex index 746235a54..920139901 100644 --- a/apps/language_server/lib/language_server/providers/implementation.ex +++ b/apps/language_server/lib/language_server/providers/implementation.ex @@ -3,11 +3,12 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation do Go-to-implementation provider utilizing Elixir Sense """ - alias ElixirLS.LanguageServer.Protocol + alias ElixirLS.LanguageServer.{Protocol, SourceFile} def implementation(uri, text, line, character) do - locations = ElixirSense.implementations(text, line + 1, character + 1) - results = for location <- locations, do: Protocol.Location.new(location, uri) + {line, character} = SourceFile.lsp_position_to_elixr(text, {line, character}) + locations = ElixirSense.implementations(text, line, character) + results = for location <- locations, do: Protocol.Location.new(location, uri, text) {:ok, results} end diff --git a/apps/language_server/lib/language_server/providers/on_type_formatting.ex b/apps/language_server/lib/language_server/providers/on_type_formatting.ex index 3b374ca8f..6665b1376 100644 --- a/apps/language_server/lib/language_server/providers/on_type_formatting.ex +++ b/apps/language_server/lib/language_server/providers/on_type_formatting.ex @@ -10,7 +10,8 @@ defmodule ElixirLS.LanguageServer.Providers.OnTypeFormatting do alias ElixirLS.LanguageServer.SourceFile import ElixirLS.LanguageServer.Protocol - def format(%SourceFile{} = source_file, line, character, "\n", _options) do + def format(%SourceFile{} = source_file, line, character, "\n", _options) when line >= 1 do + # we don't care about utf16 positions here as we only pass character back to client lines = SourceFile.lines(source_file) prev_line = Enum.at(lines, line - 1) @@ -69,6 +70,7 @@ defmodule ElixirLS.LanguageServer.Providers.OnTypeFormatting do # In VS Code, currently, the cursor jumps strangely if the current line is blank and we try to # insert a newline at the current position, so unfortunately, we have to check for that. defp insert_end_edit(indentation, line, character, insert_on_next_line?) do + # we don't care about utf16 positions here as we either use 0 or what the client sent if insert_on_next_line? do {range(line + 1, 0, line + 1, 0), "#{indentation}end\n"} else diff --git a/apps/language_server/lib/language_server/providers/references.ex b/apps/language_server/lib/language_server/providers/references.ex index 293982e02..b2612ea9e 100644 --- a/apps/language_server/lib/language_server/providers/references.ex +++ b/apps/language_server/lib/language_server/providers/references.ex @@ -11,26 +11,34 @@ defmodule ElixirLS.LanguageServer.Providers.References do """ alias ElixirLS.LanguageServer.{SourceFile, Build} + import ElixirLS.LanguageServer.Protocol def references(text, uri, line, character, _include_declaration) do + {line, character} = SourceFile.lsp_position_to_elixr(text, {line, character}) + Build.with_build_lock(fn -> - ElixirSense.references(text, line + 1, character + 1) + ElixirSense.references(text, line, character) |> Enum.map(fn elixir_sense_reference -> elixir_sense_reference - |> build_reference(uri) - |> build_loc() + |> build_reference(uri, text) end) - |> Enum.filter(&has_uri?/1) end) end - defp build_reference(ref, current_file_uri) do + defp build_reference(ref, current_file_uri, current_file_text) do + text = get_text(ref, current_file_text) + + {start_line, start_column} = + SourceFile.elixir_position_to_lsp(text, {ref.range.start.line, ref.range.start.column}) + + {end_line, end_column} = + SourceFile.elixir_position_to_lsp(text, {ref.range.end.line, ref.range.end.column}) + + range = range(start_line, start_column, end_line, end_column) + %{ - range: %{ - start: %{line: ref.range.start.line, column: ref.range.start.column}, - end: %{line: ref.range.end.line, column: ref.range.end.column} - }, - uri: build_uri(ref, current_file_uri) + "range" => range, + "uri" => build_uri(ref, current_file_uri) } end @@ -42,25 +50,13 @@ defmodule ElixirLS.LanguageServer.Providers.References do # ElixirSense returns a plain path (e.g. "/home/bob/my_app/lib/a.ex") as # the "uri" so we convert it to an actual uri path when is_binary(path) -> SourceFile.path_to_uri(path) - _ -> nil end end - defp has_uri?(reference), do: !is_nil(reference["uri"]) - - defp build_loc(reference) do - # Adjust for ElixirSense 1-based indexing - line_start = reference.range.start.line - 1 - line_end = reference.range.end.line - 1 - column_start = reference.range.start.column - 1 - column_end = reference.range.end.column - 1 - - %{ - "uri" => reference.uri, - "range" => %{ - "start" => %{"line" => line_start, "character" => column_start}, - "end" => %{"line" => line_end, "character" => column_end} - } - } + def get_text(elixir_sense_ref, current_file_text) do + case elixir_sense_ref.uri do + nil -> current_file_text + path when is_binary(path) -> File.read!(path) + end end end diff --git a/apps/language_server/lib/language_server/providers/signature_help.ex b/apps/language_server/lib/language_server/providers/signature_help.ex index 296312d49..9b8ae94e9 100644 --- a/apps/language_server/lib/language_server/providers/signature_help.ex +++ b/apps/language_server/lib/language_server/providers/signature_help.ex @@ -4,8 +4,10 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp do def trigger_characters(), do: ["(", ","] def signature(%SourceFile{} = source_file, line, character) do + {line, character} = SourceFile.lsp_position_to_elixr(source_file.text, {line, character}) + response = - case ElixirSense.signature(source_file.text, line + 1, character + 1) do + case ElixirSense.signature(source_file.text, line, character) do %{active_param: active_param, signatures: signatures} -> %{ "activeSignature" => 0, diff --git a/apps/language_server/lib/language_server/providers/workspace_symbols.ex b/apps/language_server/lib/language_server/providers/workspace_symbols.ex index ef28ff277..91a22ccf6 100644 --- a/apps/language_server/lib/language_server/providers/workspace_symbols.ex +++ b/apps/language_server/lib/language_server/providers/workspace_symbols.ex @@ -512,15 +512,18 @@ defmodule ElixirLS.LanguageServer.Providers.WorkspaceSymbols do @spec build_range(nil | erl_location_t) :: range_t defp build_range(nil) do + # we don't care about utf16 positions here as we send 0 %{ start: %{line: 0, character: 0}, end: %{line: 1, character: 0} } end + # it's not worth to present column info here defp build_range({line, _column}), do: build_range(line) defp build_range(line) do + # we don't care about utf16 positions here as we send 0 %{ start: %{line: max(line - 1, 0), character: 0}, end: %{line: line, character: 0} diff --git a/apps/language_server/test/providers/document_symbols_test.exs b/apps/language_server/test/providers/document_symbols_test.exs index 920d9e1f7..67948439f 100644 --- a/apps/language_server/test/providers/document_symbols_test.exs +++ b/apps/language_server/test/providers/document_symbols_test.exs @@ -41,127 +41,169 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 14, name: "@my_mod_var", - range: %{end: %{character: 9, line: 2}, start: %{character: 9, line: 2}}, + range: %{ + "end" => %{"character" => 9, "line" => 2}, + "start" => %{"character" => 9, "line" => 2} + }, selectionRange: %{ - end: %{character: 9, line: 2}, - start: %{character: 9, line: 2} + "end" => %{"character" => 9, "line" => 2}, + "start" => %{"character" => 9, "line" => 2} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "def my_fn(arg)", - range: %{end: %{character: 12, line: 3}, start: %{character: 12, line: 3}}, + range: %{ + "end" => %{"character" => 12, "line" => 3}, + "start" => %{"character" => 12, "line" => 3} + }, selectionRange: %{ - end: %{character: 12, line: 3}, - start: %{character: 12, line: 3} + "end" => %{"character" => 12, "line" => 3}, + "start" => %{"character" => 12, "line" => 3} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defp my_private_fn(arg)", - range: %{end: %{character: 13, line: 4}, start: %{character: 13, line: 4}}, + range: %{ + "end" => %{"character" => 13, "line" => 4}, + "start" => %{"character" => 13, "line" => 4} + }, selectionRange: %{ - end: %{character: 13, line: 4}, - start: %{character: 13, line: 4} + "end" => %{"character" => 13, "line" => 4}, + "start" => %{"character" => 13, "line" => 4} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defmacro my_macro()", - range: %{end: %{character: 17, line: 5}, start: %{character: 17, line: 5}}, + range: %{ + "end" => %{"character" => 17, "line" => 5}, + "start" => %{"character" => 17, "line" => 5} + }, selectionRange: %{ - end: %{character: 17, line: 5}, - start: %{character: 17, line: 5} + "end" => %{"character" => 17, "line" => 5}, + "start" => %{"character" => 17, "line" => 5} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defmacrop my_private_macro()", - range: %{end: %{character: 18, line: 6}, start: %{character: 18, line: 6}}, + range: %{ + "end" => %{"character" => 18, "line" => 6}, + "start" => %{"character" => 18, "line" => 6} + }, selectionRange: %{ - end: %{character: 18, line: 6}, - start: %{character: 18, line: 6} + "end" => %{"character" => 18, "line" => 6}, + "start" => %{"character" => 18, "line" => 6} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defguard my_guard(a)", - range: %{end: %{character: 17, line: 7}, start: %{character: 17, line: 7}}, + range: %{ + "end" => %{"character" => 17, "line" => 7}, + "start" => %{"character" => 17, "line" => 7} + }, selectionRange: %{ - end: %{character: 17, line: 7}, - start: %{character: 17, line: 7} + "end" => %{"character" => 17, "line" => 7}, + "start" => %{"character" => 17, "line" => 7} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defguardp my_private_guard(a)", - range: %{end: %{character: 18, line: 8}, start: %{character: 18, line: 8}}, + range: %{ + "end" => %{"character" => 18, "line" => 8}, + "start" => %{"character" => 18, "line" => 8} + }, selectionRange: %{ - end: %{character: 18, line: 8}, - start: %{character: 18, line: 8} + "end" => %{"character" => 18, "line" => 8}, + "start" => %{"character" => 18, "line" => 8} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defdelegate my_delegate(list)", - range: %{end: %{character: 20, line: 9}, start: %{character: 20, line: 9}}, + range: %{ + "end" => %{"character" => 20, "line" => 9}, + "start" => %{"character" => 20, "line" => 9} + }, selectionRange: %{ - end: %{character: 20, line: 9}, - start: %{character: 20, line: 9} + "end" => %{"character" => 20, "line" => 9}, + "start" => %{"character" => 20, "line" => 9} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "defguard my_guard", - range: %{end: %{character: 17, line: 10}, start: %{character: 17, line: 10}}, + range: %{ + "end" => %{"character" => 17, "line" => 10}, + "start" => %{"character" => 17, "line" => 10} + }, selectionRange: %{ - end: %{character: 17, line: 10}, - start: %{character: 17, line: 10} + "end" => %{"character" => 17, "line" => 10}, + "start" => %{"character" => 17, "line" => 10} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "def my_fn_no_arg", - range: %{end: %{character: 12, line: 11}, start: %{character: 12, line: 11}}, + range: %{ + "end" => %{"character" => 12, "line" => 11}, + "start" => %{"character" => 12, "line" => 11} + }, selectionRange: %{ - end: %{character: 12, line: 11}, - start: %{character: 12, line: 11} + "end" => %{"character" => 12, "line" => 11}, + "start" => %{"character" => 12, "line" => 11} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "def my_fn_with_guard(arg)", - range: %{end: %{character: 12, line: 12}, start: %{character: 12, line: 12}}, + range: %{ + "end" => %{"character" => 12, "line" => 12}, + "start" => %{"character" => 12, "line" => 12} + }, selectionRange: %{ - end: %{character: 12, line: 12}, - start: %{character: 12, line: 12} + "end" => %{"character" => 12, "line" => 12}, + "start" => %{"character" => 12, "line" => 12} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "def my_fn_with_more_blocks(arg)", - range: %{end: %{character: 12, line: 13}, start: %{character: 12, line: 13}}, + range: %{ + "end" => %{"character" => 12, "line" => 13}, + "start" => %{"character" => 12, "line" => 13} + }, selectionRange: %{ - end: %{character: 12, line: 13}, - start: %{character: 12, line: 13} + "end" => %{"character" => 12, "line" => 13}, + "start" => %{"character" => 12, "line" => 13} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}}, - selectionRange: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -201,14 +243,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "@my_mod_var", kind: 14, location: %{ - range: %{end: %{character: 9, line: 2}, start: %{character: 9, line: 2}} + range: %{ + "end" => %{"character" => 9, "line" => 2}, + "start" => %{"character" => 9, "line" => 2} + } }, containerName: "MyModule" }, @@ -216,7 +264,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn(arg)", kind: 12, location: %{ - range: %{end: %{character: 12, line: 3}, start: %{character: 12, line: 3}} + range: %{ + "end" => %{"character" => 12, "line" => 3}, + "start" => %{"character" => 12, "line" => 3} + } }, containerName: "MyModule" }, @@ -224,7 +275,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defp my_private_fn(arg)", kind: 12, location: %{ - range: %{end: %{character: 13, line: 4}, start: %{character: 13, line: 4}} + range: %{ + "end" => %{"character" => 13, "line" => 4}, + "start" => %{"character" => 13, "line" => 4} + } }, containerName: "MyModule" }, @@ -232,7 +286,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defmacro my_macro()", kind: 12, location: %{ - range: %{end: %{character: 17, line: 5}, start: %{character: 17, line: 5}} + range: %{ + "end" => %{"character" => 17, "line" => 5}, + "start" => %{"character" => 17, "line" => 5} + } }, containerName: "MyModule" }, @@ -240,7 +297,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defmacrop my_private_macro()", kind: 12, location: %{ - range: %{end: %{character: 18, line: 6}, start: %{character: 18, line: 6}} + range: %{ + "end" => %{"character" => 18, "line" => 6}, + "start" => %{"character" => 18, "line" => 6} + } }, containerName: "MyModule" }, @@ -248,7 +308,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defguard my_guard(a)", kind: 12, location: %{ - range: %{end: %{character: 17, line: 7}, start: %{character: 17, line: 7}} + range: %{ + "end" => %{"character" => 17, "line" => 7}, + "start" => %{"character" => 17, "line" => 7} + } }, containerName: "MyModule" }, @@ -256,7 +319,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defguardp my_private_guard(a)", kind: 12, location: %{ - range: %{end: %{character: 18, line: 8}, start: %{character: 18, line: 8}} + range: %{ + "end" => %{"character" => 18, "line" => 8}, + "start" => %{"character" => 18, "line" => 8} + } }, containerName: "MyModule" }, @@ -264,7 +330,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defdelegate my_delegate(list)", kind: 12, location: %{ - range: %{end: %{character: 20, line: 9}, start: %{character: 20, line: 9}} + range: %{ + "end" => %{"character" => 20, "line" => 9}, + "start" => %{"character" => 20, "line" => 9} + } }, containerName: "MyModule" }, @@ -272,7 +341,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "defguard my_guard", kind: 12, location: %{ - range: %{end: %{character: 17, line: 10}, start: %{character: 17, line: 10}} + range: %{ + "end" => %{"character" => 17, "line" => 10}, + "start" => %{"character" => 17, "line" => 10} + } }, containerName: "MyModule" }, @@ -280,7 +352,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn_no_arg", kind: 12, location: %{ - range: %{end: %{character: 12, line: 11}, start: %{character: 12, line: 11}} + range: %{ + "end" => %{"character" => 12, "line" => 11}, + "start" => %{"character" => 12, "line" => 11} + } }, containerName: "MyModule" }, @@ -288,7 +363,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn_with_guard(arg)", kind: 12, location: %{ - range: %{end: %{character: 12, line: 12}, start: %{character: 12, line: 12}} + range: %{ + "end" => %{"character" => 12, "line" => 12}, + "start" => %{"character" => 12, "line" => 12} + } }, containerName: "MyModule" }, @@ -296,7 +374,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn_with_more_blocks(arg)", kind: 12, location: %{ - range: %{end: %{character: 12, line: 13}, start: %{character: 12, line: 13}} + range: %{ + "end" => %{"character" => 12, "line" => 13}, + "start" => %{"character" => 12, "line" => 13} + } }, containerName: "MyModule" } @@ -324,36 +405,36 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "def my_fn()", range: %{ - end: %{character: 14, line: 3}, - start: %{character: 14, line: 3} + "end" => %{"character" => 14, "line" => 3}, + "start" => %{"character" => 14, "line" => 3} }, selectionRange: %{ - end: %{character: 14, line: 3}, - start: %{character: 14, line: 3} + "end" => %{"character" => 14, "line" => 3}, + "start" => %{"character" => 14, "line" => 3} } } ], kind: 2, name: "SubModule", range: %{ - end: %{character: 8, line: 2}, - start: %{character: 8, line: 2} + "end" => %{"character" => 8, "line" => 2}, + "start" => %{"character" => 8, "line" => 2} }, selectionRange: %{ - end: %{character: 8, line: 2}, - start: %{character: 8, line: 2} + "end" => %{"character" => 8, "line" => 2}, + "start" => %{"character" => 8, "line" => 2} } } ], kind: 2, name: "MyModule", range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} }, selectionRange: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } } ]} = DocumentSymbols.symbols(uri, text, true) @@ -376,8 +457,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, location: %{ range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } } }, @@ -386,8 +467,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, location: %{ range: %{ - end: %{character: 8, line: 2}, - start: %{character: 8, line: 2} + "end" => %{"character" => 8, "line" => 2}, + "start" => %{"character" => 8, "line" => 2} } }, containerName: "MyModule" @@ -397,8 +478,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn()", location: %{ range: %{ - end: %{character: 14, line: 3}, - start: %{character: 14, line: 3} + "end" => %{"character" => 14, "line" => 3}, + "start" => %{"character" => 14, "line" => 3} } }, containerName: "SubModule" @@ -426,24 +507,24 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "def some_function()", range: %{ - end: %{character: 12, line: 2}, - start: %{character: 12, line: 2} + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} }, selectionRange: %{ - end: %{character: 12, line: 2}, - start: %{character: 12, line: 2} + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} } } ], kind: 2, name: "MyModule", range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} }, selectionRange: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } }, %Protocol.DocumentSymbol{ @@ -453,24 +534,24 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "def some_other_function()", range: %{ - end: %{character: 12, line: 5}, - start: %{character: 12, line: 5} + "end" => %{"character" => 12, "line" => 5}, + "start" => %{"character" => 12, "line" => 5} }, selectionRange: %{ - end: %{character: 12, line: 5}, - start: %{character: 12, line: 5} + "end" => %{"character" => 12, "line" => 5}, + "start" => %{"character" => 12, "line" => 5} } } ], kind: 2, name: "MyOtherModule", range: %{ - end: %{character: 6, line: 4}, - start: %{character: 6, line: 4} + "end" => %{"character" => 6, "line" => 4}, + "start" => %{"character" => 6, "line" => 4} }, selectionRange: %{ - end: %{character: 6, line: 4}, - start: %{character: 6, line: 4} + "end" => %{"character" => 6, "line" => 4}, + "start" => %{"character" => 6, "line" => 4} } } ]} = DocumentSymbols.symbols(uri, text, true) @@ -494,8 +575,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, location: %{ range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } } }, @@ -504,8 +585,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, location: %{ range: %{ - end: %{character: 12, line: 2}, - start: %{character: 12, line: 2} + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} } }, containerName: "MyModule" @@ -515,8 +596,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, location: %{ range: %{ - end: %{character: 6, line: 4}, - start: %{character: 6, line: 4} + "end" => %{"character" => 6, "line" => 4}, + "start" => %{"character" => 6, "line" => 4} } } }, @@ -525,8 +606,8 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def some_other_function()", location: %{ range: %{ - end: %{character: 12, line: 5}, - start: %{character: 12, line: 5} + "end" => %{"character" => 12, "line" => 5}, + "start" => %{"character" => 12, "line" => 5} } }, containerName: "MyOtherModule" @@ -550,17 +631,26 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def my_fn()", - range: %{end: %{character: 12, line: 2}, start: %{character: 12, line: 2}}, + range: %{ + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} + }, selectionRange: %{ - end: %{character: 12, line: 2}, - start: %{character: 12, line: 2} + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}}, - selectionRange: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -579,14 +669,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "def my_fn()", kind: 12, location: %{ - range: %{end: %{character: 12, line: 2}, start: %{character: 12, line: 2}} + range: %{ + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} + } }, containerName: "MyModule" } @@ -609,17 +705,26 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def my_fn()", - range: %{end: %{character: 12, line: 2}, start: %{character: 12, line: 2}}, + range: %{ + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} + }, selectionRange: %{ - end: %{character: 12, line: 2}, - start: %{character: 12, line: 2} + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} } } ], kind: 2, name: "# unknown", - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}}, - selectionRange: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -638,14 +743,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "# unknown", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ kind: 12, name: "def my_fn()", location: %{ - range: %{end: %{character: 12, line: 2}, start: %{character: 12, line: 2}} + range: %{ + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} + } }, containerName: "# unknown" } @@ -668,17 +779,26 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def my_fn()", - range: %{end: %{character: 12, line: 2}, start: %{character: 12, line: 2}}, + range: %{ + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} + }, selectionRange: %{ - end: %{character: 12, line: 2}, - start: %{character: 12, line: 2} + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} } } ], kind: 2, name: "my_module", - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}}, - selectionRange: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -697,14 +817,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "my_module", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "def my_fn()", kind: 12, location: %{ - range: %{end: %{character: 12, line: 2}, start: %{character: 12, line: 2}} + range: %{ + "end" => %{"character" => 12, "line" => 2}, + "start" => %{"character" => 12, "line" => 2} + } }, containerName: "my_module" } @@ -731,26 +857,38 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def my_fn()", - range: %{end: %{character: 14, line: 3}, start: %{character: 14, line: 3}}, + range: %{ + "end" => %{"character" => 14, "line" => 3}, + "start" => %{"character" => 14, "line" => 3} + }, selectionRange: %{ - end: %{character: 14, line: 3}, - start: %{character: 14, line: 3} + "end" => %{"character" => 14, "line" => 3}, + "start" => %{"character" => 14, "line" => 3} } } ], kind: 2, name: "__MODULE__.SubModule", - range: %{end: %{character: 8, line: 2}, start: %{character: 8, line: 2}}, + range: %{ + "end" => %{"character" => 8, "line" => 2}, + "start" => %{"character" => 8, "line" => 2} + }, selectionRange: %{ - end: %{character: 8, line: 2}, - start: %{character: 8, line: 2} + "end" => %{"character" => 8, "line" => 2}, + "start" => %{"character" => 8, "line" => 2} } } ], kind: 2, name: "__MODULE__", - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}}, - selectionRange: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -771,14 +909,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "__MODULE__", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "__MODULE__.SubModule", kind: 2, location: %{ - range: %{end: %{character: 8, line: 2}, start: %{character: 8, line: 2}} + range: %{ + "end" => %{"character" => 8, "line" => 2}, + "start" => %{"character" => 8, "line" => 2} + } }, containerName: "__MODULE__" }, @@ -786,7 +930,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn()", kind: 12, location: %{ - range: %{end: %{character: 14, line: 3}, start: %{character: 14, line: 3}} + range: %{ + "end" => %{"character" => 14, "line" => 3}, + "start" => %{"character" => 14, "line" => 3} + } }, containerName: "__MODULE__.SubModule" } @@ -819,17 +966,26 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def size(data)", - range: %{end: %{character: 6, line: 2}, start: %{character: 6, line: 2}}, + range: %{ + "end" => %{"character" => 6, "line" => 2}, + "start" => %{"character" => 6, "line" => 2} + }, selectionRange: %{ - end: %{character: 6, line: 2}, - start: %{character: 6, line: 2} + "end" => %{"character" => 6, "line" => 2}, + "start" => %{"character" => 6, "line" => 2} } } ], kind: 11, name: "MyProtocol", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } }, %Protocol.DocumentSymbol{ children: [ @@ -837,17 +993,26 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def size(binary)", - range: %{end: %{character: 6, line: 6}, start: %{character: 6, line: 6}}, + range: %{ + "end" => %{"character" => 6, "line" => 6}, + "start" => %{"character" => 6, "line" => 6} + }, selectionRange: %{ - end: %{character: 6, line: 6}, - start: %{character: 6, line: 6} + "end" => %{"character" => 6, "line" => 6}, + "start" => %{"character" => 6, "line" => 6} } } ], kind: 2, name: "MyProtocol, for: BitString", - range: %{end: %{character: 0, line: 5}, start: %{character: 0, line: 5}}, - selectionRange: %{end: %{character: 0, line: 5}, start: %{character: 0, line: 5}} + range: %{ + "end" => %{"character" => 0, "line" => 5}, + "start" => %{"character" => 0, "line" => 5} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 5}, + "start" => %{"character" => 0, "line" => 5} + } }, %Protocol.DocumentSymbol{ children: [ @@ -855,17 +1020,26 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "def size(param)", - range: %{end: %{character: 6, line: 10}, start: %{character: 6, line: 10}}, + range: %{ + "end" => %{"character" => 6, "line" => 10}, + "start" => %{"character" => 6, "line" => 10} + }, selectionRange: %{ - end: %{character: 6, line: 10}, - start: %{character: 6, line: 10} + "end" => %{"character" => 6, "line" => 10}, + "start" => %{"character" => 6, "line" => 10} } } ], kind: 2, name: "MyProtocol, for: [List, MyList]", - range: %{end: %{character: 0, line: 9}, start: %{character: 0, line: 9}}, - selectionRange: %{end: %{character: 0, line: 9}, start: %{character: 0, line: 9}} + range: %{ + "end" => %{"character" => 0, "line" => 9}, + "start" => %{"character" => 0, "line" => 9} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 9}, + "start" => %{"character" => 0, "line" => 9} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -894,14 +1068,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyProtocol", kind: 11, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ kind: 12, name: "def size(data)", location: %{ - range: %{end: %{character: 6, line: 2}, start: %{character: 6, line: 2}} + range: %{ + "end" => %{"character" => 6, "line" => 2}, + "start" => %{"character" => 6, "line" => 2} + } }, containerName: "MyProtocol" }, @@ -909,14 +1089,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, name: "MyProtocol, for: BitString", location: %{ - range: %{end: %{character: 0, line: 5}, start: %{character: 0, line: 5}} + range: %{ + "end" => %{"character" => 0, "line" => 5}, + "start" => %{"character" => 0, "line" => 5} + } } }, %Protocol.SymbolInformation{ kind: 12, name: "def size(binary)", location: %{ - range: %{end: %{character: 6, line: 6}, start: %{character: 6, line: 6}} + range: %{ + "end" => %{"character" => 6, "line" => 6}, + "start" => %{"character" => 6, "line" => 6} + } }, containerName: "MyProtocol, for: BitString" }, @@ -924,14 +1110,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, name: "MyProtocol, for: [List, MyList]", location: %{ - range: %{end: %{character: 0, line: 9}, start: %{character: 0, line: 9}} + range: %{ + "end" => %{"character" => 0, "line" => 9}, + "start" => %{"character" => 0, "line" => 9} + } } }, %Protocol.SymbolInformation{ kind: 12, name: "def size(param)", location: %{ - range: %{end: %{character: 6, line: 10}, start: %{character: 6, line: 10}} + range: %{ + "end" => %{"character" => 6, "line" => 10}, + "start" => %{"character" => 6, "line" => 10} + } }, containerName: "MyProtocol, for: [List, MyList]" } @@ -957,36 +1149,51 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 7, name: "prop", - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}}, + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + }, selectionRange: %{ - end: %{character: 2, line: 1}, - start: %{character: 2, line: 1} + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} } }, %Protocol.DocumentSymbol{ children: [], kind: 7, name: "prop_with_def", - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}}, + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + }, selectionRange: %{ - end: %{character: 2, line: 1}, - start: %{character: 2, line: 1} + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} } } ], kind: 23, name: "struct", - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}}, + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + }, selectionRange: %{ - end: %{character: 2, line: 1}, - start: %{character: 2, line: 1} + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1006,14 +1213,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ name: "struct", kind: 23, location: %{ - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}} + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + } }, containerName: "MyModule" }, @@ -1021,7 +1234,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "prop", kind: 7, location: %{ - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}} + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + } }, containerName: "struct" }, @@ -1029,7 +1245,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 7, name: "prop_with_def", location: %{ - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}} + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + } }, containerName: "struct" } @@ -1055,26 +1274,38 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 7, name: "message", - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}}, + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + }, selectionRange: %{ - end: %{character: 2, line: 1}, - start: %{character: 2, line: 1} + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} } } ], kind: 23, name: "exception", - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}}, + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + }, selectionRange: %{ - end: %{character: 2, line: 1}, - start: %{character: 2, line: 1} + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} } } ], kind: 2, name: "MyError", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1094,14 +1325,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyError", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ kind: 23, name: "exception", location: %{ - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}} + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + } }, containerName: "MyError" }, @@ -1109,7 +1346,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 7, name: "message", location: %{ - range: %{end: %{character: 2, line: 1}, start: %{character: 2, line: 1}} + range: %{ + "end" => %{"character" => 2, "line" => 1}, + "start" => %{"character" => 2, "line" => 1} + } }, containerName: "exception" } @@ -1138,67 +1378,91 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 5, name: "my_simple", - range: %{end: %{character: 3, line: 1}, start: %{character: 3, line: 1}}, + range: %{ + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} + }, selectionRange: %{ - end: %{character: 3, line: 1}, - start: %{character: 3, line: 1} + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} } }, %Protocol.DocumentSymbol{ children: [], kind: 5, name: "my_union", - range: %{end: %{character: 3, line: 2}, start: %{character: 3, line: 2}}, + range: %{ + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} + }, selectionRange: %{ - end: %{character: 3, line: 2}, - start: %{character: 3, line: 2} + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} } }, %Protocol.DocumentSymbol{ children: [], kind: 5, name: "my_simple_private", - range: %{end: %{character: 3, line: 3}, start: %{character: 3, line: 3}}, + range: %{ + "end" => %{"character" => 3, "line" => 3}, + "start" => %{"character" => 3, "line" => 3} + }, selectionRange: %{ - end: %{character: 3, line: 3}, - start: %{character: 3, line: 3} + "end" => %{"character" => 3, "line" => 3}, + "start" => %{"character" => 3, "line" => 3} } }, %Protocol.DocumentSymbol{ children: [], kind: 5, name: "my_simple_opaque", - range: %{end: %{character: 3, line: 4}, start: %{character: 3, line: 4}}, + range: %{ + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} + }, selectionRange: %{ - end: %{character: 3, line: 4}, - start: %{character: 3, line: 4} + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} } }, %Protocol.DocumentSymbol{ children: [], kind: 5, name: "my_with_args(key, value)", - range: %{end: %{character: 3, line: 5}, start: %{character: 3, line: 5}}, + range: %{ + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} + }, selectionRange: %{ - end: %{character: 3, line: 5}, - start: %{character: 3, line: 5} + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} } }, %Protocol.DocumentSymbol{ children: [], kind: 5, name: "my_with_args_when(key, value)", - range: %{end: %{character: 3, line: 6}, start: %{character: 3, line: 6}}, + range: %{ + "end" => %{"character" => 3, "line" => 6}, + "start" => %{"character" => 3, "line" => 6} + }, selectionRange: %{ - end: %{character: 3, line: 6}, - start: %{character: 3, line: 6} + "end" => %{"character" => 3, "line" => 6}, + "start" => %{"character" => 3, "line" => 6} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1223,14 +1487,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ kind: 5, name: "my_simple", location: %{ - range: %{end: %{character: 3, line: 1}, start: %{character: 3, line: 1}} + range: %{ + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} + } }, containerName: "MyModule" }, @@ -1238,7 +1508,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 5, name: "my_union", location: %{ - range: %{end: %{character: 3, line: 2}, start: %{character: 3, line: 2}} + range: %{ + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} + } }, containerName: "MyModule" }, @@ -1246,7 +1519,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 5, name: "my_simple_private", location: %{ - range: %{end: %{character: 3, line: 3}, start: %{character: 3, line: 3}} + range: %{ + "end" => %{"character" => 3, "line" => 3}, + "start" => %{"character" => 3, "line" => 3} + } }, containerName: "MyModule" }, @@ -1254,7 +1530,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 5, name: "my_simple_opaque", location: %{ - range: %{end: %{character: 3, line: 4}, start: %{character: 3, line: 4}} + range: %{ + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} + } }, containerName: "MyModule" }, @@ -1262,7 +1541,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 5, name: "my_with_args(key, value)", location: %{ - range: %{end: %{character: 3, line: 5}, start: %{character: 3, line: 5}} + range: %{ + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} + } }, containerName: "MyModule" }, @@ -1270,7 +1552,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 5, name: "my_with_args_when(key, value)", location: %{ - range: %{end: %{character: 3, line: 6}, start: %{character: 3, line: 6}} + range: %{ + "end" => %{"character" => 3, "line" => 6}, + "start" => %{"character" => 3, "line" => 6} + } }, containerName: "MyModule" } @@ -1301,67 +1586,91 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 24, name: "my_callback(type1, type2)", - range: %{end: %{character: 3, line: 1}, start: %{character: 3, line: 1}}, + range: %{ + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} + }, selectionRange: %{ - end: %{character: 3, line: 1}, - start: %{character: 3, line: 1} + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} } }, %Protocol.DocumentSymbol{ children: [], kind: 24, name: "my_macrocallback(type1, type2)", - range: %{end: %{character: 3, line: 2}, start: %{character: 3, line: 2}}, + range: %{ + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} + }, selectionRange: %{ - end: %{character: 3, line: 2}, - start: %{character: 3, line: 2} + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} } }, %Protocol.DocumentSymbol{ children: [], kind: 24, name: "my_callback_when(type1, type2)", - range: %{end: %{character: 3, line: 4}, start: %{character: 3, line: 4}}, + range: %{ + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} + }, selectionRange: %{ - end: %{character: 3, line: 4}, - start: %{character: 3, line: 4} + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} } }, %Protocol.DocumentSymbol{ children: [], kind: 24, name: "my_macrocallback_when(type1, type2)", - range: %{end: %{character: 3, line: 5}, start: %{character: 3, line: 5}}, + range: %{ + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} + }, selectionRange: %{ - end: %{character: 3, line: 5}, - start: %{character: 3, line: 5} + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} } }, %Protocol.DocumentSymbol{ children: [], kind: 24, name: "my_callback_no_arg()", - range: %{end: %{character: 3, line: 7}, start: %{character: 3, line: 7}}, + range: %{ + "end" => %{"character" => 3, "line" => 7}, + "start" => %{"character" => 3, "line" => 7} + }, selectionRange: %{ - end: %{character: 3, line: 7}, - start: %{character: 3, line: 7} + "end" => %{"character" => 3, "line" => 7}, + "start" => %{"character" => 3, "line" => 7} } }, %Protocol.DocumentSymbol{ children: [], kind: 24, name: "my_macrocallback_no_arg()", - range: %{end: %{character: 3, line: 8}, start: %{character: 3, line: 8}}, + range: %{ + "end" => %{"character" => 3, "line" => 8}, + "start" => %{"character" => 3, "line" => 8} + }, selectionRange: %{ - end: %{character: 3, line: 8}, - start: %{character: 3, line: 8} + "end" => %{"character" => 3, "line" => 8}, + "start" => %{"character" => 3, "line" => 8} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1388,14 +1697,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ name: "my_callback(type1, type2)", kind: 24, location: %{ - range: %{end: %{character: 3, line: 1}, start: %{character: 3, line: 1}} + range: %{ + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} + } }, containerName: "MyModule" }, @@ -1403,7 +1718,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "my_macrocallback(type1, type2)", kind: 24, location: %{ - range: %{end: %{character: 3, line: 2}, start: %{character: 3, line: 2}} + range: %{ + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} + } }, containerName: "MyModule" }, @@ -1411,7 +1729,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "my_callback_when(type1, type2)", kind: 24, location: %{ - range: %{end: %{character: 3, line: 4}, start: %{character: 3, line: 4}} + range: %{ + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} + } }, containerName: "MyModule" }, @@ -1419,7 +1740,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "my_macrocallback_when(type1, type2)", kind: 24, location: %{ - range: %{end: %{character: 3, line: 5}, start: %{character: 3, line: 5}} + range: %{ + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} + } }, containerName: "MyModule" }, @@ -1427,7 +1751,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "my_callback_no_arg()", kind: 24, location: %{ - range: %{end: %{character: 3, line: 7}, start: %{character: 3, line: 7}} + range: %{ + "end" => %{"character" => 3, "line" => 7}, + "start" => %{"character" => 3, "line" => 7} + } }, containerName: "MyModule" }, @@ -1435,7 +1762,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "my_macrocallback_no_arg()", kind: 24, location: %{ - range: %{end: %{character: 3, line: 8}, start: %{character: 3, line: 8}} + range: %{ + "end" => %{"character" => 3, "line" => 8}, + "start" => %{"character" => 3, "line" => 8} + } }, containerName: "MyModule" } @@ -1459,27 +1789,39 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 24, name: "my_fn(integer)", - range: %{end: %{character: 9, line: 2}, start: %{character: 9, line: 2}}, + range: %{ + "end" => %{"character" => 9, "line" => 2}, + "start" => %{"character" => 9, "line" => 2} + }, selectionRange: %{ - end: %{character: 9, line: 2}, - start: %{character: 9, line: 2} + "end" => %{"character" => 9, "line" => 2}, + "start" => %{"character" => 9, "line" => 2} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "def my_fn(a)", - range: %{end: %{character: 12, line: 3}, start: %{character: 12, line: 3}}, + range: %{ + "end" => %{"character" => 12, "line" => 3}, + "start" => %{"character" => 12, "line" => 3} + }, selectionRange: %{ - end: %{character: 12, line: 3}, - start: %{character: 12, line: 3} + "end" => %{"character" => 12, "line" => 3}, + "start" => %{"character" => 12, "line" => 3} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}}, - selectionRange: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1499,14 +1841,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "my_fn(integer)", kind: 24, location: %{ - range: %{end: %{character: 9, line: 2}, start: %{character: 9, line: 2}} + range: %{ + "end" => %{"character" => 9, "line" => 2}, + "start" => %{"character" => 9, "line" => 2} + } }, containerName: "MyModule" }, @@ -1514,7 +1862,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "def my_fn(a)", kind: 12, location: %{ - range: %{end: %{character: 12, line: 3}, start: %{character: 12, line: 3}} + range: %{ + "end" => %{"character" => 12, "line" => 3}, + "start" => %{"character" => 12, "line" => 3} + } }, containerName: "MyModule" } @@ -1538,8 +1889,14 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 2, name: "MyModule", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1561,7 +1918,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } } ]} = DocumentSymbols.symbols(uri, text, false) @@ -1600,177 +1960,234 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 14, name: "@optional_callbacks", - range: %{end: %{character: 3, line: 1}, start: %{character: 3, line: 1}}, + range: %{ + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} + }, selectionRange: %{ - end: %{character: 3, line: 1}, - start: %{character: 3, line: 1} + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@behaviour MyBehaviour", - range: %{end: %{character: 3, line: 2}, start: %{character: 3, line: 2}}, + range: %{ + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} + }, selectionRange: %{ - end: %{character: 3, line: 2}, - start: %{character: 3, line: 2} + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@impl true", - range: %{end: %{character: 3, line: 3}, start: %{character: 3, line: 3}}, + range: %{ + "end" => %{"character" => 3, "line" => 3}, + "start" => %{"character" => 3, "line" => 3} + }, selectionRange: %{ - end: %{character: 3, line: 3}, - start: %{character: 3, line: 3} + "end" => %{"character" => 3, "line" => 3}, + "start" => %{"character" => 3, "line" => 3} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@derive", - range: %{end: %{character: 3, line: 4}, start: %{character: 3, line: 4}}, + range: %{ + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} + }, selectionRange: %{ - end: %{character: 3, line: 4}, - start: %{character: 3, line: 4} + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@enforce_keys", - range: %{end: %{character: 3, line: 5}, start: %{character: 3, line: 5}}, + range: %{ + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} + }, selectionRange: %{ - end: %{character: 3, line: 5}, - start: %{character: 3, line: 5} + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@compile", - range: %{end: %{character: 3, line: 6}, start: %{character: 3, line: 6}}, + range: %{ + "end" => %{"character" => 3, "line" => 6}, + "start" => %{"character" => 3, "line" => 6} + }, selectionRange: %{ - end: %{character: 3, line: 6}, - start: %{character: 3, line: 6} + "end" => %{"character" => 3, "line" => 6}, + "start" => %{"character" => 3, "line" => 6} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@deprecated", - range: %{end: %{character: 3, line: 7}, start: %{character: 3, line: 7}}, + range: %{ + "end" => %{"character" => 3, "line" => 7}, + "start" => %{"character" => 3, "line" => 7} + }, selectionRange: %{ - end: %{character: 3, line: 7}, - start: %{character: 3, line: 7} + "end" => %{"character" => 3, "line" => 7}, + "start" => %{"character" => 3, "line" => 7} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@dialyzer", - range: %{end: %{character: 3, line: 8}, start: %{character: 3, line: 8}}, + range: %{ + "end" => %{"character" => 3, "line" => 8}, + "start" => %{"character" => 3, "line" => 8} + }, selectionRange: %{ - end: %{character: 3, line: 8}, - start: %{character: 3, line: 8} + "end" => %{"character" => 3, "line" => 8}, + "start" => %{"character" => 3, "line" => 8} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@file", - range: %{end: %{character: 3, line: 9}, start: %{character: 3, line: 9}}, + range: %{ + "end" => %{"character" => 3, "line" => 9}, + "start" => %{"character" => 3, "line" => 9} + }, selectionRange: %{ - end: %{character: 3, line: 9}, - start: %{character: 3, line: 9} + "end" => %{"character" => 3, "line" => 9}, + "start" => %{"character" => 3, "line" => 9} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@external_resource", - range: %{end: %{character: 3, line: 10}, start: %{character: 3, line: 10}}, + range: %{ + "end" => %{"character" => 3, "line" => 10}, + "start" => %{"character" => 3, "line" => 10} + }, selectionRange: %{ - end: %{character: 3, line: 10}, - start: %{character: 3, line: 10} + "end" => %{"character" => 3, "line" => 10}, + "start" => %{"character" => 3, "line" => 10} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@on_load", - range: %{end: %{character: 3, line: 11}, start: %{character: 3, line: 11}}, + range: %{ + "end" => %{"character" => 3, "line" => 11}, + "start" => %{"character" => 3, "line" => 11} + }, selectionRange: %{ - end: %{character: 3, line: 11}, - start: %{character: 3, line: 11} + "end" => %{"character" => 3, "line" => 11}, + "start" => %{"character" => 3, "line" => 11} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@on_definition", - range: %{end: %{character: 3, line: 12}, start: %{character: 3, line: 12}}, + range: %{ + "end" => %{"character" => 3, "line" => 12}, + "start" => %{"character" => 3, "line" => 12} + }, selectionRange: %{ - end: %{character: 3, line: 12}, - start: %{character: 3, line: 12} + "end" => %{"character" => 3, "line" => 12}, + "start" => %{"character" => 3, "line" => 12} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@vsn", - range: %{end: %{character: 3, line: 13}, start: %{character: 3, line: 13}}, + range: %{ + "end" => %{"character" => 3, "line" => 13}, + "start" => %{"character" => 3, "line" => 13} + }, selectionRange: %{ - end: %{character: 3, line: 13}, - start: %{character: 3, line: 13} + "end" => %{"character" => 3, "line" => 13}, + "start" => %{"character" => 3, "line" => 13} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@after_compile", - range: %{end: %{character: 3, line: 14}, start: %{character: 3, line: 14}}, + range: %{ + "end" => %{"character" => 3, "line" => 14}, + "start" => %{"character" => 3, "line" => 14} + }, selectionRange: %{ - end: %{character: 3, line: 14}, - start: %{character: 3, line: 14} + "end" => %{"character" => 3, "line" => 14}, + "start" => %{"character" => 3, "line" => 14} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@before_compile", - range: %{end: %{character: 3, line: 15}, start: %{character: 3, line: 15}}, + range: %{ + "end" => %{"character" => 3, "line" => 15}, + "start" => %{"character" => 3, "line" => 15} + }, selectionRange: %{ - end: %{character: 3, line: 15}, - start: %{character: 3, line: 15} + "end" => %{"character" => 3, "line" => 15}, + "start" => %{"character" => 3, "line" => 15} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@fallback_to_any", - range: %{end: %{character: 3, line: 16}, start: %{character: 3, line: 16}}, + range: %{ + "end" => %{"character" => 3, "line" => 16}, + "start" => %{"character" => 3, "line" => 16} + }, selectionRange: %{ - end: %{character: 3, line: 16}, - start: %{character: 3, line: 16} + "end" => %{"character" => 3, "line" => 16}, + "start" => %{"character" => 3, "line" => 16} } }, %Protocol.DocumentSymbol{ children: [], kind: 14, name: "@impl MyBehaviour", - range: %{end: %{character: 3, line: 17}, start: %{character: 3, line: 17}}, + range: %{ + "end" => %{"character" => 3, "line" => 17}, + "start" => %{"character" => 3, "line" => 17} + }, selectionRange: %{ - end: %{character: 3, line: 17}, - start: %{character: 3, line: 17} + "end" => %{"character" => 3, "line" => 17}, + "start" => %{"character" => 3, "line" => 17} } } ], kind: 2, name: "MyModule", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -1806,14 +2223,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModule", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ name: "@optional_callbacks", kind: 14, location: %{ - range: %{end: %{character: 3, line: 1}, start: %{character: 3, line: 1}} + range: %{ + "end" => %{"character" => 3, "line" => 1}, + "start" => %{"character" => 3, "line" => 1} + } }, containerName: "MyModule" }, @@ -1821,7 +2244,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@behaviour MyBehaviour", kind: 14, location: %{ - range: %{end: %{character: 3, line: 2}, start: %{character: 3, line: 2}} + range: %{ + "end" => %{"character" => 3, "line" => 2}, + "start" => %{"character" => 3, "line" => 2} + } }, containerName: "MyModule" }, @@ -1829,7 +2255,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@impl true", kind: 14, location: %{ - range: %{end: %{character: 3, line: 3}, start: %{character: 3, line: 3}} + range: %{ + "end" => %{"character" => 3, "line" => 3}, + "start" => %{"character" => 3, "line" => 3} + } }, containerName: "MyModule" }, @@ -1837,7 +2266,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@derive", kind: 14, location: %{ - range: %{end: %{character: 3, line: 4}, start: %{character: 3, line: 4}} + range: %{ + "end" => %{"character" => 3, "line" => 4}, + "start" => %{"character" => 3, "line" => 4} + } }, containerName: "MyModule" }, @@ -1845,7 +2277,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@enforce_keys", kind: 14, location: %{ - range: %{end: %{character: 3, line: 5}, start: %{character: 3, line: 5}} + range: %{ + "end" => %{"character" => 3, "line" => 5}, + "start" => %{"character" => 3, "line" => 5} + } }, containerName: "MyModule" }, @@ -1853,7 +2288,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@compile", kind: 14, location: %{ - range: %{end: %{character: 3, line: 6}, start: %{character: 3, line: 6}} + range: %{ + "end" => %{"character" => 3, "line" => 6}, + "start" => %{"character" => 3, "line" => 6} + } }, containerName: "MyModule" }, @@ -1861,7 +2299,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@deprecated", kind: 14, location: %{ - range: %{end: %{character: 3, line: 7}, start: %{character: 3, line: 7}} + range: %{ + "end" => %{"character" => 3, "line" => 7}, + "start" => %{"character" => 3, "line" => 7} + } }, containerName: "MyModule" }, @@ -1869,7 +2310,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@dialyzer", kind: 14, location: %{ - range: %{end: %{character: 3, line: 8}, start: %{character: 3, line: 8}} + range: %{ + "end" => %{"character" => 3, "line" => 8}, + "start" => %{"character" => 3, "line" => 8} + } }, containerName: "MyModule" }, @@ -1877,7 +2321,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@file", kind: 14, location: %{ - range: %{end: %{character: 3, line: 9}, start: %{character: 3, line: 9}} + range: %{ + "end" => %{"character" => 3, "line" => 9}, + "start" => %{"character" => 3, "line" => 9} + } }, containerName: "MyModule" }, @@ -1885,7 +2332,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@external_resource", kind: 14, location: %{ - range: %{end: %{character: 3, line: 10}, start: %{character: 3, line: 10}} + range: %{ + "end" => %{"character" => 3, "line" => 10}, + "start" => %{"character" => 3, "line" => 10} + } }, containerName: "MyModule" }, @@ -1893,7 +2343,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@on_load", kind: 14, location: %{ - range: %{end: %{character: 3, line: 11}, start: %{character: 3, line: 11}} + range: %{ + "end" => %{"character" => 3, "line" => 11}, + "start" => %{"character" => 3, "line" => 11} + } }, containerName: "MyModule" }, @@ -1901,7 +2354,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@on_definition", kind: 14, location: %{ - range: %{end: %{character: 3, line: 12}, start: %{character: 3, line: 12}} + range: %{ + "end" => %{"character" => 3, "line" => 12}, + "start" => %{"character" => 3, "line" => 12} + } }, containerName: "MyModule" }, @@ -1909,7 +2365,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@vsn", kind: 14, location: %{ - range: %{end: %{character: 3, line: 13}, start: %{character: 3, line: 13}} + range: %{ + "end" => %{"character" => 3, "line" => 13}, + "start" => %{"character" => 3, "line" => 13} + } }, containerName: "MyModule" }, @@ -1917,7 +2376,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@after_compile", kind: 14, location: %{ - range: %{end: %{character: 3, line: 14}, start: %{character: 3, line: 14}} + range: %{ + "end" => %{"character" => 3, "line" => 14}, + "start" => %{"character" => 3, "line" => 14} + } }, containerName: "MyModule" }, @@ -1925,7 +2387,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@before_compile", kind: 14, location: %{ - range: %{end: %{character: 3, line: 15}, start: %{character: 3, line: 15}} + range: %{ + "end" => %{"character" => 3, "line" => 15}, + "start" => %{"character" => 3, "line" => 15} + } }, containerName: "MyModule" }, @@ -1933,7 +2398,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@fallback_to_any", kind: 14, location: %{ - range: %{end: %{character: 3, line: 16}, start: %{character: 3, line: 16}} + range: %{ + "end" => %{"character" => 3, "line" => 16}, + "start" => %{"character" => 3, "line" => 16} + } }, containerName: "MyModule" }, @@ -1941,7 +2409,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "@impl MyBehaviour", kind: 14, location: %{ - range: %{end: %{character: 3, line: 17}, start: %{character: 3, line: 17}} + range: %{ + "end" => %{"character" => 3, "line" => 17}, + "start" => %{"character" => 3, "line" => 17} + } }, containerName: "MyModule" } @@ -1966,24 +2437,24 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "test \"does something\"", range: %{ - end: %{character: 8, line: 3}, - start: %{character: 8, line: 3} + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} }, selectionRange: %{ - end: %{character: 8, line: 3}, - start: %{character: 8, line: 3} + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} } } ], kind: 2, name: "MyModuleTest", range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} }, selectionRange: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } } ]} = DocumentSymbols.symbols(uri, text, true) @@ -2004,14 +2475,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModuleTest", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "test \"does something\"", kind: 12, location: %{ - range: %{end: %{character: 8, line: 3}, start: %{character: 8, line: 3}} + range: %{ + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} + } }, containerName: "MyModuleTest" } @@ -2040,36 +2517,36 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "test \"does something\"", range: %{ - end: %{character: 10, line: 4}, - start: %{character: 10, line: 4} + "end" => %{"character" => 10, "line" => 4}, + "start" => %{"character" => 10, "line" => 4} }, selectionRange: %{ - end: %{character: 10, line: 4}, - start: %{character: 10, line: 4} + "end" => %{"character" => 10, "line" => 4}, + "start" => %{"character" => 10, "line" => 4} } } ], kind: 12, name: "describe \"some description\"", range: %{ - end: %{character: 8, line: 3}, - start: %{character: 8, line: 3} + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} }, selectionRange: %{ - end: %{character: 8, line: 3}, - start: %{character: 8, line: 3} + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} } } ], kind: 2, name: "MyModuleTest", range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} }, selectionRange: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } } ]} = DocumentSymbols.symbols(uri, text, true) @@ -2097,36 +2574,36 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "test \"does\" <> \"something\"", range: %{ - end: %{character: 10, line: 4}, - start: %{character: 10, line: 4} + "end" => %{"character" => 10, "line" => 4}, + "start" => %{"character" => 10, "line" => 4} }, selectionRange: %{ - end: %{character: 10, line: 4}, - start: %{character: 10, line: 4} + "end" => %{"character" => 10, "line" => 4}, + "start" => %{"character" => 10, "line" => 4} } } ], kind: 12, name: describe_sigil, range: %{ - end: %{character: 8, line: 3}, - start: %{character: 8, line: 3} + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} }, selectionRange: %{ - end: %{character: 8, line: 3}, - start: %{character: 8, line: 3} + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} } } ], kind: 2, name: "MyModuleTest", range: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} }, selectionRange: %{ - end: %{character: 6, line: 1}, - start: %{character: 6, line: 1} + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} } } ]} = DocumentSymbols.symbols(uri, text, true) @@ -2155,14 +2632,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModuleTest", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "describe \"some description\"", kind: 12, location: %{ - range: %{end: %{character: 8, line: 3}, start: %{character: 8, line: 3}} + range: %{ + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} + } }, containerName: "MyModuleTest" }, @@ -2170,7 +2653,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "test \"does something\"", kind: 12, location: %{ - range: %{end: %{character: 10, line: 4}, start: %{character: 10, line: 4}} + range: %{ + "end" => %{"character" => 10, "line" => 4}, + "start" => %{"character" => 10, "line" => 4} + } }, containerName: "describe \"some description\"" } @@ -2194,14 +2680,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModuleTest", kind: 2, location: %{ - range: %{end: %{character: 6, line: 1}, start: %{character: 6, line: 1}} + range: %{ + "end" => %{"character" => 6, "line" => 1}, + "start" => %{"character" => 6, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: describe_sigil, kind: 12, location: %{ - range: %{end: %{character: 8, line: 3}, start: %{character: 8, line: 3}} + range: %{ + "end" => %{"character" => 8, "line" => 3}, + "start" => %{"character" => 8, "line" => 3} + } }, containerName: "MyModuleTest" }, @@ -2209,7 +2701,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "test \"does\" <> \"something\"", kind: 12, location: %{ - range: %{end: %{character: 10, line: 4}, start: %{character: 10, line: 4}} + range: %{ + "end" => %{"character" => 10, "line" => 4}, + "start" => %{"character" => 10, "line" => 4} + } }, containerName: describe_sigil } @@ -2246,37 +2741,52 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 12, name: "setup", - range: %{end: %{character: 2, line: 2}, start: %{character: 2, line: 2}}, + range: %{ + "end" => %{"character" => 2, "line" => 2}, + "start" => %{"character" => 2, "line" => 2} + }, selectionRange: %{ - end: %{character: 2, line: 2}, - start: %{character: 2, line: 2} + "end" => %{"character" => 2, "line" => 2}, + "start" => %{"character" => 2, "line" => 2} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "setup", - range: %{end: %{character: 2, line: 5}, start: %{character: 2, line: 5}}, + range: %{ + "end" => %{"character" => 2, "line" => 5}, + "start" => %{"character" => 2, "line" => 5} + }, selectionRange: %{ - end: %{character: 2, line: 5}, - start: %{character: 2, line: 5} + "end" => %{"character" => 2, "line" => 5}, + "start" => %{"character" => 2, "line" => 5} } }, %Protocol.DocumentSymbol{ children: [], kind: 12, name: "setup_all", - range: %{end: %{character: 2, line: 6}, start: %{character: 2, line: 6}}, + range: %{ + "end" => %{"character" => 2, "line" => 6}, + "start" => %{"character" => 2, "line" => 6} + }, selectionRange: %{ - end: %{character: 2, line: 6}, - start: %{character: 2, line: 6} + "end" => %{"character" => 2, "line" => 6}, + "start" => %{"character" => 2, "line" => 6} } } ], kind: 2, name: "MyModuleTest", - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}}, - selectionRange: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -2303,14 +2813,20 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "MyModuleTest", kind: 2, location: %{ - range: %{end: %{character: 0, line: 0}, start: %{character: 0, line: 0}} + range: %{ + "end" => %{"character" => 0, "line" => 0}, + "start" => %{"character" => 0, "line" => 0} + } } }, %Protocol.SymbolInformation{ name: "setup", kind: 12, location: %{ - range: %{end: %{character: 2, line: 2}, start: %{character: 2, line: 2}} + range: %{ + "end" => %{"character" => 2, "line" => 2}, + "start" => %{"character" => 2, "line" => 2} + } }, containerName: "MyModuleTest" }, @@ -2318,7 +2834,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "setup", kind: 12, location: %{ - range: %{end: %{character: 2, line: 5}, start: %{character: 2, line: 5}} + range: %{ + "end" => %{"character" => 2, "line" => 5}, + "start" => %{"character" => 2, "line" => 5} + } }, containerName: "MyModuleTest" }, @@ -2326,7 +2845,10 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "setup_all", kind: 12, location: %{ - range: %{end: %{character: 2, line: 6}, start: %{character: 2, line: 6}} + range: %{ + "end" => %{"character" => 2, "line" => 6}, + "start" => %{"character" => 2, "line" => 6} + } }, containerName: "MyModuleTest" } @@ -2356,29 +2878,53 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do children: [], kind: 20, name: "config :logger :console", - range: %{end: %{character: 0, line: 1}, start: %{character: 0, line: 1}}, - selectionRange: %{end: %{character: 0, line: 1}, start: %{character: 0, line: 1}} + range: %{ + "end" => %{"character" => 0, "line" => 1}, + "start" => %{"character" => 0, "line" => 1} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 1}, + "start" => %{"character" => 0, "line" => 1} + } }, %Protocol.DocumentSymbol{ children: [], kind: 20, name: "config :app :key", - range: %{end: %{character: 0, line: 6}, start: %{character: 0, line: 6}}, - selectionRange: %{end: %{character: 0, line: 6}, start: %{character: 0, line: 6}} + range: %{ + "end" => %{"character" => 0, "line" => 6}, + "start" => %{"character" => 0, "line" => 6} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 6}, + "start" => %{"character" => 0, "line" => 6} + } }, %Protocol.DocumentSymbol{ children: [], kind: 20, name: "config :my_app :ecto_repos", - range: %{end: %{character: 0, line: 7}, start: %{character: 0, line: 7}}, - selectionRange: %{end: %{character: 0, line: 7}, start: %{character: 0, line: 7}} + range: %{ + "end" => %{"character" => 0, "line" => 7}, + "start" => %{"character" => 0, "line" => 7} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 7}, + "start" => %{"character" => 0, "line" => 7} + } }, %Protocol.DocumentSymbol{ children: [], kind: 20, name: "config :my_app MyApp.Repo", - range: %{end: %{character: 0, line: 9}, start: %{character: 0, line: 9}}, - selectionRange: %{end: %{character: 0, line: 9}, start: %{character: 0, line: 9}} + range: %{ + "end" => %{"character" => 0, "line" => 9}, + "start" => %{"character" => 0, "line" => 9} + }, + selectionRange: %{ + "end" => %{"character" => 0, "line" => 9}, + "start" => %{"character" => 0, "line" => 9} + } } ]} = DocumentSymbols.symbols(uri, text, true) end @@ -2406,28 +2952,40 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do name: "config :logger :console", kind: 20, location: %{ - range: %{end: %{character: 0, line: 1}, start: %{character: 0, line: 1}} + range: %{ + "end" => %{"character" => 0, "line" => 1}, + "start" => %{"character" => 0, "line" => 1} + } } }, %Protocol.SymbolInformation{ name: "config :app :key", kind: 20, location: %{ - range: %{end: %{character: 0, line: 6}, start: %{character: 0, line: 6}} + range: %{ + "end" => %{"character" => 0, "line" => 6}, + "start" => %{"character" => 0, "line" => 6} + } } }, %Protocol.SymbolInformation{ name: "config :my_app :ecto_repos", kind: 20, location: %{ - range: %{end: %{character: 0, line: 7}, start: %{character: 0, line: 7}} + range: %{ + "end" => %{"character" => 0, "line" => 7}, + "start" => %{"character" => 0, "line" => 7} + } } }, %Protocol.SymbolInformation{ name: "config :my_app MyApp.Repo", kind: 20, location: %{ - range: %{end: %{character: 0, line: 9}, start: %{character: 0, line: 9}} + range: %{ + "end" => %{"character" => 0, "line" => 9}, + "start" => %{"character" => 0, "line" => 9} + } } } ]} = DocumentSymbols.symbols(uri, text, false) @@ -2450,12 +3008,12 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 2, name: "MISSING_MODULE_NAME", range: %{ - start: %{line: 0, character: 0}, - end: %{line: 0, character: 0} + "start" => %{"line" => 0, "character" => 0}, + "end" => %{"line" => 0, "character" => 0} }, selectionRange: %{ - start: %{line: 0, character: 0}, - end: %{line: 0, character: 0} + "start" => %{"line" => 0, "character" => 0}, + "end" => %{"line" => 0, "character" => 0} } } ] = document_symbols @@ -2466,12 +3024,12 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 12, name: "def foo", range: %{ - start: %{character: 4, line: 1}, - end: %{character: 4, line: 1} + "start" => %{"character" => 4, "line" => 1}, + "end" => %{"character" => 4, "line" => 1} }, selectionRange: %{ - start: %{character: 4, line: 1}, - end: %{character: 4, line: 1} + "start" => %{"character" => 4, "line" => 1}, + "end" => %{"character" => 4, "line" => 1} } } ] @@ -2493,12 +3051,12 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do kind: 11, name: "MISSING_PROTOCOL_NAME", range: %{ - start: %{line: 0, character: 0}, - end: %{line: 0, character: 0} + "start" => %{"line" => 0, "character" => 0}, + "end" => %{"line" => 0, "character" => 0} }, selectionRange: %{ - start: %{line: 0, character: 0}, - end: %{line: 0, character: 0} + "start" => %{"line" => 0, "character" => 0}, + "end" => %{"line" => 0, "character" => 0} } } ]