fix: fix builtin function matching

devall-org · Apr 10, 2024 · 4b79f2f · 4b79f2f
1 parent 65cb793
commit 4b79f2f
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 29 deletions.
diff --git a/lib/spark/elixir_sense/entity.ex b/lib/spark/elixir_sense/entity.ex
@@ -26,6 +26,8 @@ defmodule Spark.ElixirSense.Entity do
     builtins =
       if builtins && !String.contains?(hint, ".") && lowercase_string?(hint) do
         if function_exported?(Complete, :complete, 4) do
+          ElixirSense.Core.Normalized.Code.Fragment.cursor_context("#{inspect(builtins)}.#{hint}")
+
           apply(Complete, :complete, [
             to_string("#{inspect(builtins)}.#{hint}"),
             apply(ElixirSense.Core.State.Env, :__struct__, []),

diff --git a/lib/spark/elixir_sense/plugin.ex b/lib/spark/elixir_sense/plugin.ex
@@ -42,9 +42,10 @@ defmodule Spark.ElixirSense.Plugin do
       suggestions ->
         suggestions
     end
-  rescue
-    _ ->
-      :ignore
+
+    # rescue
+    #   _ ->
+    #     :ignore
   end
 
   def suggestions(hint, opts) do
@@ -109,9 +110,10 @@ defmodule Spark.ElixirSense.Plugin do
           :ignore
       end
     end
-  rescue
-    _e ->
-      :ignore
+
+    # rescue
+    #   _e ->
+    #     :ignore
   end
 
   defp autocomplete_schema(
@@ -609,18 +611,18 @@ defmodule Spark.ElixirSense.Plugin do
 
         constructors ->
           suggestions =
-            Enum.map(constructors, fn
+            Enum.flat_map(constructors, fn
               {:value, key, config} ->
-                option_values(key, config, hint, opts, value_type_path)
+                List.wrap(option_values(key, config, hint, opts, value_type_path))
 
               {key, config} ->
-                option_suggestions(key, config, type)
+                List.wrap(option_suggestions(key, config, type))
 
               %{__struct__: Spark.Dsl.Entity} = entity ->
-                entity_suggestions(entity)
+                List.wrap(entity_suggestions(entity))
 
               %{__struct__: Spark.Dsl.Section} = section ->
-                section_suggestions(section)
+                List.wrap(section_suggestions(section))
             end)
             |> filter_matches(hint)
 
@@ -633,8 +635,12 @@ defmodule Spark.ElixirSense.Plugin do
 
   defp filter_matches(hints, match) do
     if match do
-      Enum.filter(hints, fn %{label: label} ->
-        apply(Matcher, :match?, [label, match])
+      Enum.filter(hints, fn
+        %{label: label} ->
+          apply(Matcher, :match?, [label, match])
+
+        %{name: name} ->
+          apply(Matcher, :match?, [name, match])
       end)
     else
       hints
@@ -729,8 +735,6 @@ defmodule Spark.ElixirSense.Plugin do
 
     config = Spark.Options.update_key_docs(config)
 
-
-
     %{
       type: :generic,
       kind: :function,

diff --git a/test/elixir_sense/plugin_test.exs b/test/elixir_sense/plugin_test.exs
@@ -142,23 +142,41 @@ defmodule Spark.ElixirSense.PluginTest do
       use Spark.Test.Contact
 
       presets do
-        preset_with_snippet(
-    #                       ^
+        preset_with_fn_arg :foo,
+    #                            ^
         end
       end
     end
     """
 
     [cursor] = cursors(buffer)
 
-    refute %{
-        label: "thing",
-        type: :generic,
-        kind: :function,
-        detail: "Option",
-        documentation: "",
-        snippet: "thing: \"$0\""
-      } in  Enum.take(suggestions(buffer, cursor), 1)
+    assert [
+             %{
+               label: "ExampleContacter",
+               type: :generic,
+               kind: :class,
+               insert_text: "ExampleContacter",
+               detail: "Spark.Test.Contact.Contacter",
+               documentation: ""
+             },
+             %{
+               args: "",
+               arity: 0,
+               name: "example",
+               type: :function,
+               origin: "Spark.Test.ContacterBuiltins",
+               spec: "",
+               metadata: %{app: :spark},
+               args_list: [],
+               summary: "",
+               snippet: nil,
+               def_arity: 0,
+               visibility: :public,
+               needed_import: nil,
+               needed_require: nil
+             }
+           ] = Enum.sort(suggestions(buffer, cursor))
   end
 
   describe "using opts" do

diff --git a/test/support/contact/contact.ex b/test/support/contact/contact.ex
@@ -18,7 +18,7 @@ defmodule Spark.Test.Contact do
           doc: "A function that wil contact this person with a message",
           type:
             {:spark_function_behaviour, Spark.Test.Contact.Contacter,
-             {Spark.Test.Contact.Contacter.Function, 1}}
+             Spark.Test.ContacterBuiltins, {Spark.Test.Contact.Contacter.Function, 1}}
         ]
       ]
     }
@@ -95,7 +95,7 @@ defmodule Spark.Test.Contact do
         contacter: [
           type:
             {:spark_function_behaviour, Spark.Test.Contact.Contacter,
-             {Spark.Test.Contact.Contacter.Function, 1}}
+             Spark.Test.ContacterBuiltins, {Spark.Test.Contact.Contacter.Function, 1}}
         ]
       ]
     }
@@ -119,7 +119,7 @@ defmodule Spark.Test.Contact do
         contacter: [
           type:
             {:spark_function_behaviour, Spark.Test.Contact.Contacter,
-             {Spark.Test.Contact.Contacter.Function, 1}}
+             Spark.Test.ContacterBuiltins, {Spark.Test.Contact.Contacter.Function, 1}}
         ]
       ]
     }
@@ -153,7 +153,7 @@ defmodule Spark.Test.Contact do
         contacter: [
           type:
             {:spark_function_behaviour, Spark.Test.Contact.Contacter,
-             {Spark.Test.Contact.Contacter.Function, 1}}
+             Spark.Test.ContacterBuiltins, {Spark.Test.Contact.Contacter.Function, 1}}
         ]
       ]
     }

diff --git a/test/support/example_contacter.ex b/test/support/example_contacter.ex
@@ -0,0 +1,10 @@
+defmodule ExampleContacter do
+  @moduledoc false
+  @behaviour Spark.Test.Contact.Contacter
+  def contact(_, _), do: {:ok, "contacted"}
+end
+
+defmodule Spark.Test.ContacterBuiltins do
+  @moduledoc false
+  def example, do: {ExampleContacter, []}
+end