Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions apps/language_server/test/providers/definition/locator_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,43 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
assert nil == Locator.definition("__MODULE__", 1, 1)
end

# elixir-lsp/elixir-ls#1038: goto-definition must work when the cursor is at the very end of a
# symbol (one column past its last character), not only when it is on a character of the symbol.
test "find definition with the cursor at the end of the symbol (#1038)" do
Comment on lines +21 to +23
buffer = """
defmodule MyModule do
def my_func(a), do: a

def caller do
my_func(1)
end
end
"""

# `my_func` is on line 5 at columns 5..11; column 12 is the end of the symbol.
for col <- [8, 11, 12] do
assert %Location{type: :function, line: 2} = Locator.definition(buffer, 5, col),
"expected my_func/1 definition at line 5 column #{col}"
end
end

# elixir-lsp/elixir-ls#1027: at the end of an alias that is the LHS of a remote call, the cursor
# resolves to the module, not the function.
test "cursor at the end of an alias before `.` resolves the module (#1027)" do
buffer = """
defmodule MyModule do
alias ElixirSenseExample.ModuleWithFunctions

def caller do
ModuleWithFunctions.function_arity_zero()
end
end
"""

# `ModuleWithFunctions` is on line 5 at columns 5..23; column 24 is on the `.` (its end).
assert %Location{type: :module} = Locator.definition(buffer, 5, 24)
end

test "find module definition inside Phoenix's scope" do
_define_existing_atom = ExampleWeb

Expand Down
2 changes: 1 addition & 1 deletion dep_versions.exs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
elixir_sense: "89eda3fc4df9cea0d70c528f3e7e240a70c860f8",
elixir_sense: "ee88a26f471cfc46a898d5a2c4c30bb7ad8beff4",
dialyxir_vendored: "accfec9393079abc4a82b7e79a4997f59f085b67",
jason_v: "f1c10fa9c445cb9f300266122ef18671054b2330",
erl2ex_vendored: "04f93e55f46d35d0aa3c149616f2c7a6a1ad9311",
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
"dialyxir_vendored": {:git, "https://github.com/elixir-lsp/dialyxir.git", "accfec9393079abc4a82b7e79a4997f59f085b67", [ref: "accfec9393079abc4a82b7e79a4997f59f085b67"]},
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "89eda3fc4df9cea0d70c528f3e7e240a70c860f8", [ref: "89eda3fc4df9cea0d70c528f3e7e240a70c860f8"]},
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "ee88a26f471cfc46a898d5a2c4c30bb7ad8beff4", [ref: "ee88a26f471cfc46a898d5a2c4c30bb7ad8beff4"]},
"erl2ex_vendored": {:git, "https://github.com/elixir-lsp/erl2ex.git", "04f93e55f46d35d0aa3c149616f2c7a6a1ad9311", [ref: "04f93e55f46d35d0aa3c149616f2c7a6a1ad9311"]},
"erlex_vendored": {:git, "https://github.com/elixir-lsp/erlex.git", "50b8307f90451a5d0288fb239fb6405b5ca1f1a4", [ref: "50b8307f90451a5d0288fb239fb6405b5ca1f1a4"]},
"jason_v": {:git, "https://github.com/elixir-lsp/jason.git", "f1c10fa9c445cb9f300266122ef18671054b2330", [ref: "f1c10fa9c445cb9f300266122ef18671054b2330"]},
Expand Down
Loading