chore: Add compat for scalameta 4.9.1

scalameta · Mar 7, 2024 · 55077c0 · 55077c0
1 parent 161d5dc
commit 55077c0
Show file tree

Hide file tree

Showing 20 changed files with 193 additions and 10 deletions.
diff --git a/mtags/src/main/scala-2.11/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.11/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.12/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.12/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.13/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.13/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.14/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.14/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.15/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.15/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.16/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.16/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.17/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.17/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.18/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.18/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.12.19/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.12.19/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.13.5/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.13.5/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.13.6/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.13.6/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.13.7/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.13.7/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.13.8/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.13.8/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,13 @@
+package scala.meta.internal.metals
+
+import scala.meta.internal.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case parsed: Origin.Parsed =>
+        Some((parsed.pos.start, parsed.pos.end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-2.13/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-2.13/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,12 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat {
+  object ParsedOrigin {
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match {
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
+    }
+  }
+}
diff --git a/mtags/src/main/scala-3/scala/meta/internal/metals/ScalametaCompat.scala b/mtags/src/main/scala-3/scala/meta/internal/metals/ScalametaCompat.scala
@@ -0,0 +1,9 @@
+package scala.meta.internal.metals
+
+import scala.meta.trees.Origin
+
+object ScalametaCompat:
+  object ParsedOrigin:
+    def unapply(origin: Origin): Option[(Int, Int)] = origin match
+      case Origin.Parsed(_, start, end) => Some((start, end))
+      case _ => None
diff --git a/mtags/src/main/scala/scala/meta/internal/metals/ScaladocIndexer.scala b/mtags/src/main/scala/scala/meta/internal/metals/ScaladocIndexer.scala
@@ -12,7 +12,6 @@ import scala.meta.internal.semanticdb.Scala.Symbols
 import scala.meta.internal.semanticdb.SymbolInformation
 import scala.meta.internal.semanticdb.SymbolOccurrence
 import scala.meta.pc.SymbolDocumentation
-import scala.meta.trees.Origin
 
 /**
  * Extracts Scaladoc from Scala source code.
@@ -29,7 +28,7 @@ class ScaladocIndexer(
       owner: String
   ): Unit = {
     val docstring = currentTree.origin match {
-      case Origin.Parsed(_, start, _) =>
+      case ScalametaCompat.ParsedOrigin(start, _) =>
         val leadingDocstring =
           ScaladocIndexer.findLeadingDocstring(
             source.tokens,

diff --git a/tests/unit/src/test/resources/expect/toplevels-scala3.expect b/tests/unit/src/test/resources/expect/toplevels-scala3.expect
@@ -57,4 +57,4 @@ example/nested/LocalClass.scala -> example/nested/LocalClass#
 example/nested/package.scala -> example/PackageObjectSibling#
 example/nested/package.scala -> example/nested/package.
 example/package.scala -> example/package.
-example/type/Backtick.scala -> example/type/Backtick#
+example/type/Backtick.scala -> example/type/Backtick#
diff --git a/tests/unit/src/test/resources/inlayHints/example/MacroAnnotation.scala b/tests/unit/src/test/resources/inlayHints/example/MacroAnnotation.scala
@@ -16,10 +16,10 @@ object MacroAnnotations {
   // due to the macro annotations.
   val x: Defn.Class = Defn.Class(
     Nil,
-    Type.Name("test"),
+    Type.Name("test")/*(current<<scala/meta/internal/dialects/InternalDialect#current().>>)*/,
     Nil,
-    Ctor.Primary(Nil, Term.Name("this"), Nil),
-    Template(Nil, Nil, Self(Name.Anonymous(), None), Nil),
-  )
-  val y: Mod.Final = Mod.Final()
+    Ctor.Primary(Nil, Term.Name("this")/*(current<<scala/meta/internal/dialects/InternalDialect#current().>>)*/, Nil)/*(current<<scala/meta/internal/dialects/InternalDialect#current().>>)*/,
+    Template(Nil, Nil, Self(Name.Anonymous()/*(current<<scala/meta/internal/dialects/InternalDialect#current().>>)*/, None), Nil),
+  )/*(current<<scala/meta/internal/dialects/InternalDialect#current().>>)*/
+  val y: Mod.Final = Mod.Final()/*(current<<scala/meta/internal/dialects/InternalDialect#current().>>)*/
 }
diff --git a/tests/unit/src/test/resources/inlayHints3/example/dotted.filename.scala b/tests/unit/src/test/resources/inlayHints3/example/dotted.filename.scala
@@ -1,3 +1,3 @@
 package example
 
-type Toplevel = Int
+type Toplevel = Int
diff --git a/tests/unit/src/test/resources/semanticTokens3/example/dotted.filename.scala b/tests/unit/src/test/resources/semanticTokens3/example/dotted.filename.scala
@@ -1,3 +1,3 @@
 <<package>>/*keyword*/ <<example>>/*namespace*/
 
-<<type>>/*keyword*/ <<Toplevel>>/*type,definition*/ = <<Int>>/*class,abstract*/
+<<type>>/*keyword*/ <<Toplevel>>/*type,definition*/ = <<Int>>/*class,abstract*/