DiagnosticVerifier: Support line offsets in fix-it verification ranges #41429
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 smoke test |
rintaro
reviewed
Feb 18, 2022
lib/Frontend/DiagnosticVerifier.cpp
Outdated
|
|
||
| if (secondValue == LineColumnRange::NoValue) { | ||
| // If only one value is specified, it's a column number; | ||
| return std::make_pair(secondValue, firstValue); |
There was a problem hiding this comment.
This is a little bit confusing. I feel std::make_pair(LineColumnRange::NoValue, firstValue) is more clear.
lib/Frontend/DiagnosticVerifier.cpp
Outdated
Comment on lines
412
to
419
| switch (lineOffsetKind) { | ||
| case LineOffsetKind::None: | ||
| break; | ||
| case LineOffsetKind::Plus: | ||
| firstValue += DiagnosticLineNo; | ||
| break; | ||
| case LineOffsetKind::Minus: | ||
| firstValue = DiagnosticLineNo - firstValue; | ||
| break; | ||
| } |
There was a problem hiding this comment.
auto lineNo = DiagnosticLineNo;
switch (lineOffsetKind) {
case ::None
lineNo = firstValue;
break;
case ::Plus
lineNo += firstValue;
break;
case ::Minus
lineNo -= firstValue;
break;
}WDYT?
lib/Frontend/DiagnosticVerifier.cpp
Outdated
Comment on lines
356
to
372
| const enum class LineOffsetKind : uint8_t { | ||
| None, | ||
| Plus, | ||
| Minus | ||
| } lineOffsetKind = [&] { | ||
| if (Str.empty()) | ||
| return LineOffsetKind::None; | ||
|
|
||
| switch (Str.front()) { | ||
| case '+': | ||
| return LineOffsetKind::Plus; | ||
| case '-': | ||
| return LineOffsetKind::Minus; | ||
| default: | ||
| return LineOffsetKind::None; | ||
| } | ||
| }(); |
There was a problem hiding this comment.
Clever, but
const enum class LineOffsetKind : uint8_t {
None,
Plus,
Minus
};
LineOffsetKind lineOffsetKind = LineOffsetKind::None;
switch (Str.front()) {
case '+':
lineOffsetKind = LineOffsetKind::Plus;
Str = Str.drop_front();
break;
case '-':
lineOffsetKind = LineOffsetKind::Minus;
Str = Str.drop_front();
break;
default:
break;
} feels easier to read.
There was a problem hiding this comment.
I had the feeling this was gonna bug someone 😄
No problem, can I keep the lambda for constness though? When reading C++, I feel a ton of relief every time I see that something's not going to be mutated in the next 50+ lines.
There was a problem hiding this comment.
Actually, never mind; the difference looks negligible this time.
AnthonyLatsis
force-pushed
the
fixit-line-offsets
branch
from
4b58d9b to
2128678
Compare
|
@swift-ci Please smoke test |
rintaro
approved these changes
Feb 18, 2022
|
@rintaro Appreciate the review! |
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.
Follow-up to #39572
The range syntax is now
([+-]?N:)?N-([+-]?N:)?NwhereNis[0-9]+.