cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(language-service): Remove MockTypescriptHost.readFileContent() (#32782)

Browse Source 
readFileContent() has the exact same functionality as readFile(), but it
is not actually part of ts.LanguageServiceHost interface.
It's not actually needed, so replace it with readFile() instead.

PR Close #32782
This commit is contained in:
Keen Yee Liau
2019-09-19 15:32:40 -07:00
committed by atscott
parent 45c893d0e1
commit 53b32f17b3
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/language-service/test/test_utils.ts
View File

@ -149,7 +149,7 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
}
getScriptSnapshot(fileName: string): ts.IScriptSnapshot|undefined {
const content = this.getFileContent(fileName);
const content = this.readFile(fileName);
if (content) return ts.ScriptSnapshot.fromString(content);
return undefined;
}
@ -172,7 +172,12 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
fileExists(fileName: string): boolean { return this.getRawFileContent(fileName) != null; }
readFile(path: string): string|undefined { return this.getRawFileContent(path); }
readFile(fileName: string): string|undefined {
const content = this.getRawFileContent(fileName);
if (content) {
return removeReferenceMarkers(removeLocationMarkers(content));
}
}
getMarkerLocations(fileName: string): {[name: string]: number}|undefined {
let content = this.getRawFileContent(fileName);
@ -188,11 +193,6 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
}
}
getFileContent(fileName: string): string|undefined {
const content = this.getRawFileContent(fileName);
if (content) return removeReferenceMarkers(removeLocationMarkers(content));
}
/**
* Reset the project to its original state, effectively removing all overrides.
*/
@ -269,7 +269,7 @@ export class MockTypescriptHost implements ts.LanguageServiceHost {
*/
addCode(code: string) {
const fileName = '/app/app.component.ts';
const originalContent = this.getFileContent(fileName);
const originalContent = this.readFile(fileName);
const newContent = originalContent + code;
this.override(fileName, newContent);
return fileName;