Merge pull request #930 from sgillis/els-utils-lookup

Use els_utils:lookup_document for lookup
erlang-ls · Mar 4, 2021 · 209b68f · 209b68f
2 parents f96a9db + c9a19f4
commit 209b68f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 30 deletions.
diff --git a/apps/els_core/src/els_utils.erl b/apps/els_core/src/els_utils.erl
@@ -132,8 +132,13 @@ lookup_document(Uri) ->
     {ok, []} ->
       Path = els_uri:path(Uri),
       {ok, Uri} = els_indexing:index_file(Path),
-      {ok, [Document]} = els_dt_document:lookup(Uri),
-      {ok, Document}
+      case els_dt_document:lookup(Uri) of
+        {ok, [Document]} ->
+          {ok, Document};
+        Error ->
+          ?LOG_INFO("Document lookup failed [error=~p] [uri=~p]", [Error, Uri]),
+          {error, Error}
+      end
   end.
 
 -spec macro_string_to_term(list()) -> any().

diff --git a/apps/els_lsp/src/els_code_navigation.erl b/apps/els_lsp/src/els_code_navigation.erl
@@ -117,10 +117,10 @@ find([Uri|Uris0], Kind, Data, AlreadyVisited) ->
       find(Uris0, Kind, Data, AlreadyVisited);
     false ->
       AlreadyVisited2 = sets:add_element(Uri, AlreadyVisited),
-      case els_dt_document:lookup(Uri) of
-        {ok, [Document]} ->
+      case els_utils:lookup_document(Uri) of
+        {ok, Document} ->
           find_in_document([Uri|Uris0], Document, Kind, Data, AlreadyVisited2);
-        {ok, []} ->
+        {error, _Error} ->
           find(Uris0, Kind, Data, AlreadyVisited2)
       end
   end;

diff --git a/apps/els_lsp/src/els_compiler_diagnostics.erl b/apps/els_lsp/src/els_compiler_diagnostics.erl
@@ -142,8 +142,8 @@ parse_escript(Uri) ->
         [els_diagnostics:diagnostic()].
 diagnostics(Path, List, Severity) ->
   Uri = els_uri:uri(els_utils:to_binary(Path)),
-  case els_dt_document:lookup(Uri) of
-    {ok, [Document]} ->
+  case els_utils:lookup_document(Uri) of
+    {ok, Document} ->
       lists:flatten([[ diagnostic( Path
                                  , MessagePath
                                  , range(Anno)
@@ -153,8 +153,7 @@ diagnostics(Path, List, Severity) ->
                                  , Severity)
                        || {Anno, Module, Desc} <- Info]
                      || {MessagePath, Info} <- List]);
-    Error ->
-      ?LOG_INFO("diagnostics doc lookup failed [Error=~p]", [Error]),
+    {error, _Error} ->
       []
   end.
 

diff --git a/apps/els_lsp/src/els_crossref_diagnostics.erl b/apps/els_lsp/src/els_crossref_diagnostics.erl
@@ -33,10 +33,10 @@ is_default() ->
 
 -spec run(uri()) -> [els_diagnostics:diagnostic()].
 run(Uri) ->
-  case els_dt_document:lookup(Uri) of
-    {ok, []} ->
+  case els_utils:lookup_document(Uri) of
+    {error, _Error} ->
       [];
