Eep 48 markdown

apps/els_core/src/els_stdio.erl

@@ -30,7 +30,7 @@ init({Cb, IoDevice}) ->
 
 -spec send(atom() | pid(), binary()) -> ok.
 send(IoDevice, Payload) ->
-  io:format(IoDevice, "~s", [Payload]).
+  io:format(IoDevice, "~ts", [Payload]).
 
 %%==============================================================================
 %% Listener loop function

apps/els_core/src/els_utils.erl

@@ -5,6 +5,7 @@
         , filename_to_atom/1
         , find_header/1
         , find_module/1
+        , find_modules/1
         , fold_files/4
         , halt/1
         , lookup_document/1
@@ -113,16 +114,26 @@ find_header(Id) ->
 %% @doc Look for a module in the DB
 -spec find_module(atom()) -> {ok, uri()} | {error, any()}.
 find_module(Id) ->
+  case find_modules(Id) of
+      {ok, [Uri | _]} ->
+          {ok, Uri};
+      Else ->
+          Else
+  end.
+
+%% @doc Look for all versions of a module in the DB
+-spec find_modules(atom()) -> {ok, [uri()]} | {error, any()}.
+find_modules(Id) ->
   {ok, Candidates} = els_dt_document_index:lookup(Id),
   case [Uri || #{kind := module, uri := Uri} <- Candidates] of
-    [Uri] ->
-      {ok, Uri};
-    [_|_] = Uris ->
-      [Uri|_] = prioritize_uris(Uris),
-      {ok, Uri};
-    [] ->
-      FileName = atom_to_list(Id) ++ ".erl",
-      els_indexing:find_and_index_file(FileName)
+      [] ->
+          FileName = atom_to_list(Id) ++ ".erl",
+          case els_indexing:find_and_index_file(FileName) of
+              {ok, Uri} -> {ok, [Uri]};
+              Error -> Error
+          end;
+      Uris ->
+          {ok, prioritize_uris(Uris)}
   end.
 
 %% @doc Look for a document in the DB.

apps/els_lsp/priv/code_navigation/src/completion_resolve.erl

@@ -1,19 +1,22 @@
 -module(completion_resolve).
 
 -export([ call_1/0
-        , call_2/0
         , main/0
         ]).
 
+%% @doc Call me maybe
 -spec call_1() -> 'ok'.
 call_1() ->
   ok.
 
-call_2() ->
-  ok.
-
 main() ->
   completion_resolve:call_1(),
   call_1(),
   completion_resolve_2:call_1(),
+  file:write(a, b),
   ok.
+
+%% @doc Call me sometime
+-spec call_2() -> 'ok'.
+call_2() ->
+  ok.

apps/els_lsp/priv/code_navigation/src/completion_resolve_2.erl

@@ -2,6 +2,7 @@
 
 -export([ call_1/0 ]).
 
+%% @doc I just met you
 -spec call_1() -> 'ok'.
 call_1() ->
   ok.

apps/els_lsp/priv/code_navigation/src/completion_resolve_type.erl

@@ -0,0 +1,20 @@
+-module(completion_resolve).
+
+-export([ call_3/3
+        ]).
+
+-opaque myopaque() :: term().
+%% This is my opaque
+
+-type mytype() :: completion_resolve_type:myopaque().
+%% This is my type
+
+-export_type([myopaque/0]).
+
+-spec call_3({mytype(), completion_resolve_type:myopaque()},
+             completion_resolve_type_2:mytype(list()),
+             completion_resolve_type_2:myopaque(list())) ->
+  file:name_all().
+call_3(_A, _B, _C) ->
+  ok.
+

apps/els_lsp/priv/code_navigation/src/completion_resolve_type_2.erl

@@ -0,0 +1,8 @@
+-module(completion_resolve_2).
+
+-type mytype(T) :: [T].
+%% Hello
+-opaque myopaque(T) :: [T].
+%% Is there anybody in there
+
+-export_type([mytype/1,myopaque/1]).

apps/els_lsp/priv/code_navigation/src/hover_docs.erl

@@ -1,10 +1,14 @@
 -module(hover_docs).
 
--export([ multiple_clauses/1 ]).
+-export([ multiple_clauses/1, edoc/0 ]).
 
 multiple_clauses(L) when is_list(L) ->
   42;
 multiple_clauses(#{data := Data}) ->
   Data;
 multiple_clauses(X) ->
   X - 12.
+
+%% @doc An edoc hover item
+-spec edoc() -> ok.
+edoc() -> ok.

apps/els_lsp/priv/code_navigation/src/hover_docs_caller.erl

@@ -19,10 +19,23 @@ implicit_funs() ->
   {fun local_call/2,
    fun hover_docs:multiple_clauses/1}.
 
+remote_call_edoc() ->
+  hover_docs:edoc().
+
+remote_call_otp() ->
+  file:write(a, b).
+
+local_call_edoc() ->
+  edoc().
+
 local_call() ->
   ok.
 
 -spec local_call(integer(), any()) -> tuple();
                 (float(), any()) -> tuple().
 local_call(Arg1, Arg2) ->
   {Arg1, Arg2}.
+
+%% @doc An edoc hover item
+-spec edoc() -> ok.
+edoc() -> ok.

apps/els_lsp/priv/code_navigation/src/hover_type.erl

@@ -0,0 +1,24 @@
+-module(hover_type).
+
+-type type_a() :: any().
+-opaque opaque_type_a() :: any().
+
+-spec f(type_a()) -> ok.
+f(_) ->
+  ok.
+
+-spec g(hover_type_remote:type_a()) -> ok.
+g(_) ->
+  ok.
+
+-spec h(opaque_type_a()) -> ok.
+h(_) ->
+  ok.
+
+-spec i(hover_type_remote:opaque_type_a()) -> ok.
+i(_) ->
+  ok.
+
+-spec j(doesnt:exist()) -> ok.
+j(_) ->
+  ok.

apps/els_lsp/priv/code_navigation/src/hover_type_remote.erl

@@ -0,0 +1,9 @@
+-module(hover_type_remote).
+
+-type type_a() :: atom().
+
+-export_type([ type_a/0 ]).
+
+-opaque opaque_type_a() :: atom().
+
+-export_type([ opaque_type_a/0 ]).

apps/els_lsp/src/els_completion_provider.erl

@@ -88,6 +88,17 @@ resolve(#{ <<"kind">> := ?COMPLETION_ITEM_KIND_FUNCTION
                                    , binary_to_atom(Function, utf8)
                                    , Arity),
   CompletionItem#{documentation => els_markup_content:new(Entries)};
+resolve(#{ <<"kind">> := ?COMPLETION_ITEM_KIND_TYPE_PARAM
+         , <<"data">> := #{ <<"module">> := Module
+                          , <<"type">> := Type
+                          , <<"arity">> := Arity
+                        }
+         } = CompletionItem) ->
+  Entries = els_docs:type_docs('remote'
+          , binary_to_atom(Module, utf8)
+          , binary_to_atom(Type, utf8)
+          , Arity),
+  CompletionItem#{ documentation => els_markup_content:new(Entries) };
 resolve(CompletionItem) ->
   CompletionItem.
 
@@ -511,6 +522,13 @@ resolve_definition(Uri, #{kind := 'function', id := {F, A}} = POI, ArityOnly) ->
           , <<"arity">> => A
           },
   completion_item(POI, Data, ArityOnly);
+resolve_definition(Uri, #{kind := 'type_definition', id := {T, A}} = POI,
+                   ArityOnly) ->
+  Data = #{ <<"module">> => els_uri:module(Uri)
+          , <<"type">> => T
+          , <<"arity">> => A
+          },
+  completion_item(POI, Data, ArityOnly);
 resolve_definition(_Uri, POI, ArityOnly) ->
   completion_item(POI, ArityOnly).