Skip to content

Commit a3b9f73

Browse files
committed
chore: Bump scalameta to 4.12.7
1 parent fbc4f9f commit a3b9f73

File tree

9 files changed

+28
-16
lines changed

9 files changed

+28
-16
lines changed

metals/src/main/scala/scala/meta/internal/metals/MtagsResolver.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ object MtagsResolver {
9696
"2.13.11" -> "1.3.5",
9797
"3.2.2" -> "1.3.5",
9898
"3.3.2" -> "1.3.5",
99+
"2.13.12" -> "1.4.2",
99100
)
100101

101102
class Default extends MtagsResolver {

metals/src/main/scala/scala/meta/internal/tvp/ScalacpCopyPaste.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ object ScalacpCopyPaste {
315315

316316
private var nextId = 0
317317
private def freshSymbol(): String = {
318-
val result = Symbols.Local(nextId.toString)
318+
val result = Symbols.Local(nextId)
319319
nextId += 1
320320
result
321321
}

mtags/src/main/scala-2/scala/meta/internal/pc/MetalsGlobal.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ class MetalsGlobal(
124124

125125
def semanticdbSymbol(symbol: Symbol): String = {
126126
import semanticdbOps._
127-
symbol.toSemantic
127+
val semantic = symbol.toSemantic
128+
if (symbol == null) ""
129+
else if (semantic.isEmpty()) symbol.nameString
130+
else semantic
128131
}
129132

130133
def printPretty(pos: sourcecode.Text[Position]): Unit = {

project/V.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ object V {
1111

1212
// When you can add to removedScalaVersions in MtagsResolver.scala with the last released version
1313
val sbtScala = "2.12.18"
14-
val ammonite212Version = "2.12.19"
15-
val ammonite213Version = "2.13.14"
14+
val ammonite212Version = "2.12.20"
15+
val ammonite213Version = "2.13.15"
1616
// Rules need to be manually updated to support
1717
val bazelScalaVersion = "2.13.12"
1818
val ammonite3Version = "3.3.4"
@@ -45,7 +45,7 @@ object V {
4545
val scalaCli = "1.6.1"
4646
val scalafix = "0.14.0"
4747
val scalafmt = "3.7.15"
48-
val scalameta = "4.12.3"
48+
val scalameta = "4.12.7"
4949
val scribe = "3.16.0"
5050
val qdox = "2.2.0"
5151

@@ -149,7 +149,6 @@ object V {
149149
"2.12.19",
150150
"2.12.18",
151151
"2.12.17",
152-
"2.13.12",
153152
"2.13.13",
154153
"2.13.14",
155154
"2.13.15",

sbt-metals/src/sbt-test/sbt-metals/semanticdb/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ val checkSemanticdb =
77
lazy val a = project
88
.in(file("a"))
99
.settings(
10-
scalaVersion := "2.13.12",
10+
scalaVersion := "2.13.16",
1111
inConfig(Compile) {
1212
checkSemanticdb := {
1313
assertSemanticdbForScala2.value

tests/cross/src/test/scala/tests/pc/PcRenameSuite.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,23 +466,27 @@ class PcRenameSuite extends BasePcRenameSuite {
466466
"for-comp-bind",
467467
"""
468468
|case class Bar(fooBar: Int, goo: Int)
469-
|val abc = for {
469+
|object B {
470+
| val abc = for {
470471
| foo <- List(1)
471472
| _ = Option(1)
472473
| Bar(<<fooBar>>, goo) <- List(Bar(foo, 123))
473474
| baz = <<fooBar>> + goo
474-
|} yield {
475+
| } yield {
475476
| val x = foo + <<foo@@Bar>> + baz
476477
| x
478+
| }
477479
|}""".stripMargin
478480
)
479481

480482
check(
481483
"for-comprehension",
482-
"""|val a = for {
484+
"""|object B {
485+
| val a = for {
483486
| <<ab@@c>> <- List("a", "b", "c")
484487
| _ = println("print!")
485-
|} yield <<a@@bc>>
488+
| } yield <<a@@bc>>
489+
|}
486490
|""".stripMargin
487491
)
488492

tests/slow/src/test/scala/tests/bazel/BazelLspSuite.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ class BazelLspSuite
4747
_ = assertNoDiff(
4848
client.workspaceMessageRequests,
4949
List(
50-
importMessage
50+
importMessage,
51+
Messages.DeprecatedRemovedScalaVersion.message(Set("2.13.12")),
5152
).mkString("\n"),
5253
)
5354
_ = assert(bazelBspConfig.exists)
@@ -127,7 +128,10 @@ class BazelLspSuite
127128
|""".stripMargin,
128129
)
129130
} yield {
130-
assertEmpty(client.workspaceMessageRequests)
131+
assertEquals(
132+
client.workspaceMessageRequests,
133+
Messages.DeprecatedRemovedScalaVersion.message(Set("2.13.12")),
134+
)
131135
assert(bazelBspConfig.exists)
132136
server.assertBuildServerConnection()
133137
}
@@ -193,7 +197,8 @@ class BazelLspSuite
193197
assertNoDiff(
194198
client.workspaceMessageRequests,
195199
List(
196-
Messages.ResetWorkspace.message
200+
Messages.DeprecatedRemovedScalaVersion.message(Set("2.13.12")),
201+
Messages.ResetWorkspace.message,
197202
).mkString("\n"),
198203
)
199204
assert(bazelBspConfig.exists)

tests/unit/src/test/resources/definition/example/PatternMatching.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ class PatternMatching/*PatternMatching.scala*/ {
1919
def localDeconstruction/*PatternMatching.scala*/ = {
2020
val Some/*Option.scala*/(number2/*PatternMatching.semanticdb*/) =
2121
some/*PatternMatching.scala*/
22-
number2/*PatternMatching.semanticdb*/
22+
number2/*no local definition*/
2323
}
2424
}

tests/unit/src/test/resources/semanticdb/example/PatternMatching.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class PatternMatching/*example.PatternMatching#*/ {
1717
println/*scala.Predef.println(+1).*/(number1/*example.PatternMatching#number1.*/)
1818

1919
def localDeconstruction/*example.PatternMatching#localDeconstruction().*/ = {
20-
val Some/*scala.Some.*/(number2/*local4*/) =
20+
val Some/*scala.Some.*/(number2/*local5*/) =
2121
some/*example.PatternMatching#some.*/
2222
number2/*local4*/
2323
}

0 commit comments

Comments
 (0)