fix: fix autocompletion of use options

Author: zachdaniel

lib/spark/elixir_sense/plugin.ex

@@ -362,9 +362,9 @@ defmodule Spark.ElixirSense.Plugin do
     {ast, find_cursor_in_params(params, call, meta)}
   end
 
-  defp find_call_pre({atom, meta, params} = ast, _state)
-       when is_atom(atom) and is_list(params) and atom not in [:{}, :%{}] do
-    {ast, find_cursor_in_params(params, atom, meta)}
+  # Special handling for use calls
+  defp find_call_pre({:use, meta, [module_ast | params]} = ast, _state) do
+    {ast, find_cursor_in_params([module_ast | params], [module_ast, :use], meta)}
   end
 
   defp find_call_pre({atom, meta, params} = ast, _state)
@@ -587,29 +587,35 @@ defmodule Spark.ElixirSense.Plugin do
   defp cursor_at_value_type_path(_), do: nil
 
   defp autocomplete_spark_options(hint, _, {module, function_call, arg_index, info}, opts) do
-    case Code.fetch_docs(module) do
-      {:docs_v1, _a, :elixir, _b, _c, _d, functions} ->
-        schema =
-          Enum.find_value(functions, fn
-            {{_, ^function_call, _}, _, _, _, %{spark_opts: spark_opts}} ->
-              Enum.find_value(spark_opts, fn {index, schema} ->
-                if index == arg_index do
-                  schema
-                end
-              end)
+    if (function_call == :use and arg_index > 0) && Code.ensure_loaded?(module) &&
+         function_exported?(module, :opt_schema, 0) do
+      schema = module.opt_schema()
+      {:override, Enum.uniq(autocomplete_schema(schema, hint, info.value_type_path, opts))}
+    else
+      case Code.fetch_docs(module) do
+        {:docs_v1, _a, :elixir, _b, _c, _d, functions} ->
+          schema =
+            Enum.find_value(functions, fn
+              {{_, ^function_call, _}, _, _, _, %{spark_opts: spark_opts}} ->
+                Enum.find_value(spark_opts, fn {index, schema} ->
+                  if index == arg_index do
+                    schema
+                  end
+                end)
+
+              _ ->
+                nil
+            end)
 
-            _ ->
-              nil
-          end)
+          if schema do
+            {:override, Enum.uniq(autocomplete_schema(schema, hint, info.value_type_path, opts))}
+          else
+            :ignore
+          end
 
-        if schema do
-          {:override, Enum.uniq(autocomplete_schema(schema, hint, info.value_type_path, opts))}
-        else
+        _ ->
           :ignore
-        end
-
-      _ ->
-        :ignore
+      end
     end
   end
 

mix.exs

@@ -111,10 +111,7 @@ defmodule Spark.MixProject do
       {:sobelow, ">= 0.0.0", only: [:dev, :test], runtime: false},
       {:git_ops, "~> 2.5", only: [:dev, :test]},
       {:mix_test_watch, "~> 1.0", only: [:dev, :test], runtime: false},
-      {:elixir_sense,
-       github: "zachdaniel/elixir_sense",
-       only: [:dev, :test, :docs],
-       ref: "572c81c4046e12857b734abc28aa14b7d1f6f595"},
+      {:elixir_sense, github: "elixir-lsp/elixir_sense", only: [:dev, :test, :docs]},
       {:mix_audit, ">= 0.0.0", only: [:dev, :test], runtime: false}
     ]
   end

mix.lock

@@ -6,7 +6,7 @@
   "dialyxir": {:hex, :dialyxir, "1.4.6", "7cca478334bf8307e968664343cbdb432ee95b4b68a9cba95bdabb0ad5bdfd9a", [:mix], [{:erlex, ">= 0.2.7", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "8cf5615c5cd4c2da6c501faae642839c8405b49f8aa057ad4ae401cb808ef64d"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
   "eflame": {:hex, :eflame, "1.0.1", "0664d287e39eef3c413749254b3af5f4f8b00be71c1af67d325331c4890be0fc", [:mix], [], "hexpm", "e0b08854a66f9013129de0b008488f3411ae9b69b902187837f994d7a99cf04e"},
-  "elixir_sense": {:git, "https://github.com/zachdaniel/elixir_sense.git", "572c81c4046e12857b734abc28aa14b7d1f6f595", [ref: "572c81c4046e12857b734abc28aa14b7d1f6f595"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "c1548354ed7fd50a381691e76aeab04756a9d6c7", []},
   "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
   "ex_check": {:hex, :ex_check, "0.16.0", "07615bef493c5b8d12d5119de3914274277299c6483989e52b0f6b8358a26b5f", [:mix], [], "hexpm", "4d809b72a18d405514dda4809257d8e665ae7cf37a7aee3be6b74a34dec310f5"},
   "ex_doc": {:hex, :ex_doc, "0.38.3", "ddafe36b8e9fe101c093620879f6604f6254861a95133022101c08e75e6c759a", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "ecaa785456a67f63b4e7d7f200e8832fa108279e7eb73fd9928e7e66215a01f9"},