fuzzy matching map fields and aliases

Author: lukaszsamson

lib/elixir_sense/providers/suggestion/complete.ex

@@ -376,7 +376,7 @@ defmodule ElixirSense.Providers.Suggestion.Complete do
   defp match_aliases(hint, env) do
     for {alias, _mod} <- env.aliases,
         [name] = Module.split(alias),
-        String.starts_with?(name, hint) do
+        Matcher.match?(name, hint) do
       %{kind: :module, type: :alias, name: name, desc: {"", %{}}, subtype: nil}
     end
   end
@@ -433,12 +433,20 @@ defmodule ElixirSense.Providers.Suggestion.Complete do
   end
 
   defp match_modules(hint, root, env) do
+    hint_parts = hint |> String.split(".")
+    hint_parts_length = length(hint_parts)
+    [hint_suffix | hint_prefix] = hint_parts |> Enum.reverse()
+
     root
     |> get_modules(env)
     |> Enum.sort()
     |> Enum.dedup()
-    |> Enum.drop_while(&(not String.starts_with?(&1, hint)))
-    |> Enum.take_while(&String.starts_with?(&1, hint))
+    |> Enum.filter(fn mod ->
+      [mod_suffix | mod_prefix] =
+        mod |> String.split(".") |> Enum.take(hint_parts_length) |> Enum.reverse()
+
+      hint_prefix == mod_prefix and Matcher.match?(mod_suffix, hint_suffix)
+    end)
   end
 
   defp get_modules(true, env) do
@@ -700,7 +708,7 @@ defmodule ElixirSense.Providers.Suggestion.Complete do
   defp match_map_fields(fields, hint, type) do
     for {key, value} when is_atom(key) <- fields,
         key = Atom.to_string(key),
-        String.starts_with?(key, hint) do
+        Matcher.match?(key, hint) do
       value_is_map =
         case value do
           {:map, _, _} -> true

test/elixir_sense/providers/suggestion/complete_test.exs

@@ -176,16 +176,18 @@ defmodule ElixirSense.Providers.Suggestion.CompleteTest do
              %{name: "Stream", subtype: :struct, type: :module},
              %{name: "String", subtype: nil, type: :module},
              %{name: "StringIO", subtype: nil, type: :module}
-           ] = expand('Str')
+           ] = expand('Str') |> Enum.filter(&(&1.name |> String.starts_with?("Str")))
 
     assert [
              %{name: "Macro"},
              %{name: "Map"},
              %{name: "MapSet"},
              %{name: "MatchError"}
-           ] = expand('Ma')
+           ] = expand('Ma') |> Enum.filter(&(&1.name |> String.starts_with?("Ma")))
+
+    assert [%{name: "Dict"}] =
+             expand('Dic') |> Enum.filter(&(&1.name |> String.starts_with?("Dic")))
 
-    assert [%{name: "Dict"}] = expand('Dic')
     assert suggestions = expand('Ex')
     assert Enum.any?(suggestions, &(&1.name == "ExUnit"))
     assert Enum.any?(suggestions, &(&1.name == "Exception"))
@@ -900,7 +902,7 @@ defmodule ElixirSense.Providers.Suggestion.CompleteTest do
       }
     }
 
-    assert [%{name: "Some", type: :module}] = expand('So', env)
+    assert [%{name: "Some", type: :module}] = expand('Som', env)
     assert [%{name: "OtherModule", type: :module}] = expand('Some.', env)
     assert [%{name: "MyAlias", type: :module}] = expand('MyA', env)
   end
@@ -1419,7 +1421,7 @@ defmodule ElixirSense.Providers.Suggestion.CompleteTest do
                subtype: nil,
                summary: "This module contains functions to manipulate files."
              }
-           ] = expand('Fi')
+           ] = expand('Fi') |> Enum.filter(&(&1.name == "File"))
   end
 
   test "complete only struct modules after %" do

test/elixir_sense/providers/suggestion_test.exs

@@ -75,26 +75,6 @@ defmodule ElixirSense.Providers.SuggestionTest do
            }
   end
 
-  test "return completion candidates for 'Str'" do
-    assert Suggestion.find("ElixirSenseExample.ModuleWithDo", @env, %Metadata{}, @cursor_context) ==
-             [
-               %{
-                 name: "ModuleWithDocFalse",
-                 subtype: nil,
-                 summary: "",
-                 type: :module,
-                 metadata: %{}
-               },
-               %{
-                 name: "ModuleWithDocs",
-                 subtype: :behaviour,
-                 summary: "An example module\n",
-                 type: :module,
-                 metadata: %{since: "1.2.3"}
-               }
-             ]
-  end
-
   test "return completion candidates for 'List.del'" do
     assert [
              %{

test/elixir_sense/suggestions_test.exs

@@ -309,7 +309,8 @@ defmodule ElixirSense.SuggestionsTest do
                summary: "An example module\n",
                type: :module,
                metadata: %{since: "1.2.3"}
-             }
+             },
+             %{metadata: %{}, name: "ModuleWithNoDocs", subtype: nil, summary: "", type: :module}
            ]
   end
 
@@ -1538,7 +1539,7 @@ defmodule ElixirSense.SuggestionsTest do
     assert [
              %{label: ~s(@typedoc """""")},
              %{label: "@typedoc false"}
-           ] = list |> Enum.filter(& &1.type == :generic and &1.kind == :snippet)
+           ] = list |> Enum.filter(&(&1.type == :generic and &1.kind == :snippet))
   end
 
   test "functions defined in the module" do
@@ -1781,7 +1782,9 @@ defmodule ElixirSense.SuggestionsTest do
                name: "SmodO",
                type: :module
              }
-           ] = ElixirSense.suggestions(buffer, 9, 18)
+           ] =
+             ElixirSense.suggestions(buffer, 9, 18)
+             |> Enum.filter(&(&1.name |> String.starts_with?("Smo")))
 
     assert [
              %{
@@ -2588,7 +2591,7 @@ defmodule ElixirSense.SuggestionsTest do
              %{name: "Stream"},
              %{name: "String"},
              %{name: "StringIO"}
-           ] = list
+           ] = list |> Enum.filter(&(&1.name |> String.starts_with?("Str")))
   end
 
   test "suggest modules to alias with __MODULE__" do