Updated Swift grammar, adding 'any' and 'await' keywords. #9586
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
the-mikedavis
approved these changes
Feb 10, 2024
the-mikedavis
added
S-waiting-on-review
|
I spoke to @alex-pinkus (the tree-sitter-swift maintainer), and he believes most (if not all) of the issues I've listed are issues for his project. He's very helpful, and open to PRs, so I'm optimistic about polishing the Swift grammar. |
pascalkuthe
approved these changes
Feb 12, 2024
alex-pinkus
added a commit
to alex-pinkus/tree-sitter-swift
that referenced
this pull request
Feb 18, 2024
In helix-editor/helix#9586, the Helix editor added highlighting for the `any` keyword. However, while reviewing that, I noticed that both `some` and `any` should be more specific: these keywords are legal as identifiers, but should not be highlighted as identifiers when they are keywords. For instance, I can write: ``` let any: any Protocol = AnyImplementation() ``` In this example, only the second `any` should be highlighted. See discussion on #351
alex-pinkus
added a commit
to alex-pinkus/tree-sitter-swift
that referenced
this pull request
Feb 18, 2024
In helix-editor/helix#9586, the Helix editor added highlighting for the `any` keyword. However, while reviewing that, I noticed that both `some` and `any` should be more specific: these keywords are legal as identifiers, but should not be highlighted as identifiers when they are keywords. For instance, I can write: ``` let any: any Protocol = AnyImplementation() ``` In this example, only the second `any` should be highlighted. See discussion on #351
cosmikwolf
pushed a commit
to cosmikwolf/helix
that referenced
this pull request
Feb 26, 2024
postsolar
pushed a commit
to postsolar/helix
that referenced
this pull request
Apr 4, 2024
mtoohey31
pushed a commit
to mtoohey31/helix
that referenced
this pull request
Jun 2, 2024
Vulpesx
pushed a commit
to Vulpesx/helix
that referenced
this pull request
Jun 7, 2024
smortime
pushed a commit
to smortime/helix
that referenced
this pull request
Jul 10, 2024
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.
This updates
runtime/queries/swift/highlights.scm, addinganyandawaitas keywords. It also removes a todo that was already done, and updates the upstream-comment on Line 1 with newest commit ID fortree-sitter-swift (main).The
languages.tomlfile was also updated, setting Swift'ssource.revto the newest commit ID fortree-sitter-swift (with-generated-files).There are a handful of other issues with Swift syntax-highlighting, but they're all upstream, so I'll summarize them here, and open issues with tree-sitter/tree-sitter-swift:
defershould be a keywordinoutis highlighted, butborrowingandconsumingare notSelfandselfshould be highlighted the same way (Selfis also a builtin variable)tryis highlighted as a keyword, and?and!as suffix operators (when in suffix position), but tree-sitter tokenizestry?andtry!as single (operator) tokensP.S. Thanks again to @the-mikedavis and @Dispersia. I really appreciate your help.