chore: Bump scalameta to 4.9.9

scalameta · Jul 30, 2024 · fd57bf3 · fd57bf3
1 parent e81e5db
commit fd57bf3
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 227 deletions.
diff --git a/metals-bench/src/main/scala/bench/MetalsBench.scala b/metals-bench/src/main/scala/bench/MetalsBench.scala
@@ -23,6 +23,7 @@ import scala.meta.internal.parsing.Trees
 import scala.meta.internal.semanticdb.TextDocument
 import scala.meta.internal.tokenizers.LegacyScanner
 import scala.meta.internal.tokenizers.LegacyToken
+import scala.meta.internal.tokenizers.LegacyTokenData
 import scala.meta.io.AbsolutePath
 import scala.meta.io.Classpath
 
@@ -124,7 +125,17 @@ class MetalsBench {
     scalaDependencySources.foreach { input =>
       val scanner = new LegacyScanner(input, Trees.defaultTokenizerDialect)
       var i = 0
-      scanner.foreach(_ => i += 1)
+
+      def foreach(scanner: LegacyScanner)(f: LegacyTokenData => Unit): Unit = {
+        scanner.initialize()
+        var curr = scanner.nextToken()
+        while (curr.token != LegacyToken.EOF) {
+          f(curr)
+          curr = scanner.nextToken()
+        }
+      }
+
+      foreach(scanner)(_ => i += 1)
     }
   }
 

diff --git a/metals/src/main/scala/scala/meta/internal/metals/IdentifierIndex.scala b/metals/src/main/scala/scala/meta/internal/metals/IdentifierIndex.scala
@@ -10,6 +10,7 @@ import scala.meta.Dialect
 import scala.meta.inputs.Input
 import scala.meta.internal.tokenizers.LegacyScanner
 import scala.meta.internal.tokenizers.LegacyToken._
+import scala.meta.internal.tokenizers.LegacyTokenData
 import scala.meta.io.AbsolutePath
 
 import ch.epfl.scala.bsp4j.BuildTargetIdentifier
@@ -41,9 +42,19 @@ class IdentifierIndex {
   ): Iterable[String] = {
     val identifiers = Set.newBuilder[String]
 
+    def foreach(scanner: LegacyScanner)(f: LegacyTokenData => Unit): Unit = {
+      scanner.initialize()
+      var curr = scanner.nextToken()
+      while (curr.token != EOF) {
+        f(curr)
+        curr = scanner.nextToken()
+      }
+    }
+
     try {
-      new LegacyScanner(Input.String(text), dialect).foreach {
-        case ident if ident.token == IDENTIFIER => identifiers += ident.name
+      val scanner = new LegacyScanner(Input.String(text), dialect)
+      foreach(scanner) {
+        case ident if ident.token == IDENTIFIER => identifiers += ident.strVal
         case _ =>
       }
     } catch {

diff --git a/mtags/src/main/scala-2/scala/meta/internal/metals/PositionSyntax.scala b/mtags/src/main/scala-2/scala/meta/internal/metals/PositionSyntax.scala
@@ -1,7 +1,7 @@
 package scala.meta.internal.metals
 
 import scala.meta.Position
-import scala.meta.internal.inputs.XtensionInputSyntaxStructure
+import scala.meta.internal.inputs.XtensionInput
 
 object PositionSyntax {
 

diff --git a/mtags/src/main/scala-2/scala/meta/internal/mtags/MtagsEnrichments.scala b/mtags/src/main/scala-2/scala/meta/internal/mtags/MtagsEnrichments.scala
@@ -227,7 +227,7 @@ trait MtagsEnrichments extends ScalametaCommonEnrichments {
     }
   }
 
-  implicit class XtensionPosition(pos: Position) {
+  implicit class XtensionPositionMtags(pos: Position) {
     def encloses(other: Position): Boolean =
       pos.start <= other.start && pos.end >= other.end
 

diff --git a/mtags/src/main/scala/scala/meta/internal/metals/OffsetParamsUtils.scala b/mtags/src/main/scala/scala/meta/internal/metals/OffsetParamsUtils.scala
@@ -6,7 +6,7 @@ import java.nio.file.Paths
 import java.util.Optional
 
 import scala.meta.inputs.Position
-import scala.meta.internal.inputs.XtensionInputSyntaxStructure
+import scala.meta.internal.inputs.XtensionInput
 import scala.meta.pc.CancelToken
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.OutlineFiles

diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/CharArrayReader.scala b/mtags/src/main/scala/scala/meta/internal/mtags/CharArrayReader.scala
diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/InverseLegacyToken.scala b/mtags/src/main/scala/scala/meta/internal/mtags/InverseLegacyToken.scala
@@ -8,8 +8,6 @@ import scala.meta.internal.tokenizers.LegacyToken._
 object InverseLegacyToken {
   val category: Map[Int, String] = Map[Int, String](
     EMPTY -> "EMPTY",
-    UNDEF -> "UNDEF",
-    ERROR -> "ERROR",
     EOF -> "EOF",
     /**
      * literals

diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/JavaToplevelMtags.scala b/mtags/src/main/scala/scala/meta/internal/mtags/JavaToplevelMtags.scala
@@ -10,7 +10,7 @@ import scala.meta.internal.metals.Report
 import scala.meta.internal.metals.ReportContext
 import scala.meta.internal.semanticdb.Language
 import scala.meta.internal.semanticdb.SymbolInformation
-import scala.meta.internal.tokenizers.Reporter
+import scala.meta.internal.tokenizers.CharArrayReader
 
 class JavaToplevelMtags(
     val input: Input.VirtualFile,
@@ -20,9 +20,7 @@ class JavaToplevelMtags(
 
   import JavaToplevelMtags._
 
-  val reporter: Reporter = Reporter(input)
-  val reader: CharArrayReader =
-    new CharArrayReader(input, dialects.Scala213, reporter)
+  val reader: CharArrayReader = new CharArrayReader(input, dialects.Scala213)
 
   override def overrides(): List[(String, List[OverriddenSymbol])] =
     overridden.result