From d00ad19bd7a5f0b6934c53d40c3021bb7b1a4803 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 20 Aug 2018 20:43:36 -0400 Subject: [PATCH 1/2] Provide a default script target for the document registry. --- src/services/documentRegistry.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/documentRegistry.ts b/src/services/documentRegistry.ts index ee99aed930c..574125f6ac0 100644 --- a/src/services/documentRegistry.ts +++ b/src/services/documentRegistry.ts @@ -184,7 +184,7 @@ namespace ts { const bucket = getBucketForCompilationSettings(key, /*createIfMissing*/ true); let entry = bucket.get(path); - const scriptTarget = scriptKind === ScriptKind.JSON ? ScriptTarget.JSON : compilationSettings.target; + const scriptTarget = scriptKind === ScriptKind.JSON ? ScriptTarget.JSON : compilationSettings.target || ScriptTarget.ES5; if (!entry && externalCache) { const sourceFile = externalCache.getDocument(key, path); if (sourceFile) { @@ -199,7 +199,7 @@ namespace ts { if (!entry) { // Have never seen this file with these settings. Create a new source file for it. - const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget!, version, /*setNodeParents*/ false, scriptKind); // TODO: GH#18217 + const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, /*setNodeParents*/ false, scriptKind); // TODO: GH#18217 if (externalCache) { externalCache.setDocument(key, path, sourceFile); } From 0baf7465a56ecf1b378fde67e2356c95f6c8e8fe Mon Sep 17 00:00:00 2001 From: David Sherret Date: Tue, 21 Aug 2018 13:22:22 -0400 Subject: [PATCH 2/2] Remove todo. --- src/services/documentRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/documentRegistry.ts b/src/services/documentRegistry.ts index 574125f6ac0..7a21cebb4f3 100644 --- a/src/services/documentRegistry.ts +++ b/src/services/documentRegistry.ts @@ -199,7 +199,7 @@ namespace ts { if (!entry) { // Have never seen this file with these settings. Create a new source file for it. - const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, /*setNodeParents*/ false, scriptKind); // TODO: GH#18217 + const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, /*setNodeParents*/ false, scriptKind); if (externalCache) { externalCache.setDocument(key, path, sourceFile); }