[IDE][Parse] Fix syntax coloring ranges for type attributes #26418
Conversation
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
|
@swift-ci please test |
nathawes
force-pushed
the
type-attr-coloring
branch
from
8823131 to
ad8e699
Compare
added 3 commits
August 5, 2019 11:36
When looking for the SyntaxNode corresponding to a type attribute (like @escaping), ModelASTWalker would look for one whose range *started* at the type attribute's source location. It never found one, though, because the SyntaxNode's range included the @, while the type attribute's source location pointed to the name *after* the @.
… the @ like DeclAttributes
nathawes
force-pushed
the
type-attr-coloring
branch
from
ad8e699 to
4d2aca1
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
@swift-ci please test Linux |
|
@swift-ci test and merge |
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.
When looking for the
SyntaxNodecorresponding to a type attribute (like@escaping),ModelASTWalkerwould look for one whose range started at the type attribute's source location. It never found one, though, because theSyntaxNode's range included the@, while the type attribute's source location pointed to the name after the@. The result was that type attribute tokens were highlighted as unknown, rather than built-in attributes. This PR changes type attribute source locations to point to the@rather than the name (which matches the start location ofDeclAttributes too). This PR also fixes a bug I noticed where the fixit for removing@escapingon non-function types would compute the incorrect range for the attribute.TypeAttributeswould ideally keepSourceLocs for both the@and the attribute name since things like@ /*this is fine...*/ escapingare valid. I didn't do that since it represents which attributes are on a type via a fixed-length array of SourceLocs, with one entry for every possible type attribute kind, where each SourceLoc's validity encodes whether the attribute is present or not. Extending this to a list of SourceRanges would work, but seemed like a waste of memory. Given that the@is usually next to the attribute name, it's needed purely for syntax highlighting, and we'll hopefully be using the libSyntax tree to track source locations in future, I let that case be for now.