Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tree-sitter rolling fixes, 1.118 edition #1010

Merged
merged 7 commits into from
Jun 16, 2024
Merged

Tree-sitter rolling fixes, 1.118 edition #1010

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55e869c
[language-(java|type)script] Prevent the `FOO` in `<FOO.Bar>`…
savetheclocktower May 18, 2024
8bf199a
[language-php] Add a `firstLineRegex`…
savetheclocktower May 18, 2024
c04a38b
[language-php] Update `tree-sitter-php` to latest…
savetheclocktower May 18, 2024
ca02c51
Modify some AtomDoc blocks…
savetheclocktower May 19, 2024
b61e491
Handle failed node descriptor lookups more gracefully
savetheclocktower Jun 13, 2024
ef26c58
[language-ruby] Fix our attempt to fold Ruby comments…
savetheclocktower Jun 13, 2024
b4cba9b
[language-typescript] Several fixes…
savetheclocktower Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions packages/language-javascript/grammars/tree-sitter/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
; MISC
; ====

; In the JSX construct `<FOO.Bar>`, `FOO` should not be marked as
; `constant.other.js`. Block off identifiers within complex JSX tag names early
; to prevent this.

(jsx_opening_element
(member_expression
(identifier) @_IGNORE_
(#set! capture.final)))

(jsx_closing_element
(member_expression
(identifier) @_IGNORE_
(#set! capture.final)))

(jsx_self_closing_element
(member_expression
(identifier) @_IGNORE_
(#set! capture.final)))


; STRINGS
; =======
Expand Down Expand Up @@ -775,16 +797,16 @@

; The "Foo" in `<Foo />`.
(jsx_self_closing_element
name: (identifier) @entity.name.tag.js
name: (_) @entity.name.tag.js
) @meta.tag.jsx.js

; The "Foo" in `<Foo>`.
(jsx_opening_element
name: (identifier) @entity.name.tag.js)
name: (_) @entity.name.tag.js)

; The "Foo" in `</Foo>`.
(jsx_closing_element
name: (identifier) @entity.name.tag.js)
name: (_) @entity.name.tag.js)

; The "bar" in `<Foo bar={true} />`.
(jsx_attribute
Expand Down
2 changes: 1 addition & 1 deletion packages/language-typescript/grammars/modern-tree-sitter-tsx.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ treeSitter:
languageSegment: 'ts.tsx'
grammar: 'tree-sitter-tsx/tree-sitter-tsx.wasm'
highlightsQuery: [
'common/highlights.scm'
'tree-sitter-tsx/highlights.scm'
'common/highlights.scm'
Comment on lines -17 to +18
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change meaningful?

Any insights into the purpose of it if so? Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Order matters here. The contents of each file is concatenated into one query file, and earlier queries are matched before later queries.

I needed a few JSX-specific rules to act before the ordinary rules in highlights.scm — the “Block off identifiers within complex JSX tag names…” stuff matches some things so that it can prevent them from being matched by a later rule.

In this instance, it didn't otherwise matter which query file was included first. But if it had, I'd have needed to create a third file, put only those rules into it, and configure it to be included first.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, that's a pretty useful and practical explanation, with the examples.

]
indentsQuery: [
'common/indents.scm'
Expand Down
23 changes: 22 additions & 1 deletion packages/language-typescript/grammars/tree-sitter-tsx/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
; MISC
; ====

; In the JSX construct `<FOO.Bar>`, `FOO` should not be marked as
; `constant.other.ts.tsx`. Block off identifiers within complex JSX tag names
; early to prevent this.

(jsx_opening_element
(nested_identifier
(identifier) @_IGNORE_
(#set! capture.final)))

(jsx_closing_element
(nested_identifier
(identifier) @_IGNORE_
(#set! capture.final)))

(jsx_self_closing_element
(nested_identifier
(identifier) @_IGNORE_
(#set! capture.final)))

; JSX
; ===

; The "Foo" in `<Foo />`.
(jsx_self_closing_element
name: (identifier) @entity.name.tag.ts.tsx
name: (_) @entity.name.tag.ts.tsx
) @meta.tag.ts.tsx

; The "Foo" in `<Foo>`.
Expand Down