Inherit javascript/typescript from common 'ecma' queries #3301
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EricCrosson
added a commit
to EricCrosson/dotfiles
that referenced
this pull request
Aug 2, 2022
…s/helix-aa4394c" This reverts commit 34c977b, reversing changes made to 651b239. Need to wait until helix-editor/helix#3301 lands to fix TypeScript syntax highlighting.
EricCrosson
approved these changes
Aug 2, 2022
There was a problem hiding this comment.
Yep, I'm hitting this on my side too. Quick on the draw as usual, @the-mikedavis ! Many thanks 🙇
|
Ah, now I understand why they did it in that way at the nvim-tresitter repo. Both javascript and typescript inherit from ecma to avoid code duplication and prevent this issue. Should we do the same? |
|
Yeah good call, let's keep sharing as much as we can under ecma 👍 |
JavaScript queries now contain a few lines that prevent them from being used whole-sale in typescript with `; inherits: javascript`. Here we follow nvim-treesitter's way of using a fake 'ecma' language as a common base for JavaScript and TypeScript to share as much as we can.
the-mikedavis
force-pushed
the
md-fix-typescript-highlights
branch
from
9d19c03 to
8c0fb16
Compare
the-mikedavis
changed the title
thomasskk
pushed a commit
to thomasskk/helix
that referenced
this pull request
Sep 9, 2022
…r#3301) JavaScript queries now contain a few lines that prevent them from being used whole-sale in typescript with `; inherits: javascript`. Here we follow nvim-treesitter's way of using a fake 'ecma' language as a common base for JavaScript and TypeScript to share as much as we can.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Looks like #3280 inadvertently ended up breaking typescript highlights because of typescript's
; inherits: javascriptline.Here I've replaced that; inherits javascriptwith as much of the javascript highlights as the query analysis will acceptThis should fix typescript and tsx query analysis (which panics on open).