improvement: Check if compiled unit is available before using

The issue showed up in scalameta/metals-vscode#1470 (reply in thread)
scalameta · Mar 10, 2024 · f53ea56 · f53ea56
1 parent f5e8afe
commit f53ea56
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala b/mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala
@@ -53,6 +53,13 @@ object MtagsEnrichments extends ScalametaCommonEnrichments:
       new SourcePosition(source, span)
     end sourcePosition
 
+    def latestRun = 
+      if driver.currentCtx.run.units.nonEmpty then
+        driver.currentCtx.run.units.head
+      else
+        throw new RuntimeException(
+          "No source files were compiled. Might be an error in the compiler itself."
+        )
     def localContext(params: OffsetParams): Context =
       if driver.currentCtx.run.units.isEmpty then
         throw new RuntimeException(

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImportsProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImportsProvider.scala
@@ -34,7 +34,7 @@ final class AutoImportsProvider(
       uri,
       SourceFile.virtual(filePath.toString, params.text),
     )
-    val unit = driver.currentCtx.run.units.head
+    val unit = driver.latestRun
     val tree = unit.tpdTree
 
     val pos = driver.sourcePosition(params)

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/ExtractMethodProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/ExtractMethodProvider.scala
@@ -42,7 +42,7 @@ final class ExtractMethodProvider(
     val filePath = Paths.get(uri)
     val source = SourceFile.virtual(filePath.toString, text)
     driver.run(uri, source)
-    val unit = driver.currentCtx.run.units.head
+    val unit = driver.latestRun
     val pos = driver.sourcePosition(range).startPos
     val path =
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/InferredTypeProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/InferredTypeProvider.scala
@@ -69,7 +69,7 @@ final class InferredTypeProvider(
     val source =
       SourceFile.virtual(filePath.toString, sourceText)
     driver.run(uri, source)
-    val unit = driver.currentCtx.run.units.head
+    val unit = driver.latestRun
     val pos = driver.sourcePosition(params)
     val path =
       Interactive.pathTo(driver.openedTrees(uri), pos)(using driver.currentCtx)

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlayHintsProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlayHintsProvider.scala
@@ -39,7 +39,7 @@ class PcInlayHintsProvider(
     SourceFile.virtual(filePath.toString, sourceText)
   driver.run(uri, source)
   given ctx: Context = driver.currentCtx
-  val unit = driver.currentCtx.run.units.head
+  val unit = driver.latestRun
   given InferredType.Text = InferredType.Text(text)
   val pos = driver.sourcePosition(params)
 

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/OverrideCompletions.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/OverrideCompletions.scala
@@ -177,7 +177,7 @@ object OverrideCompletions:
       uri,
       SourceFile.virtual(uri.toASCIIString, params.text),
     )
-    val unit = driver.currentCtx.run.units.head
+    val unit = driver.latestRun
     val pos = driver.sourcePosition(params)
 
     val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)