microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-12-10 13:40:56 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

add filenames to error messages in verify file content functions in fourslash (#60143)

Browse Source
This commit is contained in:
Isabel Duan 2024-10-07 12:25:31 -07:00 committed by GitHub
parent 44331b9fa3
commit a719df49d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/harness/fourslashImpl.ts
View File

@ -3069,7 +3069,7 @@ export class TestState {
private verifyFileContent(fileName: string, text: string) {
const actual = this.getFileContent(fileName);
if (actual !== text) {
throw new Error(`verifyFileContent failed:\n${showTextDiff(text, actual)}`);
throw new Error(`verifyFileContent in file '${fileName}' failed:\n${showTextDiff(text, actual)}`);
}
}
@ -3404,10 +3404,11 @@ export class TestState {
return ts.first(ranges);
}
private verifyTextMatches(actualText: string, includeWhitespace: boolean, expectedText: string) {
private verifyTextMatches(actualText: string, includeWhitespace: boolean, expectedText: string, fileName?: string) {
const removeWhitespace = (s: string): string => includeWhitespace ? s : this.removeWhitespace(s);
if (removeWhitespace(actualText) !== removeWhitespace(expectedText)) {
this.raiseError(`Actual range text doesn't match expected text.\n${showTextDiff(expectedText, actualText)}`);
const addFileName = fileName ? ` in file '${fileName}'` : "";
this.raiseError(`Actual range text${addFileName} doesn't match expected text.\n${showTextDiff(expectedText, actualText)}`);
}
}
@ -3485,7 +3486,7 @@ export class TestState {
const newText = ts.textChanges.applyChanges(this.getFileContent(this.activeFile.fileName), change.textChanges);
const newRange = updateTextRangeForTextChanges(this.getOnlyRange(this.activeFile.fileName), change.textChanges);
const actualText = newText.slice(newRange.pos, newRange.end);
this.verifyTextMatches(actualText, /*includeWhitespace*/ true, newRangeContent);
this.verifyTextMatches(actualText, /*includeWhitespace*/ true, newRangeContent, change.fileName);
}
else {
if (newFileContent === undefined) throw ts.Debug.fail();
@ -3497,7 +3498,7 @@ export class TestState {
}
const oldText = this.tryGetFileContent(change.fileName);
const newContent = change.isNewFile ? ts.first(change.textChanges).newText : ts.textChanges.applyChanges(oldText!, change.textChanges);
this.verifyTextMatches(newContent, /*includeWhitespace*/ true, expectedNewContent);
this.verifyTextMatches(newContent, /*includeWhitespace*/ true, expectedNewContent, change.fileName);
}
for (const newFileName in newFileContent) {
ts.Debug.assert(changes.some(c => c.fileName === newFileName), "No change in file", () => newFileName);