Skip to content

Commit a48a3af

Browse files
committed
Update mtags version
1 parent 7136850 commit a48a3af

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ object AutoImports:
246246
// see WorksheetProvider.worksheetScala3AdjustmentsForPC
247247
val indent =
248248
if pos.source.path.isWorksheet &&
249-
editPos.getStart.nn.getCharacter == 0
249+
editPos.getStart().nn.getCharacter == 0
250250
then indent0.drop(2)
251251
else indent0
252252
val topPadding =

presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ object CompletionItemResolver extends ItemResolver:
5050
Context
5151
): String =
5252
def docs(gsym: Symbol): String =
53-
search.symbolDocumentation(gsym).fold("")(_.docstring.nn)
53+
search.symbolDocumentation(gsym).fold("")(_.docstring().nn)
5454
val gsymDoc = docs(gsym)
5555
def keyword(gsym: Symbol): String =
5656
if gsym.isClass then "class"

presentation-compiler/src/main/dotty/tools/pc/ConvertToNamedArgumentsProvider.scala

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

55
import scala.meta.internal.pc.CodeActionErrorMessages
66
import scala.meta.pc.OffsetParams
7-
import scala.language.unsafeNulls
87

98
import dotty.tools.dotc.ast.tpd
109
import dotty.tools.dotc.core.Contexts.Context

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import org.eclipse.lsp4j as l
3737

3838
case class ScalaPresentationCompiler(
3939
buildTargetIdentifier: String = "",
40+
buildTargetName: Option[String] = None,
4041
classpath: Seq[Path] = Nil,
4142
options: List[String] = Nil,
4243
search: SymbolSearch = EmptySymbolSearch,
@@ -47,17 +48,21 @@ case class ScalaPresentationCompiler(
4748
reportsLevel: ReportLevel = ReportLevel.Info
4849
) extends PresentationCompiler:
4950

50-
def this() = this("", Nil, Nil)
51+
def this() = this("", None, Nil, Nil)
5152

5253
val scalaVersion = BuildInfo.scalaVersion
5354

5455
private val forbiddenOptions = Set("-print-lines", "-print-tasty")
5556
private val forbiddenDoubleOptions = Set("-release")
57+
5658
given ReportContext =
5759
folderPath
58-
.map(StdReportContext(_, reportsLevel))
60+
.map(StdReportContext(_, _ => buildTargetName, reportsLevel))
5961
.getOrElse(EmptyReportContext)
6062

63+
override def withBuildTargetName(buildTargetName: String) =
64+
copy(buildTargetName = Some(buildTargetName))
65+
6166
override def withReportsLoggerLevel(level: String): PresentationCompiler =
6267
copy(reportsLevel = ReportLevel.fromString(level))
6368

project/Build.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,15 +1251,16 @@ object Build {
12511251
BuildInfoPlugin.buildInfoDefaultSettings
12521252

12531253
lazy val presentationCompilerSettings = {
1254-
val mtagsVersion = "1.1.1"
1254+
val mtagsVersion = "1.1.0+53-af181de4-SNAPSHOT"
12551255

12561256
Seq(
1257+
resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
12571258
libraryDependencies ++= Seq(
12581259
"org.lz4" % "lz4-java" % "1.8.0",
12591260
"io.get-coursier" % "interface" % "1.0.18",
12601261
"org.scalameta" % "mtags-interfaces" % mtagsVersion,
12611262
),
1262-
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.11" % mtagsVersion % SourceDeps),
1263+
libraryDependencies += ("org.scalameta" % "mtags-shared_2.13.12" % mtagsVersion % SourceDeps),
12631264
ivyConfigurations += SourceDeps.hide,
12641265
transitiveClassifiers := Seq("sources"),
12651266
Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Ysafe-init"),

0 commit comments

Comments
 (0)