Completion without snippets (#1170)

erlang-ls · Jan 30, 2022 · 0fa9df8 · 0fa9df8
1 parent db82b7c
commit 0fa9df8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/apps/els_core/src/els_client.erl b/apps/els_core/src/els_client.erl
@@ -449,7 +449,10 @@ request_params({completionitem_resolve, CompletionItem}) ->
 request_params({initialize, {RootUri, InitOptions}}) ->
   ContentFormat = [ ?MARKDOWN , ?PLAINTEXT ],
   TextDocument = #{ <<"completion">> =>
-                    #{ <<"contextSupport">> => 'true' }
+                    #{ <<"contextSupport">> => 'true'
+                     , <<"completionItem">> =>
+                       #{ <<"snippetSupport">> => 'true' }
+                     }
                   , <<"hover">> =>
                     #{ <<"contentFormat">> => ContentFormat }
                   },

diff --git a/apps/els_lsp/src/els_completion_provider.erl b/apps/els_lsp/src/els_completion_provider.erl
@@ -734,12 +734,28 @@ snippet_macro(Name, none) ->
 
 -spec snippet_args(binary(), [{integer(), string()}]) -> binary().
 snippet_args(Name, Args0) ->
-  Args    = [ ["${", integer_to_list(N), ":", A, "}"]
-              || {N, A} <- Args0
-            ],
+  Args =
+    case snippet_support() of
+      false ->
+        [A || {_N, A} <- Args0];
+      true ->
+        [["${", integer_to_list(N), ":", A, "}"] || {N, A} <- Args0]
+    end,
   Snippet = [Name, "(", string:join(Args, ", "), ")"],
   els_utils:to_binary(Snippet).
 
+-spec snippet_support() -> boolean().
+snippet_support() ->
+  case els_config:get(capabilities) of
+    #{<<"textDocument">> :=
+        #{<<"completion">> :=
+            #{<<"completionItem">> :=
+                #{<<"snippetSupport">> := SnippetSupport}}}} ->
+      SnippetSupport;
+    _ ->
+      false
+  end.
+
 -spec is_in(els_dt_document:item(), line(), column(), [poi_kind()]) ->
   boolean().
 is_in(Document, Line, Column, POIKinds) ->