Highlight variable definitions and constant names #373
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @da-x (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
| @@ -64,6 +64,8 @@ syn match rustExternCrateString /".*"\_s*as/ contained nextgroup=rustIdentifie | |||
| syn keyword rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipwhite skipempty | |||
|
|
|||
| syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained | |||
| syn match rustIdentifier "\v((let|static|const) (ref )?(mut )?)@<=[a-z_]+" | |||
There was a problem hiding this comment.
This is insufficient: e.g. let Foo(bar) = baz;, these things are patterns, not identifiers. Also there are three other constructs that can introduce new bindings (match branches, function arguments, closure arguments). In general, I don’t like things that make it work sometimes but not always. I don’t think a good solution exists, when using a regular expression parser. You could make it highlight identifiers inside a pattern in each of these cases, but it’d slow things down a lot, and I don’t think that people actually care so very much about the precise highlighting, but they do about the performance of the highlighter. (Do take what I say with a grain of salt, however: I’m biased towards simple highlighting, and have Identifier cleared.)
There was a problem hiding this comment.
This might be a good start for tuple destructuring:
syn match rustIdentifier "\v((let|static|const) (ref )?(mut )?)@<=([a-z_]+|\((\w+(, )?)+\))"
It currently matches the parentheses and commas as well though.
The following works for simple cases (i.e. no destructuring) with for loops:
syn match rustIdentifier "\v(for (&)?)@<=\w+"
Yep, correct.
Cool, I wasn’t sure exactly where to look for the answer to something like this. |
The regexes I’ve used are definitely not perfect, I just quickly slapped them together. Also, constants that begin with a number are not currently highlighted.