From 1a7de13cdd5c9ed70d0644e67e75981e3824858d Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Mon, 5 Jan 2015 18:25:28 -0800 Subject: [PATCH] Use getSourceFile instead of getSourceFiles in compileDeclarationFiles Conflicts: src/harness/harness.ts --- src/harness/harness.ts | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index c56b29ed3b8..fc0aaee402c 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -873,28 +873,26 @@ module Harness { } function findResultCodeFile(fileName: string) { - var dTsFileName = ts.forEach(result.program.getSourceFiles(), sourceFile => { - if (sourceFile.filename === fileName) { - // Is this file going to be emitted separately - var sourceFileName: string; - if (ts.isExternalModule(sourceFile) || !options.out) { - if (options.outDir) { - var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.filename, result.currentDirectoryForProgram); - sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), ""); - sourceFileName = ts.combinePaths(options.outDir, sourceFilePath); - } - else { - sourceFileName = sourceFile.filename; - } - } - else { - // Goes to single --out file - sourceFileName = options.out; - } - - return ts.removeFileExtension(sourceFileName) + ".d.ts"; + var sourceFile = result.program.getSourceFile(fileName); + assert(sourceFile, "Program has no source file with name '" + fileName + "'"); + // Is this file going to be emitted separately + var sourceFileName: string; + if (ts.isExternalModule(sourceFile) || !options.out) { + if (options.outDir) { + var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.filename, result.currentDirectoryForProgram); + sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), ""); + sourceFileName = ts.combinePaths(options.outDir, sourceFilePath); } - }); + else { + sourceFileName = sourceFile.filename; + } + } + else { + // Goes to single --out file + sourceFileName = options.out; + } + + var dTsFileName = ts.removeFileExtension(sourceFileName) + ".d.ts"; return ts.forEach(result.declFilesCode, declFile => declFile.fileName === dTsFileName ? declFile : undefined); }