Skip to content

Commit 23a5740

Browse files
tgodziktgodzik
committed
chore: Bump mtags to 1.5.3
1 parent c481e91 commit 23a5740

20 files changed

+37
-34
lines changed

‎presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import java.nio.file.Paths
44

55
import scala.collection.mutable
66
import scala.jdk.CollectionConverters.*
7-
import scala.meta.internal.metals.ReportContext
7+
import scala.meta.pc.reports.ReportContext
88
import scala.meta.internal.pc.AutoImportsResultImpl
99
import scala.meta.pc.*
1010

‎presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import java.util.logging.Level
44
import java.util.logging.Logger
55

66
import scala.meta.internal.metals.Report
7-
import scala.meta.internal.metals.ReportContext
7+
import scala.meta.pc.reports.ReportContext
88
import scala.meta.pc.*
99
import scala.util.control.NonFatal
1010

@@ -35,7 +35,7 @@ class CompilerSearchVisitor(
3535
false
3636
case NonFatal(e) =>
3737
reports.incognito.create(
38-
Report(
38+
() => Report(
3939
"is_public",
4040
s"""Symbol: $sym""".stripMargin,
4141
e

‎presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.pc
22

33
import java.nio.file.Paths
44

5-
import scala.meta.internal.metals.ReportContext
5+
import scala.meta.pc.reports.ReportContext
66
import scala.meta.internal.pc.ExtractMethodUtils
77
import scala.meta.pc.OffsetParams
88
import scala.meta.pc.RangeParams

‎presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotty.tools.pc
33
import java.util as ju
44

55
import scala.meta.internal.metals.Report
6-
import scala.meta.internal.metals.ReportContext
6+
import scala.meta.pc.reports.ReportContext
77
import scala.meta.internal.pc.ScalaHover
88
import scala.meta.pc.ContentType
99
import scala.meta.pc.HoverSignature
@@ -88,7 +88,7 @@ object HoverProvider:
8888
s"$uri::$posId"
8989
)
9090
end report
91-
reportContext.unsanitized.create(report, ifVerbose = true)
91+
reportContext.unsanitized.create(() => report, /*ifVerbose =*/ true)
9292
ju.Optional.empty().nn
9393
else
9494
val skipCheckOnName =

‎presentation-compiler/src/main/dotty/tools/pc/InferExpectedType.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import dotty.tools.pc.printer.ShortenedTypePrinter
2121
import dotty.tools.pc.printer.ShortenedTypePrinter.IncludeDefaultParam
2222
import dotty.tools.pc.utils.InteractiveEnrichments.*
2323

24-
import scala.meta.internal.metals.ReportContext
24+
import scala.meta.pc.reports.ReportContext
2525
import scala.meta.pc.OffsetParams
2626
import scala.meta.pc.SymbolSearch
2727

‎presentation-compiler/src/main/dotty/tools/pc/InferredTypeProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotty.tools.pc
33
import java.nio.file.Paths
44

55
import scala.annotation.tailrec
6-
import scala.meta.internal.metals.ReportContext
6+
import scala.meta.pc.reports.ReportContext
77
import scala.meta.pc.OffsetParams
88
import scala.meta.pc.PresentationCompilerConfig
99
import scala.meta.pc.SymbolSearch

‎presentation-compiler/src/main/dotty/tools/pc/PcInlayHintsProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.file.Paths
55

66
import scala.annotation.tailrec
77

8-
import scala.meta.internal.metals.ReportContext
8+
import scala.meta.pc.reports.ReportContext
99
import dotty.tools.pc.utils.InteractiveEnrichments.*
1010
import dotty.tools.pc.printer.ShortenedTypePrinter
1111
import scala.meta.internal.pc.InlayHints

‎presentation-compiler/src/main/dotty/tools/pc/Scala3CompilerAccess.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotty.tools.pc
33
import java.util.concurrent.ScheduledExecutorService
44

55
import scala.concurrent.ExecutionContextExecutor
6-
import scala.meta.internal.metals.ReportContext
6+
import scala.meta.pc.reports.ReportContext
77
import scala.meta.internal.pc.CompilerAccess
88
import scala.meta.pc.PresentationCompilerConfig
99

‎presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ import scala.jdk.CollectionConverters._
1515
import scala.language.unsafeNulls
1616
import scala.meta.internal.metals.CompilerVirtualFileParams
1717
import scala.meta.internal.metals.EmptyCancelToken
18-
import scala.meta.internal.metals.EmptyReportContext
18+
import scala.meta.pc.reports.EmptyReportContext
1919
import scala.meta.internal.metals.PcQueryContext
20-
import scala.meta.internal.metals.ReportContext
20+
import scala.meta.pc.reports.ReportContext
2121
import scala.meta.internal.metals.ReportLevel
22-
import scala.meta.internal.metals.StdReportContext
2322
import scala.meta.internal.mtags.CommonMtagsEnrichments.*
2423
import scala.meta.internal.pc.CompilerAccess
2524
import scala.meta.internal.pc.DefinitionResultImpl
@@ -54,8 +53,11 @@ case class ScalaPresentationCompiler(
5453
folderPath: Option[Path] = None,
5554
reportsLevel: ReportLevel = ReportLevel.Info,
5655
completionItemPriority: CompletionItemPriority = (_: String) => 0,
56+
reportContext: ReportContext = EmptyReportContext()
5757
) extends PresentationCompiler:
5858

59+
given ReportContext = reportContext
60+
5961
override def supportedCodeActions(): ju.List[String] = List(
6062
CodeActionId.ConvertToNamedArguments,
6163
CodeActionId.ImplementAbstractMembers,
@@ -72,10 +74,6 @@ case class ScalaPresentationCompiler(
7274
private val forbiddenOptions = Set("-print-lines", "-print-tasty")
7375
private val forbiddenDoubleOptions = Set.empty[String]
7476

75-
given ReportContext =
76-
folderPath
77-
.map(StdReportContext(_, _ => buildTargetName, reportsLevel))
78-
.getOrElse(EmptyReportContext)
7977

8078
override def codeAction[T](
8179
params: OffsetParams,
@@ -513,6 +511,9 @@ case class ScalaPresentationCompiler(
513511
def withSearch(search: SymbolSearch): PresentationCompiler =
514512
copy(search = search)
515513

514+
override def withReportContext(reportContext: ReportContext): PresentationCompiler =
515+
copy(reportContext = reportContext)
516+
516517
def withWorkspace(workspace: Path): PresentationCompiler =
517518
copy(folderPath = Some(workspace))
518519

‎presentation-compiler/src/main/dotty/tools/pc/SignatureHelpProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import dotty.tools.pc.utils.InteractiveEnrichments.*
1313
import org.eclipse.lsp4j as l
1414

1515
import scala.jdk.CollectionConverters.*
16-
import scala.meta.internal.metals.ReportContext
16+
import scala.meta.pc.reports.ReportContext
1717
import scala.meta.pc.OffsetParams
1818
import scala.meta.pc.SymbolDocumentation
1919
import scala.meta.pc.SymbolSearch

‎presentation-compiler/src/main/dotty/tools/pc/completions/AmmoniteFileCompletions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ object AmmoniteFileCompletions:
6363
)
6464

6565
def matches(file: Path): Boolean =
66-
(Files.isDirectory(file) || file.toAbsolutePath().toString.isAmmoniteScript) &&
66+
(Files.isDirectory(file) || file.toAbsolutePath().toString.isScalaScript) &&
6767
query.exists(q => CompletionFuzzy.matches(q.nn, file.getFileName().toString))
6868

6969
(split, workspace) match

‎presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package completions
44
import java.nio.file.Path
55

66
import scala.jdk.CollectionConverters._
7-
import scala.meta.internal.metals.ReportContext
7+
import scala.meta.pc.reports.ReportContext
88
import scala.meta.pc.OffsetParams
99
import scala.meta.pc.PresentationCompilerConfig
1010
import scala.meta.pc.SymbolSearch

‎presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.file.Path
55
import java.nio.file.Paths
66

77
import scala.collection.mutable
8-
import scala.meta.internal.metals.ReportContext
8+
import scala.meta.pc.reports.ReportContext
99
import scala.meta.internal.mtags.CoursierComplete
1010
import scala.meta.internal.pc.{IdentifierComparator, MemberOrdering, CompletionFuzzy}
1111
import scala.meta.pc.*

‎presentation-compiler/src/main/dotty/tools/pc/completions/InterpolatorCompletions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.pc.completions
22

33
import scala.collection.mutable.ListBuffer
4-
import scala.meta.internal.metals.ReportContext
4+
import scala.meta.pc.reports.ReportContext
55
import scala.meta.internal.pc.CompletionFuzzy
66
import scala.meta.internal.pc.InterpolationSplice
77
import scala.meta.pc.PresentationCompilerConfig

‎presentation-compiler/src/main/dotty/tools/pc/completions/MatchCaseCompletions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.net.URI
66
import scala.collection.mutable
77
import scala.collection.mutable.ListBuffer
88
import scala.jdk.CollectionConverters._
9-
import scala.meta.internal.metals.ReportContext
9+
import scala.meta.pc.reports.ReportContext
1010
import scala.meta.internal.pc.CompletionFuzzy
1111
import scala.meta.pc.PresentationCompilerConfig
1212
import scala.meta.pc.SymbolSearch

‎presentation-compiler/src/main/dotty/tools/pc/completions/OverrideCompletions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package completions
44
import java.util as ju
55

66
import scala.jdk.CollectionConverters._
7-
import scala.meta.internal.metals.ReportContext
7+
import scala.meta.pc.reports.ReportContext
88
import scala.meta.pc.OffsetParams
99
import scala.meta.pc.PresentationCompilerConfig
1010
import scala.meta.pc.PresentationCompilerConfig.OverrideDefFormat

‎presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.pc.printer
22

33
import scala.collection.mutable
44
import scala.meta.internal.jdk.CollectionConverters.*
5-
import scala.meta.internal.metals.ReportContext
5+
import scala.meta.pc.reports.ReportContext
66
import scala.meta.internal.mtags.KeywordWrapper
77
import scala.meta.pc.SymbolDocumentation
88
import scala.meta.pc.SymbolSearch

‎presentation-compiler/test/dotty/tools/pc/base/BaseInlayHintsSuite.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ class BaseInlayHintsSuite extends BasePCSuite {
3030
withPkg.length()
3131
)
3232
val pcParams = CompilerInlayHintsParams(
33-
rangeParams,
34-
true,
35-
true,
36-
true,
37-
true,
38-
hintsInPatternMatch
33+
rangeParams = rangeParams,
34+
inferredTypes = true,
35+
typeParameters = true,
36+
implicitParameters = true,
37+
byNameParameters = true,
38+
implicitConversions = true,
39+
namedParameters = true,
40+
hintsInPatternMatch = hintsInPatternMatch
3941
)
4042

4143
val inlayHints = presentationCompiler

‎presentation-compiler/test/dotty/tools/pc/tests/CompilerCachingSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import org.junit.{Before, Test}
88
import scala.language.unsafeNulls
99
import scala.meta.internal.metals.CompilerOffsetParams
1010
import scala.meta.internal.metals.EmptyCancelToken
11-
import scala.meta.internal.metals.EmptyReportContext
1211
import scala.meta.internal.metals.PcQueryContext
1312
import scala.meta.pc.OffsetParams
13+
import scala.meta.pc.reports.EmptyReportContext
1414
import scala.concurrent.Future
1515
import scala.concurrent.Await
1616
import scala.meta.pc.VirtualFileParams
@@ -42,7 +42,7 @@ class CompilerCachingSuite extends BasePCSuite:
4242
}(emptyQueryContext).get(timeout.length, timeout.unit)
4343
case _ => throw IllegalStateException("Presentation compiler should always be of type of ScalaPresentationCompiler")
4444

45-
private def emptyQueryContext = PcQueryContext(None, () => "")(using EmptyReportContext)
45+
private def emptyQueryContext = PcQueryContext(None, () => "")(using EmptyReportContext())
4646

4747
@Before
4848
def beforeEach: Unit =

‎project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ object Build {
14981498
BuildInfoPlugin.buildInfoDefaultSettings
14991499

15001500
lazy val presentationCompilerSettings = {
1501-
val mtagsVersion = "1.5.1"
1501+
val mtagsVersion = "1.5.3"
15021502
Seq(
15031503
libraryDependencies ++= Seq(
15041504
"org.lz4" % "lz4-java" % "1.8.0",

0 commit comments

Comments
 (0)