use new args_list elixir_sense API (elixir-editors#461)

Fixes elixir-editors#458

Author: lukaszsamson

apps/language_server/lib/language_server/providers/completion.ex

@@ -284,7 +284,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
          %{
            type: :callback,
            subtype: subtype,
-           args: args,
+           args_list: args_list,
            name: name,
            summary: summary,
            arity: arity,
@@ -308,7 +308,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
         end
 
       opts = Keyword.put(options, :with_parens?, true)
-      insert_text = def_snippet(def_str, name, args, arity, opts)
+      insert_text = def_snippet(def_str, name, args_list, arity, opts)
       label = "#{def_str}#{name}/#{arity}"
 
       filter_text =
@@ -334,7 +334,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
   defp from_completion_item(
          %{
            type: :protocol_function,
-           args: args,
+           args_list: args_list,
            spec: _spec,
            name: name,
            summary: summary,
@@ -349,7 +349,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
       def_str = if(context[:def_before] == nil, do: "def ")
 
       opts = Keyword.put(options, :with_parens?, true)
-      insert_text = def_snippet(def_str, name, args, arity, opts)
+      insert_text = def_snippet(def_str, name, args_list, arity, opts)
       label = "#{def_str}#{name}/#{arity}"
 
       %__MODULE__{
@@ -501,7 +501,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
     end
   end
 
-  defp function_snippet(name, args, arity, opts) do
+  def function_snippet(name, args, arity, opts) do
     snippets_supported? = Keyword.get(opts, :snippets_supported, false)
     trigger_signature? = Keyword.get(opts, :trigger_signature?, false)
     capture_before? = Keyword.get(opts, :capture_before?, false)
@@ -537,17 +537,15 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
     end
   end
 
-  defp function_snippet_with_args(name, arity, args, pipe_before?, with_parens?) do
+  defp function_snippet_with_args(name, arity, args_list, pipe_before?, with_parens?) do
     args_list =
-      if args && args != "" do
-        split_args_for_snippet(args, arity)
-      else
-        for i <- Enum.slice(0..arity, 1..-1), do: "arg#{i}"
-      end
+      args_list
+      |> Enum.map(&format_arg_for_snippet/1)
+      |> remove_unused_default_args(arity)
 
     args_list =
       if pipe_before? do
-        Enum.slice(args_list, 1..-1)
+        tl(args_list)
       else
         args_list
       end
@@ -651,13 +649,11 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
     end
   end
 
-  defp split_args_for_snippet(args, arity) do
-    args
+  defp format_arg_for_snippet(arg) do
+    arg
     |> String.replace("\\", "\\\\")
     |> String.replace("$", "\\$")
     |> String.replace("}", "\\}")
-    |> String.split(",")
-    |> remove_unused_default_args(arity)
   end
 
   defp remove_unused_default_args(args, arity) do
@@ -684,6 +680,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
     %{
       type: type,
       args: args,
+      args_list: args_list,
       name: name,
       summary: summary,
       arity: arity,
@@ -725,13 +722,12 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
           insert_text =
             function_snippet(
               name,
-              args,
+              args_list,
               arity,
               Keyword.merge(
                 options,
                 pipe_before?: pipe_before?,
                 capture_before?: capture_before?,
-                pipe_before?: pipe_before?,
                 trigger_signature?: trigger_signature?,
                 locals_without_parens: locals_without_parens,
                 text_after_cursor: text_after_cursor,

apps/language_server/test/providers/completion_test.exs

@@ -897,4 +897,26 @@ defmodule ElixirLS.LanguageServer.Providers.CompletionTest do
              }
     end
   end
+
+  describe "function_snippets" do
+    test "return valid for record arg" do
+      opts = [
+        snippets_supported: true,
+        deprecated_supported: true,
+        tags_supported: [1],
+        signature_help_supported: true,
+        signature_after_complete: true,
+        pipe_before?: true,
+        capture_before?: false,
+        trigger_signature?: false,
+        locals_without_parens: MapSet.new(),
+        text_after_cursor: "",
+        with_parens?: true,
+        snippet: nil
+      ]
+
+      assert "do_sth()" ==
+               Completion.function_snippet("do_sth", ["My.record(x: x0, y: y0)"], 1, opts)
+    end
+  end
 end

mix.lock

@@ -1,7 +1,7 @@
 %{
   "dialyxir": {:hex, :dialyxir, "1.0.0", "6a1fa629f7881a9f5aaf3a78f094b2a51a0357c843871b8bc98824e7342d00a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "aeb06588145fac14ca08d8061a142d52753dbc2cf7f0d00fc1013f53f8654654"},
   "docsh": {:hex, :docsh, "0.7.2", "f893d5317a0e14269dd7fe79cf95fb6b9ba23513da0480ec6e77c73221cae4f2", [:rebar3], [{:providers, "1.8.1", [hex: :providers, repo: "hexpm", optional: false]}], "hexpm", "4e7db461bb07540d2bc3d366b8513f0197712d0495bb85744f367d3815076134"},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "a8c6a127163e87025b74b12ed150bd30c09f9955", []},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "0fce2bb501b846d71c653ad8fb4275ef15777db0", []},
   "erl2ex": {:git, "https://github.com/dazuma/erl2ex.git", "244c2d9ed5805ef4855a491d8616b8842fef7ca4", []},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "forms": {:hex, :forms, "0.0.1", "45f3b10b6f859f95f2c2c1a1de244d63855296d55ed8e93eb0dd116b3e86c4a6", [:rebar3], [], "hexpm", "530f63ed8ed5a171f744fc75bd69cb2e36496899d19dbef48101b4636b795868"},