Skip to content

Commit cc3cae3

Browse files
committed
respond to code review remarks and reverted tryResolveScriptReference to resolveScriptReference
1 parent 05ebe9c commit cc3cae3

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
@@ -3079,7 +3079,7 @@ module ts {
30793079
}
30803080
}
30813081

3082-
function tryResolveScriptReference(sourceFile: SourceFile, reference: FileReference) {
3082+
function resolveScriptReference(sourceFile: SourceFile, reference: FileReference) {
30833083
var referenceFileName = normalizePath(combinePaths(getDirectoryPath(sourceFile.filename), reference.filename));
30843084
return program.getSourceFile(referenceFileName);
30853085
}
@@ -3109,10 +3109,10 @@ module ts {
31093109
if (!compilerOptions.noResolve) {
31103110
var addedGlobalFileReference = false;
31113111
forEach(root.referencedFiles, fileReference => {
3112-
var referencedFile = tryResolveScriptReference(root, fileReference);
3112+
var referencedFile = resolveScriptReference(root, fileReference);
31133113

31143114
// All the references that are not going to be part of same file
3115-
if (referencedFile && (referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference
3115+
if ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference
31163116
shouldEmitToOwnFile(referencedFile) || // This is referenced file is emitting its own js file
31173117
!addedGlobalFileReference) { // Or the global out file corresponding to this reference was not added
31183118

@@ -3134,10 +3134,10 @@ module ts {
31343134
// Check what references need to be added
31353135
if (!compilerOptions.noResolve) {
31363136
forEach(sourceFile.referencedFiles, fileReference => {
3137-
var referencedFile = tryResolveScriptReference(sourceFile, fileReference);
3137+
var referencedFile = resolveScriptReference(sourceFile, fileReference);
31383138

31393139
// If the reference file is declaration file or external module emit that reference
3140-
if (referencedFile && isExternalModuleOrDeclarationFile(referencedFile) &&
3140+
if (isExternalModuleOrDeclarationFile(referencedFile) &&
31413141
!contains(emittedReferencedFiles, referencedFile)) { // If the file refernece was not already emitted
31423142

31433143
writeReferencePath(referencedFile);

0 commit comments

Comments
 (0)