Skip to content

Commit 1c8eca5

Browse files
committed
Simplify predicates in symbol, documentSymbol
Some checks were redundant with the checks that are performed in `namedTrees`, and can be removed. Also, exclude primary constructors in `symbol`.
1 parent 7fd0c1d commit 1c8eca5

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ class DottyLanguageServer extends LanguageServer
459459
val uriTrees = driver.openedTrees(uri)
460460
val predicate = (tree: NameTree) => {
461461
val sym = tree.symbol
462-
sym.exists && !sym.isLocal && !sym.isPrimaryConstructor && !sym.is(Synthetic)
462+
!sym.isLocal && !sym.isPrimaryConstructor
463463
}
464464

465465
val defs = Interactive.namedTrees(uriTrees, Include.empty, predicate)
@@ -471,8 +471,10 @@ class DottyLanguageServer extends LanguageServer
471471

472472
override def symbol(params: WorkspaceSymbolParams) = computeAsync { cancelToken =>
473473
val query = params.getQuery
474-
def predicate(implicit ctx: Context): NameTree => Boolean =
475-
tree => tree.symbol.exists && !tree.symbol.isLocal && tree.name.toString.contains(query)
474+
def predicate(implicit ctx: Context): NameTree => Boolean = { tree =>
475+
val sym = tree.symbol
476+
!sym.isLocal && !sym.isPrimaryConstructor && tree.name.toString.contains(query)
477+
}
476478

477479
drivers.values.toList.flatMap { driver =>
478480
implicit val ctx = driver.currentCtx

0 commit comments

Comments
 (0)