language-server: Simplify position mapping for worksheets

Instead of having a positionMapper argument for `range`, `location`, etc,
choose the right `positionMapper` in range directly

Author: smarter

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

@@ -240,17 +240,20 @@ class DottyLanguageServer extends LanguageServer
     val document = params.getTextDocument
     val uri = new URI(document.getUri)
     val driver = driverFor(uri)
+    implicit val ctx = driver.currentCtx
     val worksheetMode = isWorksheet(uri)
 
-    val (text, positionMapper) =
-      if (worksheetMode) (wrapWorksheet(document.getText), Some(toUnwrappedPosition _))
-      else (document.getText, None)
+    val text =
+      if (worksheetMode)
+        wrapWorksheet(document.getText)
+      else
+        document.getText
 
     val diags = driver.run(uri, text)
 
     client.publishDiagnostics(new PublishDiagnosticsParams(
       document.getUri,
-      diags.flatMap(diagnostic(_, positionMapper)(driver.currentCtx)).asJava))
+      diags.flatMap(diagnostic).asJava))
   }
 
   override def didChange(params: DidChangeTextDocumentParams): Unit = {
@@ -262,19 +265,22 @@ class DottyLanguageServer extends LanguageServer
       checkMemory()
 
       val driver = driverFor(uri)
+      implicit val ctx = driver.currentCtx
 
       val change = params.getContentChanges.get(0)
       assert(change.getRange == null, "TextDocumentSyncKind.Incremental support is not implemented")
 
-      val (text, positionMapper) =
-        if (worksheetMode) (wrapWorksheet(change.getText), Some(toUnwrappedPosition _))
-        else (change.getText, None)
+      val text =
+        if (worksheetMode)
+          wrapWorksheet(change.getText)
+        else
+          change.getText
 
       val diags = driver.run(uri, text)
 
       client.publishDiagnostics(new PublishDiagnosticsParams(
         document.getUri,
-        diags.flatMap(diagnostic(_, positionMapper)(driver.currentCtx)).asJava))
+        diags.flatMap(diagnostic).asJava))
     }
   }
 
@@ -324,7 +330,7 @@ class DottyLanguageServer extends LanguageServer
     val path = Interactive.pathTo(driver.openedTrees(uri), pos)
 
     val definitions = Interactive.findDefinitions(path, pos, driver).toList
-    definitions.flatMap(d => location(d.namePos, positionMapperFor(d.source))).asJava
+    definitions.flatMap(d => location(d.namePos)).asJava
   }
 
   override def references(params: ReferenceParams) = computeAsync { cancelToken =>
@@ -359,7 +365,7 @@ class DottyLanguageServer extends LanguageServer
           val name = definition.name(ctx).sourceModuleName.toString
           val trees = remoteDriver.sourceTreesContaining(name)(ctx)
           val matches = Interactive.findTreesMatching(trees, includes, definition)(ctx)
-          matches.map(tree => location(tree.namePos(ctx), positionMapperFor(tree.source)))
+          matches.map(tree => location(tree.namePos(ctx)))
         }
       }
     }.toList
@@ -429,7 +435,7 @@ class DottyLanguageServer extends LanguageServer
         .flatMap((uriOpt, ref) => uriOpt.map(uri => (uri.toString, ref)))
         .mapValues(refs =>
           refs.flatMap(ref =>
-            range(ref.namePos, positionMapperFor(ref.source)).map(nameRange => new TextEdit(nameRange, newName))).distinct.asJava)
+            range(ref.namePos).map(nameRange => new TextEdit(nameRange, newName))).distinct.asJava)
 
     new WorkspaceEdit(changes.asJava)
   }
@@ -449,7 +455,7 @@ class DottyLanguageServer extends LanguageServer
       val refs = Interactive.findTreesMatching(uriTrees, includes, sym)
       (for {
         ref <- refs
-        nameRange <- range(ref.namePos, positionMapperFor(ref.source))
+        nameRange <- range(ref.namePos)
       } yield new DocumentHighlight(nameRange, DocumentHighlightKind.Read))
     }.distinct.asJava
   }
@@ -488,7 +494,7 @@ class DottyLanguageServer extends LanguageServer
     val defs = Interactive.namedTrees(uriTrees, Include.empty)
     (for {
       d <- defs if !isWorksheetWrapper(d)
-      info <- symbolInfo(d.tree.symbol, d.namePos, positionMapperFor(d.source))
+      info <- symbolInfo(d.tree.symbol, d.namePos)
     } yield JEither.forLeft(info)).asJava
   }
 
