Skip to content

Merge main into release/6.0 #1177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 17, 2024

Conversation

ahoppen added 12 commits March 29, 2024 09:50
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
@ahoppen ahoppen requested a review from benlangmuir as a code owner April 16, 2024 16:37
@ahoppen ahoppen requested a review from bnbarham April 16, 2024 16:37
@ahoppen
Copy link
Member Author

ahoppen commented Apr 16, 2024

@swift-ci Please test

@ahoppen ahoppen merged commit 32f3b9d into swiftlang:release/6.0 Apr 17, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants