Skip to content

Commit 4d6bd9d

Browse files
author
Andy Hanson
committed
Break many functions out of services.ts and into their own modules.
1 parent 4685646 commit 4d6bd9d

17 files changed

+7927
-7893
lines changed

src/harness/harnessLanguageService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ namespace Harness.LanguageService {
232232
}
233233
getHost() { return this.host; }
234234
getLanguageService(): ts.LanguageService { return ts.createLanguageService(this.host); }
235-
getClassifier(): ts.Classifier { return ts.createClassifier(); }
236-
getPreProcessedFileInfo(fileName: string, fileContents: string): ts.PreProcessedFileInfo { return ts.preProcessFile(fileContents, /* readImportFiles */ true, ts.hasJavaScriptFileExtension(fileName)); }
235+
getClassifier(): ts.Classifier { return ts.Classifier.createClassifier(); }
236+
getPreProcessedFileInfo(fileName: string, fileContents: string): ts.PreProcessedFileInfo { return ts.PreProcess.preProcessFile(fileContents, /* readImportFiles */ true, ts.hasJavaScriptFileExtension(fileName)); }
237237
}
238238

239239
/// Shim adapter
@@ -258,7 +258,7 @@ namespace Harness.LanguageService {
258258
};
259259
this.getModuleResolutionsForFile = (fileName) => {
260260
const scriptInfo = this.getScriptInfo(fileName);
261-
const preprocessInfo = ts.preProcessFile(scriptInfo.content, /*readImportFiles*/ true);
261+
const preprocessInfo = ts.PreProcess.preProcessFile(scriptInfo.content, /*readImportFiles*/ true);
262262
const imports = ts.createMap<string>();
263263
for (const module of preprocessInfo.importedFiles) {
264264
const resolutionInfo = ts.resolveModuleName(module.fileName, fileName, compilerOptions, moduleResolutionHost);
@@ -271,7 +271,7 @@ namespace Harness.LanguageService {
271271
this.getTypeReferenceDirectiveResolutionsForFile = (fileName) => {
272272
const scriptInfo = this.getScriptInfo(fileName);
273273
if (scriptInfo) {
274-
const preprocessInfo = ts.preProcessFile(scriptInfo.content, /*readImportFiles*/ false);
274+
const preprocessInfo = ts.PreProcess.preProcessFile(scriptInfo.content, /*readImportFiles*/ false);
275275
const resolutions = ts.createMap<ts.ResolvedTypeReferenceDirective>();
276276
const settings = this.nativeHost.getCompilationSettings();
277277
for (const typeReferenceDirective of preprocessInfo.typeReferenceDirectives) {

src/harness/unittests/services/preProcessFile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
describe("PreProcessFile:", function () {
44
function test(sourceText: string, readImportFile: boolean, detectJavaScriptImports: boolean, expectedPreProcess: ts.PreProcessedFileInfo): void {
5-
const resultPreProcess = ts.preProcessFile(sourceText, readImportFile, detectJavaScriptImports);
5+
const resultPreProcess = ts.PreProcess.preProcessFile(sourceText, readImportFile, detectJavaScriptImports);
66

77
assert.equal(resultPreProcess.isLibFile, expectedPreProcess.isLibFile, "Pre-processed file has different value for isLibFile. Expected: " + expectedPreProcess.isLibFile + ". Actual: " + resultPreProcess.isLibFile);
88

src/server/editorServices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ namespace ts.server {
15661566
this.setCompilerOptions(defaultOpts);
15671567
}
15681568
this.languageService = ts.createLanguageService(this.host, this.documentRegistry);
1569-
this.classifier = ts.createClassifier();
1569+
this.classifier = ts.Classifier.createClassifier();
15701570
}
15711571

15721572
setCompilerOptions(opt: ts.CompilerOptions) {

0 commit comments

Comments
 (0)