remove metals wrappers around compiler implementation created to workaround bugs

Author: rochala

compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

@@ -145,7 +145,7 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
     (fromSource ++ fromClassPath).distinct
   }
 
-  def run(uri: URI, sourceCode: String): List[Diagnostic] = run(uri, toSource(uri, sourceCode))
+  def run(uri: URI, sourceCode: String): List[Diagnostic] = run(uri, SourceFile.virtual(uri, sourceCode))
 
   def run(uri: URI, source: SourceFile): List[Diagnostic] = {
     import typer.ImportInfo._
@@ -297,9 +297,6 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
     cleanupTree(tree)
   }
 
-  private def toSource(uri: URI, sourceCode: String): SourceFile =
-    SourceFile.virtual(Paths.get(uri).toString, sourceCode)
-
   /**
    * Initialize this driver and compiler.
    *
@@ -323,7 +320,7 @@ object InteractiveDriver {
     else
       try
         // We don't use file.file here since it'll be null
-        // for the VirtualFiles created by InteractiveDriver#toSource
+        // for the VirtualFiles created by SourceFile#virtual
         // TODO: To avoid these round trip conversions, we could add an
         // AbstractFile#toUri method and implement it by returning a constant
         // passed as a parameter to a constructor of VirtualFile

compiler/src/dotty/tools/dotc/util/SourceFile.scala

@@ -16,8 +16,9 @@ import scala.collection.mutable.ArrayBuffer
 import scala.util.chaining.given
 
 import java.io.File.separator
+import java.net.URI
 import java.nio.charset.StandardCharsets
-import java.nio.file.{FileSystemException, NoSuchFileException}
+import java.nio.file.{FileSystemException, NoSuchFileException, Paths}
 import java.util.Optional
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.regex.Pattern
@@ -222,6 +223,13 @@ object SourceFile {
     SourceFile(new VirtualFile(name.replace(separator, "/"), content.getBytes(StandardCharsets.UTF_8)), content.toCharArray)
       .tap(_._maybeInComplete = maybeIncomplete)
 
+  /** A helper method to create a virtual source file for given URI.
+   *  It relies on SourceFile#virtual implementation to create the virtual file.
+   */
+  def virtual(uri: URI, content: String): SourceFile =
+    val path = Paths.get(uri).toString
+    SourceFile.virtual(path, content)
+
   /** Returns the relative path of `source` within the `reference` path
    *
    *  It returns the absolute path of `source` if it is not contained in `reference`.

presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala

@@ -45,7 +45,7 @@ final class AutoImportsProvider(
       Interactive.pathTo(newctx.compilationUnit.tpdTree, pos.span)(using newctx)
 
     val indexedContext = IndexedContext(
-      MetalsInteractive.contextOfPath(path)(using newctx)
+      Interactive.contextOfPath(path)(using newctx)
     )
     import indexedContext.ctx
 

presentation-compiler/src/main/dotty/tools/pc/CompilerInterfaces.scala

@@ -20,7 +20,6 @@ import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
-import dotty.tools.pc.MetalsInteractive.*
 import dotty.tools.pc.printer.MetalsPrinter
 import dotty.tools.pc.printer.MetalsPrinter.IncludeDefaultParam
 import dotty.tools.pc.utils.MtagsEnrichments.*
@@ -48,7 +47,7 @@ final class ExtractMethodProvider(
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)
     given locatedCtx: Context =
       val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)
-      MetalsInteractive.contextOfPath(path)(using newctx)
+      Interactive.contextOfPath(path)(using newctx)
     val indexedCtx = IndexedContext(locatedCtx)
     val printer =
       MetalsPrinter.standard(indexedCtx, search, IncludeDefaultParam.Never)

presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala

@@ -19,6 +19,7 @@ import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
+import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.printer.MetalsPrinter
 import dotty.tools.pc.utils.MtagsEnrichments.*
@@ -31,7 +32,7 @@ object HoverProvider:
       search: SymbolSearch
   )(implicit reportContext: ReportContext): ju.Optional[HoverSignature] =
     val uri = params.uri
-    val sourceFile = CompilerInterfaces.toSource(params.uri, params.text)
+    val sourceFile = SourceFile.virtual(params.uri, params.text)
     driver.run(uri, sourceFile)
 
     given ctx: Context = driver.currentCtx
@@ -85,7 +86,7 @@ object HoverProvider:
           case Some(unit) =>
             val newctx =
               ctx.fresh.setCompilationUnit(unit)
-            MetalsInteractive.contextOfPath(enclosing)(using newctx)
+            Interactive.contextOfPath(enclosing)(using newctx)
           case None => ctx
       val printer = MetalsPrinter.standard(
         IndexedContext(printerContext),

presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala

@@ -19,66 +19,6 @@ import dotty.tools.dotc.util.SourcePosition
 
 object MetalsInteractive:
 
-  // This is a copy of dotty.tools.dotc.Interactive.contextOfPath
-  // with a minor fix in how it processes `Template`
-  //
-  // Might be removed after merging https://github.com/lampepfl/dotty/pull/12783
-  def contextOfPath(path: List[Tree])(using Context): Context = path match
-    case Nil | _ :: Nil =>
-      ctx.fresh
-    case nested :: encl :: rest =>
-      val outer = contextOfPath(encl :: rest)
-      try
-        encl match
-          case tree @ PackageDef(pkg, stats) =>
-            assert(tree.symbol.exists)
-            if nested `eq` pkg then outer
-            else
-              contextOfStat(
-                stats,
-                nested,
-                pkg.symbol.moduleClass,
-                outer.packageContext(tree, tree.symbol)
-              )
-          case tree: DefDef =>
-            assert(tree.symbol.exists)
-            val localCtx = outer.localContext(tree, tree.symbol).setNewScope
-            for params <- tree.paramss; param <- params do
-              localCtx.enter(param.symbol)
-            // Note: this overapproximates visibility a bit, since value parameters are only visible
-            // in subsequent parameter sections
-            localCtx
-          case tree: MemberDef =>
-            assert(tree.symbol.exists)
-            outer.localContext(tree, tree.symbol)
-          case tree @ Block(stats, expr) =>
-            val localCtx = outer.fresh.setNewScope
-            stats.foreach {
-              case stat: MemberDef => localCtx.enter(stat.symbol)
-              case _ =>
-            }
-            contextOfStat(stats, nested, ctx.owner, localCtx)
-          case tree @ CaseDef(pat, guard, rhs) if nested `eq` rhs =>
-            val localCtx = outer.fresh.setNewScope
-            pat.foreachSubTree {
-              case bind: Bind => localCtx.enter(bind.symbol)
-              case _ =>
-            }
-            localCtx
-          case tree @ Template(constr, _, self, _) =>
-            if (constr :: self :: tree.parents).contains(nested) then outer
-            else
-              contextOfStat(
-                tree.body,
-                nested,
-                tree.symbol,
-                outer.inClassContext(self.symbol)
-              )
-          case _ =>
-            outer
-      catch case ex: CyclicReference => outer
-      end try
-
   def contextOfStat(
       stats: List[Tree],
       stat: Tree,

presentation-compiler/src/main/dotty/tools/pc/MetalsInteractive.scala

@@ -162,7 +162,7 @@ final class PcInlineValueProviderImpl(
       val path =
         Interactive.pathTo(unit.tpdTree, occurence.pos.span)(using newctx)
       val indexedContext = IndexedContext(
-        MetalsInteractive.contextOfPath(path)(using newctx)
+        Interactive.contextOfPath(path)(using newctx)
       )
       import indexedContext.ctx
       val conflictingSymbols = symbols

presentation-compiler/src/main/dotty/tools/pc/PcInlineValueProviderImpl.scala

@@ -54,17 +54,26 @@ class SelectionRangeProvider(
           selectionRange
         }
 
-      val comments = driver.compilationUnits.get(uri).map(_.comments).toList.flatten
+      val comments =
+        driver.compilationUnits.get(uri).map(_.comments).toList.flatten
 
-      val commentRanges = comments.find(_.span.contains(pos.span)).map { comment =>
-        val startLine = source.offsetToLine(comment.span.start)
-        val endLine = source.offsetToLine(comment.span.end)
-        val startChar = source.column(comment.span.start)
-        val endChar = source.column(comment.span.end)
+      val commentRanges = comments
+        .find(_.span.contains(pos.span))
+        .map { comment =>
+          val startLine = source.offsetToLine(comment.span.start)
+          val endLine = source.offsetToLine(comment.span.end)
+          val startChar = source.column(comment.span.start)
+          val endChar = source.column(comment.span.end)
 
-        new SelectionRange():
-          setRange(new lsp4j.Range(lsp4j.Position(startLine, startChar), lsp4j.Position(endLine, endChar)))
-      }.toList
+          new SelectionRange():
+            setRange(
+              new lsp4j.Range(
+                lsp4j.Position(startLine, startChar),
+                lsp4j.Position(endLine, endChar)
+              )
+            )
+        }
+        .toList
 
       (commentRanges ++ bareRanges)
         .reduceRightOption(setParent)

presentation-compiler/src/main/dotty/tools/pc/SelectionRangeProvider.scala

@@ -16,6 +16,7 @@ import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.Signatures
 import dotty.tools.dotc.util.Signatures.Signature
+import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.pc.utils.MtagsEnrichments.*
 
@@ -29,7 +30,7 @@ object SignatureHelpProvider:
       search: SymbolSearch
   ) =
     val uri = params.uri
-    val sourceFile = CompilerInterfaces.toSource(params.uri, params.text)
+    val sourceFile = SourceFile.virtual(params.uri, params.text)
     driver.run(uri, sourceFile)
 
     given ctx: Context = driver.currentCtx

presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala

@@ -16,6 +16,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.StdNames
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
+import dotty.tools.dotc.util.SourceFile
 import dotty.tools.pc.AutoImports.AutoImportEdits
 import dotty.tools.pc.AutoImports.AutoImportsGenerator
 import dotty.tools.pc.printer.MetalsPrinter
@@ -42,7 +43,7 @@ class CompletionProvider(
     val uri = params.uri
 
     val code = applyCompletionCursor(params)
-    val sourceFile = CompilerInterfaces.toSource(params.uri, code)
+    val sourceFile = SourceFile.virtual(params.uri, code)
     driver.run(uri, sourceFile)
 
     val ctx = driver.currentCtx
@@ -58,7 +59,7 @@ class CompletionProvider(
             newctx
           )
         val locatedCtx =
-          MetalsInteractive.contextOfPath(tpdPath)(using newctx)
+          Interactive.contextOfPath(tpdPath)(using newctx)
         val indexedCtx = IndexedContext(locatedCtx)
         val completionPos =
           CompletionPos.infer(pos, params, path)(using newctx)

presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala

@@ -188,7 +188,7 @@ object OverrideCompletions:
         case path => path
 
     val indexedContext = IndexedContext(
-      MetalsInteractive.contextOfPath(path)(using newctx)
+      Interactive.contextOfPath(path)(using newctx)
     )
     import indexedContext.ctx
 

presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala

@@ -29,7 +29,6 @@ import dotty.tools.dotc.semanticdb.SymbolInformation.Kind
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans
 import dotty.tools.dotc.util.Spans.Span
-import dotty.tools.pc.MetalsInteractive
 import dotty.tools.pc.SemanticdbSymbols
 
 import org.eclipse.lsp4j as l
@@ -70,7 +69,7 @@ object MtagsEnrichments extends CommonMtagsEnrichments:
         Interactive.pathTo(newctx.compilationUnit.tpdTree, pos.span)(using
           newctx
         )
-      MetalsInteractive.contextOfPath(tpdPath)(using newctx)
+      Interactive.contextOfPath(tpdPath)(using newctx)
     end localContext
 
   end extension