[Parse] Handle #if in brace skipping logic
#74559
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
Previously we would only diagnose and recover for invalid tokens following a `#if` body for the decl and postfix expression case. Sink this logic into `parseIfConfigRaw`, ensuring that we do this for all `#if` cases. This requires propagating the context we're parsing in to customize the diagnostic.
Previously we would strictly match `{` + `}`, but
that ignored the fact that when parsing we consider
`#if` + `#endif` to be a stronger delimiter than
`{` + `}`, so can ignore a stray `}` in a `#if`.
Update the logic to also track opening and closing
`#if` decls, ignoring any braces that happen within
them.
rdar://129195380
hamishknight
requested review from
ahoppen,
bnbarham,
rintaro,
CodaFi and
DougGregor
as code owners
|
@swift-ci please test |
|
@swift-ci please SourceKit stress test |
ahoppen
approved these changes
Jun 20, 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.
Previously we would strictly match
{+}, but that ignored the fact that when parsing we consider#if+#endifto be a stronger delimiter than{+}, so can ignore a stray}in a#if. Update the logic to also track opening and closing#ifdecls, ignoring any braces that happen within them.rdar://129195380