Merge pull request #6356 from dotty-staging/fix-find-all-refs

nicolasstucki · web-flow · commit 94813ac39560 · 2019-04-23T09:58:52.000+02:00
Fix "find all references" when using the IDE in the Dotty build
diff --git a/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala b/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala
@@ -156,7 +156,7 @@ class DottyLanguageServer extends LanguageServer
       val allProjects = drivers.keySet
 
       def transitiveDependencies(config: ProjectConfig): Set[ProjectConfig] = {
-        val dependencies = config.projectDependencies.map(idToConfig).toSet
+        val dependencies = config.projectDependencies.flatMap(idToConfig.get).toSet
         dependencies ++ dependencies.flatMap(transitiveDependencies)
       }
 

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ class DottyLanguageServer extends LanguageServer`
`156`	`156`	`val allProjects = drivers.keySet`
`157`	`157`
`158`	`158`	`def transitiveDependencies(config: ProjectConfig): Set[ProjectConfig] = {`
`159`		`- val dependencies = config.projectDependencies.map(idToConfig).toSet`
	`159`	`+ val dependencies = config.projectDependencies.flatMap(idToConfig.get).toSet`
`160`	`160`	`dependencies ++ dependencies.flatMap(transitiveDependencies)`
`161`	`161`	`}`
`162`	`162`