Merge main into release/6.0#1177
Merged
ahoppen merged 12 commits intoApr 17, 2024
Merged
Conversation
This allows us to express that `body` will run on the same actor isolation domain as the caller of `orLog`, which effectively makes `orLog` usable from actors again.
The container name, showing the class a method is defined on, is more useful than the module name.
This ways the client doesn’t need to create a hierarchical structure using the container names. It is also more flexible and allows nesting of test suites + the addition of labels and tags for swift-testing. The data structure for `TestItem` has been heavily inspired by VS Code’s `TestItem` for the test explorer, which should make it fairly straightforward to integrate these results into the VS Code test explorer.
Same as for workspace tests, instead of returning a flat list of symbols, return a hierarchical structure.
…-hierarchy-detail Show container name as the detail of a call hierarchy item
Return tests discovered by `workspace/tests` and `textDocument/tests` in a hierarchical format
…solated Inherit actor isolation of closure passed to `orLog`
Instead of returning `nil` to indicate that the position conversion failed, log a fault and perform a best-effort recovery. I think this allows us to perform better recovery and also makes code calling these position conversions a lot simpler because it doesn’t need to make decisions about what to do if position conversions fail.
…lls to the same function
Eg. if we have the following, and we get the call hierarchy of `foo`, we only want to show `bar` once, with multiple `fromRanges` instead of having two entries for `bar` in the call hierarchy.
```swift
func foo() {}
func bar() {
foo()
foo()
}
```
…nversions Never return `nil` for position conversions
…n-call-hierarchy Don’t repeat a function in `incomingCalls` if it contains multiple calls to the same function
Member
Author
|
@swift-ci Please test |
bnbarham
approved these changes
Apr 16, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Merge the following PRs into
release/6.0:workspace/testsandtextDocument/testsin a hierarchical format #1149orLog#1153nilfor position conversions #1168incomingCallsif it contains multiple calls to the same function #1166