Merge pull request #978 from TheGeorge/references_on_goto_definition

return references if no definitions are found
erlang-ls · Apr 23, 2021 · 016167e · 016167e
2 parents c3ba39d + 028e7f1
commit 016167e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/apps/els_lsp/src/els_definition_provider.erl b/apps/els_lsp/src/els_definition_provider.erl
@@ -8,6 +8,7 @@
 
 -include("els_lsp.hrl").
 
+
 -type state() :: any().
 
 %%==============================================================================
@@ -27,7 +28,12 @@ handle_request({definition, Params}, State) ->
    } = Params,
   {ok, Document} = els_utils:lookup_document(Uri),
   POIs = els_dt_document:get_element_at_pos(Document, Line + 1, Character + 1),
-  {goto_definition(Uri, POIs), State}.
+  case goto_definition(Uri, POIs) of
+    null ->
+      els_references_provider:handle_request({references, Params}, State);
+    GoTo ->
+      {GoTo, State}
+  end.
 
 -spec goto_definition(uri(), [poi()]) -> map() | null.
 goto_definition(_Uri, []) ->

diff --git a/apps/els_lsp/test/els_definition_SUITE.erl b/apps/els_lsp/test/els_definition_SUITE.erl
@@ -389,7 +389,12 @@ type_application_undefined(Config) ->
   Uri = ?config(code_navigation_uri, Config),
   Def = els_client:definition(Uri, 55, 42),
   #{result := Result} =  Def,
-  ?assertEqual(null, Result),
+  Expected = [
+    #{ range => #{'end' => #{character => 49, line => 54},
+                  start => #{character => 33, line => 54}}
+     , uri => Uri}
+  ],
+  ?assertEqual(Expected, Result),
   ok.
 
 -spec type_application_user(config()) -> ok.