Skip to content

Don't prepend target id to test ids if it exists #941

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.

Sign up for GitHub

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 1 commit into from
Jul 1, 2024
Merged

Don't prepend target id to test ids if it exists #941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/TestExplorer/LSPTestDiscovery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,12 @@ export class LSPTestDiscovery {
.getTargets(TargetType.test)
.find(target => swiftPackage.getTarget(location.uri.fsPath) === target);

const id = target !== undefined ? `${target.c99name}.${item.id}` : item.id;
// If we're using an older sourcekit-lsp it doesn't prepend the target name
// to the test item id.
const id =
target !== undefined && !item.id.startsWith(`${target.c99name}.`)
? `${target.c99name}.${item.id}`
: item.id;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the test not be is id of form target.class/method return id else find the target and prefix to id.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

return item.style === "XCTest" ? id.replace(/\(\)$/, "") : id;
}
}