fix falling tests and linter issues

(cherry picked from commit 7404b901b9)
This commit is contained in:
Vladimir Matveev
2016-02-11 09:48:47 -08:00
committed by Bill Ticehurst
parent dd5dc3a967
commit 7d2ce0f5c1
2 changed files with 15 additions and 9 deletions

View File

@@ -554,14 +554,14 @@ namespace ts {
const filesSeen: Map<boolean> = {};
let exclude: string[] = [];
if(json["exclude"] instanceof Array){
if (json["exclude"] instanceof Array) {
exclude = json["exclude"];
}
else {
// by default exclude node_modules, and any specificied output directory
exclude = ["node_modules"]
let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
if(outDir) {
exclude = ["node_modules"];
const outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
if (outDir) {
exclude.push(outDir);
}
}