[IDE] Range info for accessor decl #17900
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 smoke test |
rintaro
commented
Jul 12, 2018
lib/AST/Decl.cpp
Outdated
| continue; | ||
|
|
||
| SourceLoc AttrStartLoc = Attr->getRangeWithAt().Start; | ||
| if (getASTContext().SourceMgr.isBeforeInBuffer(VarLoc, AttrStartLoc)) |
There was a problem hiding this comment.
&& getASTContext().SourceMgr.isBeforeInBuffer(AttrStartLoc, Range.Start)
rintaro
force-pushed
the
rdar41073182-2
branch
3 times, most recently
from
ff704d7 to
a58f570
Compare
|
@swift-ci Please smoke test |
jrose-apple
reviewed
Jul 12, 2018
test/IDE/range_info_declattr.swift
Outdated
| subscript(idx: Int) -> Int { | ||
| @available(*, unavailable) | ||
| get { return 0 } | ||
| } |
There was a problem hiding this comment.
You should probably have a test case with multiple attributes on the same accessor, just in case. (The code looks correct for that already, but still.)
lib/AST/Decl.cpp
Outdated
| SourceLoc AttrStartLoc = Attr->getRangeWithAt().Start; | ||
| if (getASTContext().SourceMgr.isBeforeInBuffer(VarLoc, AttrStartLoc) && | ||
| getASTContext().SourceMgr.isBeforeInBuffer(AttrStartLoc, Range.Start)) | ||
| Range.Start = AttrStartLoc; |
There was a problem hiding this comment.
You can use SourceRange::widen to avoid the second check. Slightly simpler.
Attributes on explicit accessor decl may have attributes. Only when the range contains those attributes, the range-info should report `SingleDecl`.
|
@swift-ci Please smoke test |
|
@jrose-apple Mind approving this? |
jrose-apple
approved these changes
Jul 13, 2018
|
Thank you! |
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.
Revised version of #17239.
Attributes on explicit accessor decl may have attributes. Only when the range contains those attributes (but not attributes on
PatternBindingDecl), the range-info should reportSingleDecl.CC: @jrose-apple , @nkcsgexi