[InlinableText] Handle multiline #if conditions #19675
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
harlanhaskins
force-pushed
the
inline-skating
branch
3 times, most recently
from
ce1a473 to
f499ecd
Compare
rintaro
reviewed
Oct 3, 2018
| // CHECK-NOT: #if ( | ||
| // CHECK-NOT: false && !true | ||
| // CHECK-NOT: ) | ||
| // CHECK-NOT: print("should not appear") |
There was a problem hiding this comment.
Hm, I think this test case it not testing the code change.
The change affects only for getActiveClause(), but this block is not active...
There was a problem hiding this comment.
The code we have actually looks for inactive ranges, but I think you're right that we should see what happens with a multi-line active range too.
There was a problem hiding this comment.
I meant this test case should pass even without the change.
There was a problem hiding this comment.
@rintaro You're right, I pushed before testing locally 😅 They should pass now.
rintaro
reviewed
Oct 3, 2018
| // CHECK: print("should appear") | ||
| // CHECK-NOT: #endif | ||
| // CHECK-NEXT: }) | ||
| public func hasClosureDefaultArgWithMultilinePoundIfCondition(_ x: () -> Void) = { |
There was a problem hiding this comment.
I believe ) after () -> Void is not intentional.
Previously, a #if of the form:
```swift
#if (
false
)
print("x")
#endif
```
Would be emitted after #if-stripping as
```swift
false
)
print("x")
```
Because the old logic assumed conditions will always appear on one line.
Instead, for active clauses that have conditions, skip to the next line
after the end of the condition instead.
harlanhaskins
force-pushed
the
inline-skating
branch
from
f499ecd to
735eead
Compare
|
@swift-ci please smoke test |
modelorganism
pushed a commit
to modelorganism/swift
that referenced
this pull request
Oct 11, 2018
Previously, a #if of the form:
```swift
#if (
false
)
print("x")
#endif
```
Would be emitted after #if-stripping as
```swift
false
)
print("x")
```
Because the old logic assumed conditions will always appear on one line.
Instead, for active clauses that have conditions, skip to the next line
after the end of the condition instead.
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, a #if of the form:
Would be emitted after #if-stripping as
Because the old logic assumed conditions will always appear on one line.
Instead, for active clauses that have conditions, skip to the next line
after the end of the condition instead.