[Sema/Index] Resolve #keyPath components so they get handled by indexing, semantic highlighting, etc #33320
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
Unlike \keypath expressions, only the property components of #keypath expressions were being resolved, so index wouldn't pick up references for their qualifying types. Also fixes a code completion bug where it was reporting members from the Swift rather than ObjC side of bridged types. Resolves rdar://problem/61573935
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
xedin
approved these changes
Aug 5, 2020
| @@ -4657,13 +4657,24 @@ ERROR(availability_decl_unavailable, none, | |||
| "%select{ in %3|}2%select{|: %4}4", | |||
| (unsigned, DeclName, bool, StringRef, StringRef)) | |||
|
|
|||
| WARNING(availability_decl_unavailable_warn, none, | |||
| "%select{getter for |setter for |}0%1 is unavailable" | |||
There was a problem hiding this comment.
Please add both of these new diagnostics to localization/diagnostics/en.yaml
|
Build failed |
CodaFi
approved these changes
Aug 5, 2020
nathawes
commented
Aug 5, 2020
lib/Sema/TypeCheckAvailability.cpp
Outdated
| @@ -2508,7 +2523,8 @@ class AvailabilityWalker : public ASTWalker { | |||
| auto *decl = component.getDeclRef().getDecl(); | |||
| auto loc = component.getLoc(); | |||
| SourceRange range(loc, loc); | |||
| diagAvailability(decl, range, nullptr); | |||
| diagAvailability(decl, range, nullptr, | |||
| DeclAvailabilityFlag::ForObjCKeyPath); | |||
There was a problem hiding this comment.
Oops, this needs to check it's actually an ObjC rather than Swift keypath first. Fixing...
|
Build failed |
… keypaths to prevent source breakage. The change to resolve ObjC #keyPath expression components caused some source breakage as they are now being checked for availability issues. This change updates availability checking to demote error diagnostics to warnings within #keyPath expressions. There were cases in the source compat suite where unavailble properites were used in #keyPath expressions, but they caused no issues at runtime because the properties' ObjC runtime name was still correct (e.g. the same as its renamed-to property in Swift).
nathawes
force-pushed
the
index-key-paths
branch
from
94e02b1 to
38e2bd9
Compare
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
|
Build failed |
|
Build failed |
|
Windows: |
rintaro
approved these changes
Aug 6, 2020
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.
This is a re-do of #33245 to account for source breakage.
Unlike
\keypathexpressions, the components of#keyPath()expressions weren't being resolved, so the index wouldn't pick up references for their qualifying types/properties. Semantic highlighting, cursor info, etc wouldn't work on them either. My fix for this part is largely based on @rockbruno's closed PR here: #20020 (thanks @rockbruno!)The change to resolve ObjC
#keyPathexpression components caused some source breakage as they are now being checked for availability issues. To avoid that this change also updates availability checking to demote error diagnostics to warnings within#keyPathexpressions. There were cases in the source compat suite where unavailable properties were used in#keyPathexpressions, but worked correctly at runtime because the properties' ObjC runtime name was still correct (in this case the same as its renamed-to property in Swift).Also fixes a code completion bug where it was reporting members from the Swift rather than ObjC side of bridged types (
#keyPath(MyClass.someString.count)is invalid, butkeyPath(MyClass.someString.length)is valid).Resolves rdar://problem/61573935