Improve detection of definitions #174
Conversation
This makes definitions highlight before the name is typed, as it happens with all other keywords. Also fix corner case where a comment is inserted just after a `val`, `def`, ...
| @@ -20,6 +20,7 @@ const plainid = `(?:${idrest}|${opchar}+)` | |||
| const backQuotedId = "`[^`]+`" | |||
| const anyId = `(?:${plainid}|${backQuotedId})` | |||
| const endOfLineMaybeWithComment = "(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)" | |||
| const notStartOfComment = "(?!//|/\\*)" | |||
There was a problem hiding this comment.
This is a good refactoring 👍
| // ^^^ keyword.declaration.scala | ||
| // ^^^^^^^^^^ comment.line.double-slash.scala | ||
|
|
||
| def /* comment */ |
There was a problem hiding this comment.
What do you think about supporting things like def /* test */ myDef() at some point? I obviously don't want it for this PR, this is very low priority, but I'm just wondering. I think it would require going to some specific state after keywords that are followed by an identifier.
There was a problem hiding this comment.
Indeed, low priority. There might be some useful code for the end pattern that might be useful for this.
There was a problem hiding this comment.
I'm not really sure if it is worth adding more complexity into the rule to support this syntax that nobody should be using anyway.
| // ^^^ keyword.declaration.stable.scala | ||
| // ^^^^^^^^^^ comment.line.double-slash.scala | ||
|
|
||
| val /* comment */ |
There was a problem hiding this comment.
What about val/*test*/ x = 2?
This makes definitions highlight before the name is typed, as it happens with all other keywords.
Also fix corner case where a comment is inserted just after a
val,def, ...