Goto type definition from export_type entry

erlang-ls · Apr 8, 2021 · 1debea8 · 1debea8
1 parent 76fa5ff
commit 1debea8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/apps/els_lsp/priv/code_navigation/src/code_navigation.erl b/apps/els_lsp/priv/code_navigation/src/code_navigation.erl
@@ -6,7 +6,7 @@
 
 %% behaviour_a callbacks
 -export([ callback_a/0 ]).
-
+-export_type([ type_a/0 ]).
 -import(code_navigation_extra, [ do/1 ]).
 -include("transitive.hrl").
 -include("code_navigation.hrl").

diff --git a/apps/els_lsp/src/els_code_navigation.erl b/apps/els_lsp/src/els_code_navigation.erl
@@ -100,7 +100,8 @@ goto_definition(_Uri, #{ kind := type_application, id := {M, T, A} }) ->
     {ok, Uri}      -> find(Uri, type_definition, {T, A});
     {error, Error} -> {error, Error}
   end;
-goto_definition(Uri, #{ kind := type_application, id := {T, A} }) ->
+goto_definition(Uri, #{ kind := Kind, id := {T, A} })
+  when Kind =:= type_application; Kind =:= export_type_entry ->
   find(Uri, type_definition, {T, A});
 goto_definition(_Uri, #{ kind := parse_transform, id := Module }) ->
   case els_utils:find_module(Module) of

diff --git a/apps/els_lsp/test/els_definition_SUITE.erl b/apps/els_lsp/test/els_definition_SUITE.erl
@@ -42,6 +42,7 @@
         , type_application_remote/1
         , type_application_undefined/1
         , type_application_user/1
+        , type_export_entry/1
         , variable/1
         , opaque_application_remote/1
         , opaque_application_user/1
@@ -401,6 +402,16 @@ type_application_user(Config) ->
               , Range),
   ok.
 
+-spec type_export_entry(config()) -> ok.
+type_export_entry(Config) ->
+  Uri = ?config(code_navigation_uri, Config),
+  Def = els_client:definition(Uri, 9, 17),
+  #{result := #{range := Range, uri := DefUri}} = Def,
+  ?assertEqual(Uri, DefUri),
+  ?assertEqual( els_protocol:range(#{from => {37, 7}, to => {37, 13}})
+              , Range),
+  ok.
+
 -spec variable(config()) -> ok.
 variable(Config) ->
   Uri = ?config(code_navigation_uri, Config),