chore: Update Scalameta to 4.8.11 #5681
Conversation
tgodzik
force-pushed
the
update-scalameta
branch
2 times, most recently
from
d3818e0 to
fbf2412
Compare
|
The changes in this pr inline some of the internal code from scalameta which is prone to change. This changed over the last few versions so if we try to compile older version of scala with an older version of scalameta this would break otherwise. |
| @@ -688,7 +688,6 @@ class ScalaToplevelMtags( | |||
| case WHITESPACE => | |||
| nextIsNL() | |||
| case COMMENT => | |||
| scanner.skipComment() | |||
There was a problem hiding this comment.
The method got removed and it's not necessary since getting the next token will also skip any comments
| @@ -133,13 +133,13 @@ class JavaToplevelMtags(val input: Input.VirtualFile) extends MtagsIndexer { | |||
| parseToken | |||
| case _ => | |||
| val token = kwOrIdent( | |||
| reader.charOffset - 1, | |||
| new StringBuilder().append(first).append(next) | |||
| reader.endCharOffset, | |||
There was a problem hiding this comment.
why did this offset change?
There was a problem hiding this comment.
It was split into start and end in scalameta/scalameta#3339
There was a problem hiding this comment.
Yeah, but why did the -1 disappeared?
There was a problem hiding this comment.
Actually, I think I removed it since the tests didn't pass, but maybe it should be just begCharOffset instead.
There was a problem hiding this comment.
Seems like begCharOffset works and that should be an equivalent of -1 before. Not sure why it worked with end offset, though I imagine our tests mostly use the end
tgodzik
force-pushed
the
update-scalameta
branch
from
0db68bc to
1c140f6
Compare
This is an internal part of scalameta, which is not kept binary compatible, so it's safer to inline it.
No description provided.