-    {ok, [Document|_]} ->
+    {ok, Document} ->
       POIs = els_dt_document:pois(Document, [ application
                                             , implicit_fun
                                             , import_entry

diff --git a/apps/els_lsp/src/els_diagnostics_utils.erl b/apps/els_lsp/src/els_diagnostics_utils.erl
@@ -31,8 +31,8 @@ included_uris(Document) ->
 dependencies([], Acc, _AlreadyProcessed) ->
   Acc;
 dependencies([Uri|Uris], Acc, AlreadyProcessed) ->
-  case els_dt_document:lookup(Uri) of
-    {ok, [Document]} ->
+  case els_utils:lookup_document(Uri) of
+    {ok, Document} ->
       Behaviours = els_dt_document:pois(Document, [behaviour]),
       ParseTransforms = els_dt_document:pois(Document, [parse_transform]),
       IncludedUris = included_uris(Document),
@@ -49,8 +49,7 @@ dependencies([Uri|Uris], Acc, AlreadyProcessed) ->
                   , Acc ++ [Id || #{id := Id} <- Behaviours ++ ParseTransforms]
                     ++ [els_uri:module(FPTUri) || FPTUri <- FilteredPTUris]
                   , sets:add_element(Uri, AlreadyProcessed));
-    Error ->
-      ?LOG_INFO("Lookup failed [Error=~p]", [Error]),
+    {error, _Error} ->
       []
   end.
 
@@ -62,14 +61,13 @@ exclude_already_processed(Uris, AlreadyProcessed) ->
 pt_deps(Module) ->
   case els_utils:find_module(Module) of
     {ok, Uri} ->
-      case els_dt_document:lookup(Uri) of
-        {ok, [Document]} ->
+      case els_utils:lookup_document(Uri) of
+        {ok, Document} ->
           Applications = els_dt_document:pois(Document, [ application
                                                         , implicit_fun
                                                         ]),
           applications_to_uris(Applications);
-        Error ->
-          ?LOG_INFO("Lookup failed [Error=~p]", [Error]),
+        {error, _Error} ->
           []
       end;
     {error, Error} ->

diff --git a/apps/els_lsp/src/els_folding_range_provider.erl b/apps/els_lsp/src/els_folding_range_provider.erl
@@ -26,7 +26,7 @@ is_enabled() ->
 -spec handle_request(tuple(), state()) -> {folding_range_result(), state()}.
 handle_request({document_foldingrange, Params}, State) ->
   #{ <<"textDocument">> := #{<<"uri">> := Uri} } = Params,
-  {ok, [Document]} = els_dt_document:lookup(Uri),
+  {ok, Document} = els_utils:lookup_document(Uri),
   POIs = els_dt_document:pois(Document, [folding_range]),
   Response = case [folding_range(Range) || #{range := Range} <- POIs] of
                []     -> null;

diff --git a/apps/els_lsp/src/els_unused_includes_diagnostics.erl b/apps/els_lsp/src/els_unused_includes_diagnostics.erl
@@ -32,10 +32,10 @@ is_default() ->
 
 -spec run(uri()) -> [els_diagnostics:diagnostic()].
 run(Uri) ->
-  case els_dt_document:lookup(Uri) of
-    {ok, []} ->
+  case els_utils:lookup_document(Uri) of
+    {error, _Error} ->
       [];
-    {ok, [Document|_]} ->
+    {ok, Document} ->
       Includes = els_dt_document:pois(Document, [include, include_lib]),
       UnusedIncludes = find_unused_includes(Document, Includes),
       [ els_diagnostics:make_diagnostic(
@@ -87,8 +87,8 @@ expand_includes(Uri) ->
 expand_includes([], Graph, _Visited) ->
   Graph;
 expand_includes([Uri|Uris], Graph, Visited) ->
-  case els_dt_document:lookup(Uri) of
-    {ok, [Document]} ->
+  case els_utils:lookup_document(Uri) of
+    {ok, Document} ->
       IncludedUris = els_diagnostics_utils:included_uris(Document),
       NonVisitedIncludedUris = [U || U <- IncludedUris
                                        , not sets:is_element(U, Visited)],
@@ -103,7 +103,7 @@ expand_includes([Uri|Uris], Graph, Visited) ->
       expand_includes( Uris ++ NonVisitedIncludedUris
                      , NewGraph
                      , sets:add_element(Uri, Visited));
-    {ok, []} ->
+    {error, _Error} ->
       ?LOG_WARNING("Failed lookup while expanding includes [uri=~p]", [Uri]),
       []
   end.

diff --git a/apps/els_lsp/src/els_unused_macros_diagnostics.erl b/apps/els_lsp/src/els_unused_macros_diagnostics.erl
@@ -33,10 +33,10 @@ is_default() ->
 run(Uri) ->
   case filename:extension(Uri) of
     <<".erl">> ->
-      case els_dt_document:lookup(Uri) of
-        {ok, []} ->
+      case els_utils:lookup_document(Uri) of
+        {error, _Error} ->
           [];
-        {ok, [Document|_]} ->
+        {ok, Document} ->
           UnusedMacros = find_unused_macros(Document),
           [make_diagnostic(POI) || POI <- UnusedMacros ]
       end;