Factor out code to handle multi-project

Author: Duhemm

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

@@ -315,28 +315,14 @@ class DottyLanguageServer extends LanguageServer
 
     val pos = sourcePosition(driver, uri, params.getPosition)
     val path = Interactive.pathTo(driver.openedTrees(uri), pos)
-
-    // Find definitions of the symbol under the cursor, so that we can determine
-    // what projects are worth exploring
-    val definitions = Interactive.findDefinitions(path, driver)
-    val projectsToInspect = projectsSeeing(definitions)
-
     val originalSymbol = Interactive.enclosingSourceSymbol(path)
     val symbolName = originalSymbol.name.sourceModuleName.toString
-    val references = {
-      // Collect the information necessary to look into each project separately: representation of
-      // `originalSymbol` in this project, the context and correct Driver.
-      val perProjectInfo = projectsToInspect.toList.map { config =>
-        val remoteDriver = drivers(config)
-        val ctx = remoteDriver.currentCtx
-        val definition = Interactive.localize(originalSymbol, driver, remoteDriver)
-        (remoteDriver, ctx, definition)
-      }
+    val definitions = Interactive.findDefinitions(path, driver)
+    val projectsInfo = inProjectsSeeing(driver, definitions, originalSymbol)
 
-      perProjectInfo.par.flatMap { (remoteDriver, ctx, definition) =>
-        val trees = remoteDriver.sourceTreesContaining(symbolName)(ctx)
-        Interactive.findTreesMatching(trees, includes, definition)(ctx)
-      }
+    val references = projectsInfo.par.flatMap { (driver, ctx, symbol) =>
+      val trees = driver.sourceTreesContaining(symbolName)(ctx)
+      Interactive.findTreesMatching(trees, includes, symbol)(ctx)
     }.toList
 
     references.flatMap(ref => location(ref.namePos, positionMapperFor(ref.source))).asJava
@@ -440,23 +426,15 @@ class DottyLanguageServer extends LanguageServer
     val pos = sourcePosition(driver, uri, params.getPosition)
     val uriTrees = driver.openedTrees(uri)
     val path = Interactive.pathTo(uriTrees, pos)
-
     val definitions = Interactive.findDefinitions(path, driver)
-    val projectsToInspect = projectsSeeing(definitions)
-
     val originalSymbol = Interactive.enclosingSourceSymbol(path)
-    val implementations = {
-      val perProjectInfo = projectsToInspect.toList.map { config =>
-        val remoteDriver = drivers(config)
-        val ctx = remoteDriver.currentCtx
-        val definition = Interactive.localize(originalSymbol, driver, remoteDriver)
-        (remoteDriver, ctx, definition)
-      }
+    val projectsInfo = inProjectsSeeing(driver, definitions, originalSymbol)
 
-      perProjectInfo.par.flatMap { (remoteDriver, ctx, definition) =>
-        val trees = remoteDriver.sourceTrees(ctx)
-        Interactive.namedTrees(trees, includeReferences = false, Interactive.isImplementation(definition)(ctx))(ctx)
-      }
+    val implementations = projectsInfo.par.flatMap { (driver, ctx, symbol) =>
+      val trees = driver.sourceTrees(ctx)
+      Interactive.namedTrees(trees,
+                             includeReferences = false,
+                             Interactive.isImplementation(symbol)(ctx))(ctx)
     }.toList
 
     implementations.flatMap { impl =>
@@ -478,6 +456,12 @@ class DottyLanguageServer extends LanguageServer
   override def resolveCompletionItem(params: CompletionItem) = null
   override def signatureHelp(params: TextDocumentPositionParams) = null
 
+  /**
+   * Find the set of projects that have any of `definitions` on their classpath.
+   *
+   * @param definitions The definitions to consider when looking for projects.
+   * @return The set of projects that have any of `definitions` on their classpath.
+   */
   private def projectsSeeing(definitions: List[SourceTree])(implicit ctx: Context): Set[ProjectConfig] = {
     if (definitions.isEmpty) {
       drivers.keySet
@@ -491,6 +475,28 @@ class DottyLanguageServer extends LanguageServer
     }
   }
 
+  /**
+   * Finds projects that can see any of `definitions`, translate `symbol` in their universe.
+   *
+   * @param baseDriver  The driver responsible for the trees in `definitions` and `symbol`.
+   * @param definitions The definitions to consider when looking for projects.
+   * @param symbol      A symbol to translate in the universes of the remote projects.
+   * @return A list consisting of the remote drivers, their context, and the translation of `symbol`
+   *         into their universe.
+   */
+  private def inProjectsSeeing(baseDriver: InteractiveDriver,
+                               definitions: List[SourceTree],
+                               symbol: Symbol): List[(InteractiveDriver, Context, Symbol)] = {
+    val projects = projectsSeeing(definitions)(baseDriver.currentCtx)
+    projects.toList.map { config =>
+      val remoteDriver = drivers(config)
+      val ctx = remoteDriver.currentCtx
+      val definition = Interactive.localize(symbol, baseDriver, remoteDriver)
+      (remoteDriver, ctx, definition)
+    }
+  }
+
+
 }
 
 object DottyLanguageServer {