fix falling tests and linter issues

(cherry picked from commit 7404b901b9)
This commit is contained in:
Vladimir Matveev authored and Bill Ticehurst committed 2016-02-11 14:23:01 -08:00
1 parent dd5dc3a967
commit 7d2ce0f5c1
2 files changed
+15 -9

No files matched your search

+4 -4
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);
}
}