[Diagnostics] Allow column specification in verify mode #26997
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
To check the column a diagnostic is emitted at, use expected-error@+x:y, or expected-error@:y to specify a column without a line offset
jrose-apple
reviewed
Sep 3, 2019
| llvm::SMFixIt fixIt(llvm::SMRange{StartLoc, EndLoc}, I->getMessage()); | ||
| addError(expected.MessageRange.begin(), "incorrect message found", fixIt); | ||
| } else { | ||
| // The difference must be only in the column |
There was a problem hiding this comment.
Is this something we can assert?
There was a problem hiding this comment.
yeah, good idea! I made this an if-elseif and made the last branch unreachable
…-verify mode instead of FileCheck
owenv
force-pushed
the
column_verification
branch
from
25c74ab to
0a239d5
Compare
jrose-apple
approved these changes
Sep 3, 2019
|
@swift-ci smoke test |
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.
For example,
expected-warning@-2:2looks for the warning 2 lines above at the second column, andexpected-warning@:4looks at the fourth column of the current line.Column indexing, especially compared to fix-its, can be a bit confusing, but it matches printed diagnostic output.
There are probably at least a few other tests that can be migrated off FileCheck now, but I haven't found a good way to discover them yet.
Resolves (SR-11320)[https://bugs.swift.org/browse/SR-11320]