@@ -500,7 +506,7 @@ class DottyLanguageServer extends LanguageServer
 
       val trees = driver.sourceTreesContaining(query)
       val defs = Interactive.namedTrees(trees, Include.empty, _.name.toString.contains(query))
-      defs.flatMap(d => symbolInfo(d.tree.symbol, d.namePos, positionMapperFor(d.source)))
+      defs.flatMap(d => symbolInfo(d.tree.symbol, d.namePos))
     }.asJava
   }
 
@@ -528,7 +534,7 @@ class DottyLanguageServer extends LanguageServer
           tree => predicates.exists(_(tree))
         }
         val matches = Interactive.namedTrees(trees, Include.local, predicate)(ctx)
-        matches.map(tree => location(tree.namePos(ctx), positionMapperFor(tree.source)))
+        matches.map(tree => location(tree.namePos(ctx)))
       }
     }.toList
 
@@ -653,9 +659,9 @@ object DottyLanguageServer {
   }
 
   /** Convert a SourcePosition to an lsp4j.Range */
-  def range(p: SourcePosition, positionMapper: Option[SourcePosition => SourcePosition] = None): Option[lsp4j.Range] =
+  def range(p: SourcePosition): Option[lsp4j.Range] =
     if (p.exists) {
-      val mappedPosition = positionMapper.map(_(p)).getOrElse(p)
+      val mappedPosition = positionMapperFor(p.source).map(_(p)).getOrElse(p)
       Some(new lsp4j.Range(
         new lsp4j.Position(mappedPosition.startLine, mappedPosition.startColumn),
         new lsp4j.Position(mappedPosition.endLine, mappedPosition.endColumn)
@@ -664,19 +670,16 @@ object DottyLanguageServer {
       None
 
   /** Convert a SourcePosition to an lsp4.Location */
-  def location(p: SourcePosition, positionMapper: Option[SourcePosition => SourcePosition] = None): Option[lsp4j.Location] =
+  def location(p: SourcePosition): Option[lsp4j.Location] =
     for {
       uri <- toUriOption(p.source)
-      r <- range(p, positionMapper)
+      r <- range(p)
     } yield new lsp4j.Location(uri.toString, r)
 
   /**
-   * Convert a MessageContainer to an lsp4j.Diagnostic. The positions are transformed vy
-   * `positionMapper`.
+   * Convert a MessageContainer to an lsp4j.Diagnostic.
    */
-  def diagnostic(mc: MessageContainer,
-                 positionMapper: Option[SourcePosition => SourcePosition] = None
-                )(implicit ctx: Context): Option[lsp4j.Diagnostic] =
+  def diagnostic(mc: MessageContainer)(implicit ctx: Context): Option[lsp4j.Diagnostic] =
     if (!mc.pos.exists)
       None // diagnostics without positions are not supported: https://github.com/Microsoft/language-server-protocol/issues/249
     else {
@@ -697,7 +700,7 @@ object DottyLanguageServer {
       val message = mc.contained()
       if (displayMessage(message, mc.pos.source)) {
         val code = message.errorId.errorNumber.toString
-        range(mc.pos, positionMapper).map(r =>
+        range(mc.pos).map(r =>
             new lsp4j.Diagnostic(
               r, mc.message, severity(mc.level), /*source =*/ "", code))
       } else {
@@ -866,7 +869,7 @@ object DottyLanguageServer {
   }
 
   /** Create an lsp4j.SymbolInfo from a Symbol and a SourcePosition */
-  def symbolInfo(sym: Symbol, pos: SourcePosition, positionMapper: Option[SourcePosition => SourcePosition])(implicit ctx: Context): Option[lsp4j.SymbolInformation] = {
+  def symbolInfo(sym: Symbol, pos: SourcePosition)(implicit ctx: Context): Option[lsp4j.SymbolInformation] = {
     def symbolKind(sym: Symbol)(implicit ctx: Context): lsp4j.SymbolKind = {
       import lsp4j.{SymbolKind => SK}
 
@@ -893,7 +896,7 @@ object DottyLanguageServer {
       else
         null
 
-    location(pos, positionMapper).map(l => new lsp4j.SymbolInformation(name, symbolKind(sym), l, containerName))
+    location(pos).map(l => new lsp4j.SymbolInformation(name, symbolKind(sym), l, containerName))
   }
 
   /** Convert `signature` to a `SignatureInformation` */