DanielXMoore / Civet

A TypeScript superset that favors more types and less typing
https://civet.dev
MIT License
1.56k stars 33 forks source link

Highlight (import, export module references) #1580

Open zoodogood opened 2 weeks ago

zoodogood commented 2 weeks ago

The import path now has the same highlighting as the string literal (string.unquoted.module-reference.civet). Previously it could be colored with anything

image

Before pull


I have been unable to determine the correct method for intercepting the block completion

with
  type: "json"

so this part is not part of the import expression, which is semantically wrong. Any criticism is welcome, I'm inexperienced

edemaine commented 2 weeks ago

Could you rebase against our main branch? There seems to be a lot of other commits here.

zoodogood commented 2 weeks ago

Oops. I'm redoing the pull request now. Or does it merge into pure history?

zoodogood commented 2 weeks ago

Yeah, I noticed that, too. It's gonna take me a little while

edemaine commented 2 weeks ago

If you setup a remote of upstream to refer to our repo/fork (git remote add upstream git@github.com:DanielXMoore/Civet.git), then git rebase -i upstream/main, then git push -f (after checking everything is still OK), the PR will update.

zoodogood commented 2 weeks ago

If you setup a remote of upstream to refer to our repo/fork (git remote add upstream git@github.com:DanielXMoore/Civet.git), then git rebase -i upstream/main, then git push -f (after checking everything is still OK), the PR will update.

Thank you, that helped.

zoodogood commented 2 weeks ago

@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