Fix member type/expression parsing #1077
Merged
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 |
|
Note that this depends on #1076 (which is included in this PR right now) and the FIXME in https://github.com/apple/swift/pull/62092should be able to be removed after this (looks like there's already a |
bnbarham
force-pushed
the
fix-metatypes
branch
from
f07e6ff to
fa225db
Compare
|
@swift-ci please test |
bnbarham
force-pushed
the
fix-metatypes
branch
from
fa225db to
3dba4f1
Compare
|
@swift-ci please test |
bnbarham
force-pushed
the
fix-metatypes
branch
from
3dba4f1 to
be258d0
Compare
|
@swift-ci please test |
bnbarham
force-pushed
the
fix-metatypes
branch
2 times, most recently
from
853619a to
75cabed
Compare
|
@swift-ci please test |
rintaro
reviewed
Dec 1, 2022
ahoppen
reviewed
Dec 1, 2022
bnbarham
force-pushed
the
fix-metatypes
branch
2 times, most recently
from
c74a505 to
6c5b7aa
Compare
|
@swift-ci please test |
bnbarham
changed the title
.Type and .Protocol as MetatypeTypeSyntax
ahoppen
reviewed
Dec 4, 2022
rintaro
reviewed
Dec 5, 2022
bnbarham
force-pushed
the
fix-metatypes
branch
from
6c5b7aa to
53bad89
Compare
|
@swift-ci please test |
|
@swift-ci please test |
rintaro
approved these changes
Dec 13, 2022
ahoppen
reviewed
Dec 14, 2022
bnbarham
force-pushed
the
fix-metatypes
branch
3 times, most recently
from
7b425a9 to
dfe5ff7
Compare
|
@swift-ci please test |
bnbarham
force-pushed
the
fix-metatypes
branch
from
dfe5ff7 to
9aeeb18
Compare
|
@swift-ci please test |
bnbarham
force-pushed
the
fix-metatypes
branch
from
9aeeb18 to
aaa739d
Compare
|
@swift-ci please test |
bnbarham
added a commit
to bnbarham/swift-format
that referenced
this pull request
Dec 20, 2022
Removed by swift-syntax in swiftlang/swift-syntax#1077.
|
@swift-ci please test |
- Parse `.Type` and `.Protocol` as `MetatypeTypeSyntax`
- Parse keywords in member position as identifiers
- Generate a missing identifier rather than unexpected nodes if the next
token is on a new line
- Diagnose extraneous whitespace after `.` if there was no leading
whitespace
- Remove `.prefixPeriod` since it is no longer used
bnbarham
force-pushed
the
fix-metatypes
branch
from
aaa739d to
cf85878
Compare
|
@swift-ci please test |
Comment on lines
-847
to
-878
| mutating func canParseOldStyleProtocolComposition() -> Bool { | ||
| self.eat(.protocolKeyword) | ||
|
|
||
| // Check for the starting '<'. | ||
| guard self.currentToken.starts(with: "<") else { | ||
| return false | ||
| } | ||
|
|
||
| self.consumePrefix("<", as: .leftAngle) | ||
|
|
||
| // Check for empty protocol composition. | ||
| if self.currentToken.starts(with: ">") { | ||
| self.consumePrefix(">", as: .rightAngle) | ||
| return true | ||
| } | ||
|
|
||
| // Parse the type-composition-list. | ||
| var loopProgress = LoopProgressCondition() | ||
| repeat { | ||
| guard self.canParseTypeIdentifier() else { | ||
| return false; | ||
| } | ||
| } while self.consume(if: .comma) != nil && loopProgress.evaluate(currentToken) | ||
|
|
||
| // Check for the terminating '>'. | ||
| guard self.currentToken.starts(with: ">") else { | ||
| return false | ||
| } | ||
| self.consumePrefix(">", as: .rightAngle) | ||
|
|
||
| return true | ||
| } |
There was a problem hiding this comment.
@bnbarham Was this removed on purpose?
There was a problem hiding this comment.
@AnthonyLatsis Yes, in SwiftParser we decided not to support old style protocol composition at all (there's no parseOldStyleProtocolComposition().) So keeping canParseOldStyleProtocolComposition() doesn't make sense.
ahoppen
pushed a commit
to ahoppen/swift-format
that referenced
this pull request
Jan 27, 2023
Removed by swift-syntax in swiftlang/swift-syntax#1077.
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.
Few fixes to member parsing:
.Typeand.ProtocolasMetatypeTypeSyntaxtoken is on a new line
.if there was no leadingwhitespace
.prefixPeriodsince it is no longer used