Highlight (import, export module references) #1580
Conversation
|
Could you rebase against our main branch? There seems to be a lot of other commits here. |
|
Oops. I'm redoing the pull request now. Or does it merge into pure history? |
|
Yeah, I noticed that, too. It's gonna take me a little while |
|
If you setup a remote of |
zoodogood
force-pushed
the
SyntaxHighighting(import)
branch
from
8c91794 to
ebac664
Compare
Thank you, that helped. |
lsp/syntaxes/civet.json
Outdated
| } | ||
| }, | ||
| { | ||
| "match": "\\b(?<![\\.\\$])(break|by|case|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while|until|loop|do|export|import|default|from|as|yield|async|await|with|(?<=for)\\s+own)(?!\\s*:)\\b", |
There was a problem hiding this comment.
Not related to this PR, but while I look at this, we have a bunch more for keywords, such as each and the reducers sum etc.
zoodogood
force-pushed
the
SyntaxHighighting(import)
branch
from
ebac664 to
b1a4a4e
Compare
zoodogood
changed the title
zoodogood
force-pushed
the
SyntaxHighighting(import)
branch
from
af413d6 to
29fd02c
Compare
zoodogood
force-pushed
the
SyntaxHighighting(import)
branch
from
29fd02c to
78bd2f7
Compare
|
@edemaine I think it's ready. Can you check? Thank you for taking the time to check the code and suggesting ways to improve it |
|
|
||
| { | ||
| "name": "string.unquoted.module-reference.civet", | ||
| "match": "(?<=(^\\s*(import|export)|^)\\s*(type\\s+)?((\\w+\\s*,\\s*)?\\{(.|\\n)*\\}|\\w+|(\\*\\s+as\\s+\\w+))\\s+(from)\\s+)([^\\(\\{\\[\"';\\s=>][^\"';\\s=>]+|\".+?\"|'.+?')(?=[^()]|$)" |
There was a problem hiding this comment.
\\{(.|\\n)*\\} seems rather inclusive. Perhaps (.|\\n) should be replaced by [^{}]? Or at least * should be *?, like the quoted string regexes.
I also realize that, if you're just trying to match unquoted module references here, you don't actually need |\".+?\"|'.+?'. (If you keep them, shouldn't + be *?)
The import path now has the same highlighting as the string literal (string.unquoted.module-reference.civet). Previously it could be colored with anything
Before pull
export a, b from xtoofrom x import {a, b}I have been unable to determine the correct method for intercepting the block completion
so this part is not part of the import expression, which is semantically wrong. Any criticism is welcome, I'm inexperienced