Add compat for 3.3.1

scalameta · Aug 23, 2024 · 969449a · 969449a
1 parent fa0a35b
commit 969449a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 3 deletions.
diff --git a/mtags/src/main/scala-3.2/scala/meta/internal/pc/Compat.scala b/mtags/src/main/scala-3.2/scala/meta/internal/pc/Compat.scala
@@ -1,4 +1,10 @@
 package scala.meta.internal.pc
 
+import dotty.tools.dotc.CompilationUnit
+import dotty.tools.dotc.core.Comments.Comment
+
 object Compat:
   val EvidenceParamName = dotty.tools.dotc.core.NameKinds.EvidenceParamName
+
+  extension (unit: CompilationUnit)
+    def getComments(): List[Comment] = Nil
diff --git a/mtags/src/main/scala-3.3.1/scala/meta/internal/pc/Compat.scala b/mtags/src/main/scala-3.3.1/scala/meta/internal/pc/Compat.scala
@@ -1,4 +1,9 @@
 package scala.meta.internal.pc
 
+import dotty.tools.dotc.CompilationUnit
+import dotty.tools.dotc.core.Comments.Comment
+
 object Compat:
   val EvidenceParamName = dotty.tools.dotc.core.NameKinds.EvidenceParamName
+  extension (unit: CompilationUnit)
+    def getComments(): List[Comment] = Nil
diff --git a/mtags/src/main/scala-3.3.2/scala/meta/internal/pc/Compat.scala b/mtags/src/main/scala-3.3.2/scala/meta/internal/pc/Compat.scala
@@ -1,4 +1,9 @@
 package scala.meta.internal.pc
 
+import dotty.tools.dotc.CompilationUnit
+import dotty.tools.dotc.core.Comments.Comment
+
 object Compat:
   val EvidenceParamName = dotty.tools.dotc.core.NameKinds.ContextBoundParamName
+  extension (unit: CompilationUnit)
+    def getComments(): List[Comment] = unit.comments
diff --git a/mtags/src/main/scala-3.3.3/scala/meta/internal/pc/Compat.scala b/mtags/src/main/scala-3.3.3/scala/meta/internal/pc/Compat.scala
@@ -1,4 +1,9 @@
 package scala.meta.internal.pc
 
+import dotty.tools.dotc.CompilationUnit
+import dotty.tools.dotc.core.Comments.Comment
+
 object Compat:
   val EvidenceParamName = dotty.tools.dotc.core.NameKinds.ContextBoundParamName
+  extension (unit: CompilationUnit)
+    def getComments(): List[Comment] = unit.comments
diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala
@@ -9,6 +9,7 @@ import scala.meta.internal.metals.ReportContext
 import scala.meta.internal.mtags.MtagsEnrichments.*
 import scala.meta.internal.pc.AutoImports.AutoImportEdits
 import scala.meta.internal.pc.AutoImports.AutoImportsGenerator
+import scala.meta.internal.pc.Compat.*
 import scala.meta.internal.pc.printer.MetalsPrinter
 import scala.meta.pc.CompletionItemPriority
 import scala.meta.pc.OffsetParams
@@ -86,7 +87,7 @@ class CompletionProvider(
             autoImportsGen,
             driver.settings,
             referenceCounter,
-            unit.comments
+            unit.getComments()
           ).completions()
 
         val items = completions.zipWithIndex.map { case (item, idx) =>

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala
@@ -36,7 +36,14 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |  // tr@@
       |}
       |""".stripMargin,
-    ""
+    "",
+    compat = Map(
+      "3" -> """|transient scala
+                |transparentTrait(): transparentTrait
+                |transparentTrait - scala.annotation
+                |""".stripMargin,
+      ">=3.3.2" -> ""
+    )
   )
 
   check(
@@ -54,7 +61,14 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |  **/
       |}
       |""".stripMargin,
-    ""
+    "",
+    compat = Map(
+      "3" -> """|transient scala
+                |transparentTrait(): transparentTrait
+                |transparentTrait - scala.annotation
+                |""".stripMargin,
+      ">=3.3.2" -> ""
+    )
   )
 
   check(