Vim syntax improvements #2886
Merged
Vim syntax improvements #2886
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
This was duplicating the swiftTypeName. However, the swiftTypeName is more generically named and applies to both types and functions both in structure and usage. Retain the single definition.
Remove modifiers from the keywords into the modifiers section. Remove type specifiers from the keyword group.
| \ start="<" end=">" | ||
| syn match swiftArchetype contained skipwhite nextgroup=swiftTypeDeclaration |
There was a problem hiding this comment.
Is this code trying to match the conformance constraints?
func foo<T : X, T.U : Y>() {}
^^^^^ ^^^^^^^^
The constrained type can be a nested one, so I'm not sure that swiftVarName would work.
There was a problem hiding this comment.
Yeah, though the Archetype was matching the same way as a VarName. In fact, this is related to the reason for the previously stated "bug". We don't mark the type decl as being contained (because we have no way to contain it in the function parameter list). A VarName is a pattern of [: Type].
That said, with the trailing constraints, I think that the lifetime for this matching is limited anyways.
|
My comment about |
MaxDesiatov
pushed a commit
that referenced
this pull request
Apr 19, 2021
[pull] swiftwasm from main
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.
What's in this pull request?
Resolved bug number: (SR-)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.