Static parameter in search/completion request affects only methods (#…

…7831) close #7805 Changelog: update: `isStatic` parameter in the `search/completion` request only affects method suggestions
enso-org · Sep 19, 2023 · 5c19814 · 5c19814
1 parent e3de688
commit 5c19814
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 14 deletions.
diff --git a/docs/language-server/protocol-language-server.md b/docs/language-server/protocol-language-server.md
@@ -4636,7 +4636,7 @@ Sent from client to the server to receive the autocomplete suggestion.
   returnType?: string;
   // Filter by the suggestion types
   tags?: [SuggestionEntryType];
-  // Filter by `static` attribute of the suggestion
+  // Filter by `static` attribute of method suggestions
   isStatic?: Boolean;
 }
 ```

diff --git a/...anguage-server/src/test/scala/org/enso/languageserver/search/SuggestionsHandlerSpec.scala b/...anguage-server/src/test/scala/org/enso/languageserver/search/SuggestionsHandlerSpec.scala
@@ -896,7 +896,7 @@ class SuggestionsHandlerSpec
           Suggestions.methodOnInteger
         )
 
-        val (_, Seq(_, _, _, methodId, _, _, _, _, _)) =
+        val (_, Seq(moduleId, typeId, consId, methodId, _, localId, _, _, _)) =
           Await.result(repo.insertAll(all), Timeout)
         handler ! SearchProtocol.Completion(
           file       = mkModulePath(config, "Main.enso"),
@@ -910,7 +910,7 @@ class SuggestionsHandlerSpec
         expectMsg(
           SearchProtocol.CompletionResult(
             1L,
-            Seq(methodId)
+            Seq(moduleId, typeId, consId, methodId, localId)
           )
         )
     }

diff --git a/lib/scala/searcher/src/main/scala/org/enso/searcher/sql/SqlSuggestionsRepo.scala b/lib/scala/searcher/src/main/scala/org/enso/searcher/sql/SqlSuggestionsRepo.scala
@@ -765,7 +765,8 @@ final class SqlSuggestionsRepo(val db: SqlDatabase)(implicit
         )
       }
       .filterOpt(isStatic) { case (row, value) =>
-        row.isStatic === value
+        (row.kind === SuggestionKind.METHOD && row.isStatic === value) ||
+        (row.kind =!= SuggestionKind.METHOD)
       }
   }
 

diff --git a/lib/scala/searcher/src/test/scala/org/enso/searcher/sql/SuggestionsRepoTest.scala b/lib/scala/searcher/src/test/scala/org/enso/searcher/sql/SuggestionsRepoTest.scala
@@ -1160,13 +1160,14 @@ class SuggestionsRepoTest
     "search suggestion by the static attribute" taggedAs Retry in withRepo {
       repo =>
         val action = for {
-          _   <- repo.insert(suggestion.module)
-          _   <- repo.insert(suggestion.tpe)
-          _   <- repo.insert(suggestion.constructor)
+          id0 <- repo.insert(suggestion.module)
+          id1 <- repo.insert(suggestion.tpe)
+          id2 <- repo.insert(suggestion.constructor)
           id3 <- repo.insert(suggestion.method)
-          _   <- repo.insert(suggestion.conversion)
-          _   <- repo.insert(suggestion.function)
-          _   <- repo.insert(suggestion.local)
+          _   <- repo.insert(suggestion.instanceMethod)
+          id5 <- repo.insert(suggestion.conversion)
+          id6 <- repo.insert(suggestion.function)
+          id7 <- repo.insert(suggestion.local)
           res <-
             repo.search(
               None,
@@ -1176,11 +1177,10 @@ class SuggestionsRepoTest
               None,
               Some(true)
             )
-        } yield (id3, res._2)
+        } yield (Seq(id0, id1, id2, id3, id5, id6, id7), res._2)
 
-        val (id3, res) =
-          Await.result(action, Timeout)
-        res should contain theSameElementsAs Seq(id3).flatten
+        val (ids, res) = Await.result(action, Timeout)
+        res should contain theSameElementsAs ids.flatten
     }
 
     "search suggestion by module and self type" taggedAs Retry in withRepo {
@@ -1233,6 +1233,32 @@ class SuggestionsRepoTest
         res should contain theSameElementsAs Seq(id3).flatten
     }
 
+    "search suggestion by self-type and non-static attribute" taggedAs Retry in withRepo {
+      repo =>
+        val action = for {
+          _   <- repo.insert(suggestion.module)
+          _   <- repo.insert(suggestion.tpe)
+          _   <- repo.insert(suggestion.constructor)
+          _   <- repo.insert(suggestion.method)
+          id4 <- repo.insert(suggestion.instanceMethod)
+          _   <- repo.insert(suggestion.conversion)
+          _   <- repo.insert(suggestion.function)
+          _   <- repo.insert(suggestion.local)
+          res <-
+            repo.search(
+              None,
+              Seq(suggestion.instanceMethod.selfType),
+              None,
+              None,
+              None,
+              Some(false)
+            )
+        } yield (Seq(id4), res._2)
+
+        val (ids, res) = Await.result(action, Timeout)
+        res should contain theSameElementsAs ids.flatten
+    }
+
     "search suggestion by return type and kind" taggedAs Retry in withRepo {
       repo =>
         val kinds = Seq(Suggestion.Kind.Constructor, Suggestion.Kind.Local)