Skip to content

Adopt filePath in SourceLocation for swift-testing tests #2154

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
plemarquand merged 1 commit into from
Mar 13, 2026
Merged

Adopt filePath in SourceLocation for swift-testing tests #2154

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
21 changes: 16 additions & 5 deletions src/TestExplorer/TestParsers/SwiftTestingOutputParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,20 @@ export interface EventMessage {
text: string;
}

export interface SourceLocation {
_filePath: string;
export type SourceLocation = {
line: number;
column: number;
}
} & (
| {
// Legacy _filePath is present in 6.2.x and below.
_filePath: string;
filePath?: never;
}
| {
filePath: string;
_filePath?: never;
}
);

export class SwiftTestingOutputParser {
private completionMap = new Map<number, boolean>();
Expand Down Expand Up @@ -328,7 +337,8 @@ export class SwiftTestingOutputParser {
item.payload.id,
testCase,
sourceLocationToVSCodeLocation(
item.payload.sourceLocation._filePath,
item.payload.sourceLocation._filePath ??
item.payload.sourceLocation.filePath,
item.payload.sourceLocation.line,
item.payload.sourceLocation.column
),
Expand Down Expand Up @@ -360,8 +370,9 @@ export class SwiftTestingOutputParser {
const testID = this.idFromOptionalTestCase(payload.testID, payload._testCase);
const testIndex = this.getTestCaseIndex(runState, testID);
const { isKnown, sourceLocation } = payload.issue;
const filePath = sourceLocation._filePath ?? sourceLocation.filePath;
const location = sourceLocationToVSCodeLocation(
sourceLocation._filePath,
filePath,
sourceLocation.line,
sourceLocation.column
);
Expand Down
Loading