From 71a54fbbb67ace3e68290fe5369a1e0763da487d Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 25 Sep 2014 11:47:41 -0700 Subject: [PATCH] Remove default setting of noResolve flag --- src/compiler/emitter.ts | 4 ++-- src/services/shims.ts | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4052350cf8c..538728fa230 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3183,9 +3183,9 @@ module ts { var referencedFile = resolveScriptReference(root, fileReference); // All the references that are not going to be part of same file - if ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference + if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file - !addedGlobalFileReference) { // Or the global out file corresponding to this reference was not added + !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added writeReferencePath(referencedFile); if (!isExternalModuleOrDeclarationFile(referencedFile)) { diff --git a/src/services/shims.ts b/src/services/shims.ts index 0418a6da6cc..be2e3c49f50 100644 --- a/src/services/shims.ts +++ b/src/services/shims.ts @@ -328,12 +328,6 @@ module ts { } var options = compilationSettingsToCompilerOptions(JSON.parse(settingsJson)); - /// TODO: this should be pushed into VS. - /// We can not ask the LS instance to resolve, as this will lead to asking the host about files it does not know about, - /// something it is not designed to handle. for now make sure we never get a "noresolve == false". - /// This value should not matter, as the host runs resolution logic independently - options.noResolve = true; - return options; }