fix: Separate rules for result keyword with and without <>#36
Merged
GordonSmith merged 1 commit intobytecodealliance:mainfrom May 9, 2025
Merged
fix: Separate rules for result keyword with and without <>#36GordonSmith merged 1 commit intobytecodealliance:mainfrom
result keyword with and without <>#36GordonSmith merged 1 commit intobytecodealliance:mainfrom
Conversation
tanishiking
commented
Feb 21, 2025
Comment on lines
+219
to
+229
| # ^^ source.wit meta.interface-item.wit meta.type-item.wit | ||
| # ^ source.wit meta.interface-item.wit meta.type-item.wit meta.whitespace.wit | ||
| # ^^ source.wit meta.interface-item.wit meta.type-item.wit entity.name.type.id.wit | ||
| # ^ source.wit meta.interface-item.wit meta.type-item.wit meta.whitespace.wit | ||
| # ^ source.wit meta.interface-item.wit meta.type-item.wit | ||
| # ^^ source.wit meta.interface-item.wit meta.type-item.wit entity.name.type.id.wit | ||
| # ^ source.wit meta.interface-item.wit meta.type-item.wit | ||
| # ^ source.wit meta.interface-item.wit meta.type-item.wit meta.whitespace.wit | ||
| # ^^^^ source.wit meta.interface-item.wit meta.type-item.wit entity.name.type.id.wit |
Contributor
Author
There was a problem hiding this comment.
These should be source.wit meta.interface-item.wit meta.type-item.wit meta.result.ty.wit comment.line.double-slash.wit.
However, this issue applies to other types as well, and the result type worked fine only because it was treated as a special case. We should address this with a more general approach in a separate PR.
type x = i32 // hello <- this line comments will be colored with 0.3.1
Contributor
Author
tanishiking
force-pushed
the
fix-35
branch
2 times, most recently
from
9e7b49d to
256f285
Compare
Contributor
Author
|
Seems like this also fixes #33 ? |
tanishiking
changed the title
result keyword with and without <>result keyword with and without <>
GordonSmith
approved these changes
May 9, 2025
fix bytecodealliance#35 This commit separates the syntax highlighting rules for `result` types with angle brackets (`result<...>`) and `result` types without type parameters. Previously, both types were handled in a single rule, `meta.result.ty.wit`, which ended at a newline (technically "after"), comma, or closing bracket. However, if a `result` type appeared as a parameter, the scope wouldn't end until one of these conditions was met. (As observed, the scope didn’t end even when a newline was encountered, likely because it was captured by other rules, though...). This change simplifies the `meta.result.ty.wit` scope by splitting the handling of `result<...>` and `result`. Now, `result<...>` is handled similarly to `list<...>` and `tuple<...>`, while `result` without `<...>` is handled by `result-base`, which marks the `result` keyword as `entity.name.type.result.wit`. As a consequence of this change, line comments on `result<xxx> // comment` will no longer be ignored. However, this is a known issue for other types as well.
Contributor
Author
|
Thanks! @GordonSmith |
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
before
after
fix #35
This commit separates the syntax highlighting rules for
resulttypes with angle brackets (result<...>) andresulttypes without type parameters.Previously, both types were handled in a single rule,
meta.result.ty.wit, which ended at a newline (technically "after"), comma, or closing bracket. However, if aresulttype appeared as a parameter, the scope wouldn't end until one of these conditions was met. (As observed, the scope didn’t end even when a newline was encountered, likely because it was captured by other rules, though...).This change simplifies the
meta.result.ty.witscope by splitting the handling ofresult<...>andresult. Now,result<...>is handled similarly tolist<...>andtuple<...>, whileresultwithout<...>is handled byresult-base, which marks theresultkeyword asentity.name.type.result.wit.As a consequence of this change, line comments on
result<xxx> // commentwill no longer be ignored. However, this is a known issue for other types as well.