show only syms from defs

scalameta · Apr 30, 2024 · 0656479 · 0656479
1 parent b53fa91
commit 0656479
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/AutoImportsProvider.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/AutoImportsProvider.scala
@@ -30,7 +30,7 @@ final class AutoImportsProvider(
     val isSeen = mutable.Set.empty[String]
     val symbols = List.newBuilder[Symbol]
 
-    def visit(fromWorkspace: Boolean)(sym: Symbol): Boolean = {
+    def visit(sym: Symbol): Boolean = {
       val id = sym.fullName
       if (!isSeen(id)) {
         isSeen += id
@@ -40,10 +40,10 @@ final class AutoImportsProvider(
       false
     }
 
-    compiler.searchOutline(visit(fromWorkspace = false), name)
+    compiler.searchOutline(visit, name)
 
     val visitor =
-      new CompilerSearchVisitor(context, visit(fromWorkspace = true))
+      new CompilerSearchVisitor(context, visit)
     search.search(name, buildTargetIdentifier, visitor)
 
     def isInImportTree: Boolean = lastVisitedParentTrees match {

diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/WorkspaceSymbolSearch.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/WorkspaceSymbolSearch.scala
@@ -23,7 +23,7 @@ trait WorkspaceSymbolSearch { compiler: MetalsGlobal =>
       def loop(trees: List[Tree]): Unit = {
         trees match {
           case Nil =>
-          case tree :: tail =>
+          case (tree: MemberDef) :: tail =>
             val sym = tree.symbol
             def matches = if (sym.isType)
               CompletionFuzzy.matchesSubCharacters(query, sym.name.toString())
@@ -37,6 +37,8 @@ trait WorkspaceSymbolSearch { compiler: MetalsGlobal =>
               }
             }
             loop(tree.children ++ tail)
+          case tree :: tail =>
+            loop(tree.children ++ tail)
         }
       }
       loop(List(unit.body))