From 362fce59c8ebb0371675f34a1ead27ee60de40a2 Mon Sep 17 00:00:00 2001 From: kasiaMarek Date: Fri, 23 Aug 2024 10:40:01 +0200 Subject: [PATCH] Add compat for `3.3.1` --- .../scala/meta/internal/pc/Compat.scala | 6 ++++++ .../scala/meta/internal/pc/Compat.scala | 5 +++++ .../scala/meta/internal/pc/Compat.scala | 5 +++++ .../scala/meta/internal/pc/Compat.scala | 5 +++++ .../pc/completions/CompletionProvider.scala | 3 ++- .../tests/pc/CompletionKeywordSuite.scala | 18 ++++++++++++++++-- 6 files changed, 39 insertions(+), 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 index b6a4d617c5f..6e9809b1aa3 100644 --- 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 index b6a4d617c5f..ffc14c196c5 100644 --- 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 index 1f87fbfe851..83bfc3e2809 100644 --- 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 index 1f87fbfe851..83bfc3e2809 100644 --- 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 index 7d17917b107..19a93ae188f 100644 --- 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 index ef08dc574cc..313d4e74abf 100644 --- 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(