[Index] Avoid forming relations to non-indexed decls #72930
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
hamishknight
force-pushed
the
containment
branch
from
863ed6e to
1d96cdc
Compare
bnbarham
approved these changes
Apr 9, 2024
lib/Index/Index.cpp
Outdated
|
|
||
| if (!Entry.ActiveKey) | ||
| return; | ||
| SmallVector<const Decl *, 4> Containers; |
There was a problem hiding this comment.
Could have a bool for whether we actually allowed any decls or not and then just use f(D) in the two if's, but if you prefer this I'd move the Containers out of the loop.
There was a problem hiding this comment.
Sure, don't feel too strongly, switched to using a bool
Check to see whether we can index the given decl before reporting it as a container, walking up to a parent if we need to. This also lets us simplify the AnyPattern handling a bit. rdar://126137541
If we shouldn't index the related decl, don't record it as a relation.
hamishknight
force-pushed
the
containment
branch
from
1d96cdc to
b65d8c2
Compare
|
@swift-ci please test |
This was referenced Apr 10, 2024
ahoppen
added a commit
to ahoppen/sourcekit-lsp
that referenced
this pull request
Apr 19, 2024
With swiftlang/swift#72930 we can use the `containedBy` instead of `calledBy` relation for the call hierarchy, which allows us to show unapplied function references in the call hierarchy as well. rdar://123769825
ahoppen
added a commit
to ahoppen/sourcekit-lsp
that referenced
this pull request
Apr 19, 2024
With swiftlang/swift#72930 we can use the `containedBy` instead of `calledBy` relation for the call hierarchy, which allows us to show unapplied function references in the call hierarchy as well. rdar://123769825
ahoppen
added a commit
to ahoppen/sourcekit-lsp
that referenced
this pull request
Apr 20, 2024
With swiftlang/swift#72930 we can use the `containedBy` instead of `calledBy` relation for the call hierarchy, which allows us to show unapplied function references in the call hierarchy as well. rdar://123769825
plemarquand
pushed a commit
to plemarquand/sourcekit-lsp
that referenced
this pull request
Apr 24, 2024
With swiftlang/swift#72930 we can use the `containedBy` instead of `calledBy` relation for the call hierarchy, which allows us to show unapplied function references in the call hierarchy as well. rdar://123769825
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.
Make sure to check whether we are able to index a decl before reporting it as a relation. Additionally for containers, walk up the stack to find the first container that we can index, avoiding treating local variables as containers when we're not indexing them.
rdar://126137541