Skip to content

Commit dc8a5f8

Browse files
author
Yui T
committed
Address code review
1 parent 71a54fb commit dc8a5f8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/compiler/emitter.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3150,7 +3150,7 @@ module ts {
31503150
}
31513151
}
31523152

3153-
function resolveScriptReference(sourceFile: SourceFile, reference: FileReference) {
3153+
function tryResolveScriptReference(sourceFile: SourceFile, reference: FileReference) {
31543154
var referenceFileName = normalizePath(combinePaths(getDirectoryPath(sourceFile.filename), reference.filename));
31553155
return program.getSourceFile(referenceFileName);
31563156
}
@@ -3180,7 +3180,7 @@ module ts {
31803180
if (!compilerOptions.noResolve) {
31813181
var addedGlobalFileReference = false;
31823182
forEach(root.referencedFiles, fileReference => {
3183-
var referencedFile = resolveScriptReference(root, fileReference);
3183+
var referencedFile = tryResolveScriptReference(root, fileReference);
31843184

31853185
// All the references that are not going to be part of same file
31863186
if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference
@@ -3205,11 +3205,11 @@ module ts {
32053205
// Check what references need to be added
32063206
if (!compilerOptions.noResolve) {
32073207
forEach(sourceFile.referencedFiles, fileReference => {
3208-
var referencedFile = resolveScriptReference(sourceFile, fileReference);
3208+
var referencedFile = tryResolveScriptReference(sourceFile, fileReference);
32093209

32103210
// If the reference file is a declaration file or an external module, emit that reference
3211-
if (isExternalModuleOrDeclarationFile(referencedFile) &&
3212-
!contains(emittedReferencedFiles, referencedFile)) { // If the file reference was not already emitted
3211+
if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) &&
3212+
!contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted
32133213

32143214
writeReferencePath(referencedFile);
32153215
emittedReferencedFiles.push(referencedFile);

0 commit comments

Comments
 (0)