Don't prepend target id to test ids if it exists #941
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
sourcekit-lsp will start prepending a test target's name to the test id. This helps disambiguate when there are two identically named suites in two different test targets. To maintain the current behaviour with older sourcekit-lsp versions only prefix the test target if it isn't already there.
plemarquand
requested review from
0xTim,
adam-fowler and
award999
as code owners
award999
approved these changes
Jun 27, 2024
adam-fowler
reviewed
Jun 30, 2024
| const id = | ||
| target !== undefined && !item.id.startsWith(`${target.c99name}.`) | ||
| ? `${target.c99name}.${item.id}` | ||
| : item.id; |
There was a problem hiding this comment.
Should the test not be is id of form target.class/method return id else find the target and prefix to id.
There was a problem hiding this comment.
This check applies to both XCTest and swift-testing tests. Swift-testing can have tests in the form target.method(), target.struct/method(), target.struct/anotherstruct/method(), etc... so it seems safer to check if the test has already been prefixed with the target instead of trying to match the test id form exactly.
adam-fowler
approved these changes
Jul 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
With swiftlang/sourcekit-lsp#1530,
sourcekit-lspwill start prepending a test target's name to the test id. This helps disambiguate when there are two identically named suites in two different test targets.To maintain the current behaviour with older sourcekit-lsp versions only prefix the test target if it isn't already there.