chore: Bump scalameta to 4.9.8 #6570
Conversation
tgodzik
force-pushed
the
bump-scalameta2
branch
5 times, most recently
from
b204604
to
a7a34cf
Compare
tgodzik
force-pushed
the
bump-scalameta2
branch
2 times, most recently
from
25eae93
to
6c68cb7
Compare
tgodzik
force-pushed
the
bump-scalameta2
branch
2 times, most recently
from
9866332
to
054d508
Compare
| ("org.scalameta" % s"semanticdb-shared_${V.scala213}" % V.scalameta) | ||
| ) | ||
|
|
||
| def scala3ScalametaDependency: ModuleID = withExcludes( |
There was a problem hiding this comment.
There was a change in dependencies, internal semanticdb stuff is no longer in scalameta, which makes sense.
| @@ -52,8 +52,8 @@ object MillDigest extends Digestable { | |||
| case _: Token.KwImport => | |||
| acc.hadImport = true | |||
| // end import either with newline or `,` or `}` | |||
| case _: Token.LF | _: Token.LFLF | _: Token.Comma | | |||
| _: Token.RightBrace if acc.processingFileImport => | |||
| case _: Token.AtEOL | _: Token.Comma | _: Token.RightBrace | |||
There was a problem hiding this comment.
The tokens changed a bit, but they now have sensible traits such as this.
| @@ -127,6 +125,12 @@ class JavaInteractiveSemanticdb( | |||
| out | |||
| } | |||
|
|
|||
| private def readAllDocuments(path: AbsolutePath): Seq[s.TextDocument] = { | |||
There was a problem hiding this comment.
That method was removed from scalameta, but it was simple enough
| @@ -77,6 +77,14 @@ object MtagsResolver { | |||
| "3.3.2-RC2" -> "1.2.2", | |||
| "3.3.2-RC3" -> "1.2.2", | |||
| "3.1.3" -> "1.3.2", | |||
| "2.12.12" -> "1.3.3", | |||
There was a problem hiding this comment.
This is the biggest change, since scalameta is no longer published for more than 4 versions we would have to inline a lot of code or add compat directories for all versions, which is not something I really want to do. However, since we still support the older version, we just don't release it anymore, I think this is perfectly ok.
There was some test changes related to that
| @@ -1,6 +1,6 @@ | |||
| /*example(Package):9*/package example | |||
|
|
|||
| /*example.nested.x(Package):5*/package nested.x { | |||
| /*example.nested.x(Package):4*/package nested.x { | |||
There was a problem hiding this comment.
Not sure about the changes here, but they do not seem too problematic.
There was a problem hiding this comment.
Yeah, it doesn't seem too problematic but also possibly a bug..., example.nested.x ends on line 5 not 4.
mtags/src/main/scala/scala/meta/internal/mtags/ScalaMtags.scala
Outdated
Show resolved
Hide resolved
mtags/src/main/scala/scala/meta/internal/mtags/ScalametaCommonEnrichments.scala
Show resolved
Hide resolved
| @@ -1,6 +1,6 @@ | |||
| /*example(Package):9*/package example | |||
|
|
|||
| /*example.nested.x(Package):5*/package nested.x { | |||
| /*example.nested.x(Package):4*/package nested.x { | |||
There was a problem hiding this comment.
Yeah, it doesn't seem too problematic but also possibly a bug..., example.nested.x ends on line 5 not 4.
#6552