fix falling tests and linter issues

vladima · billti · commit 7d2ce0f5c192 · 2016-02-11T14:23:01.000-08:00
(cherry picked from commit 7404b90)
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -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);
                     }
                 }
diff --git a/tests/cases/unittests/cachingInServerLSHost.ts b/tests/cases/unittests/cachingInServerLSHost.ts
@@ -7,10 +7,16 @@ module ts {
     }
 
     function createDefaultServerHost(fileMap: Map<File>): server.ServerHost  {
-        const directories: Map<string> = {};
-        for (const f in fileMap) {
-            directories[getDirectoryPath(f)] = f;
-        }
+        let existingDirectories: Map<boolean> = {};
+        forEachValue(fileMap, v => {
+            let dir = getDirectoryPath(v.name);
+            let previous: string;
+            do {
+                existingDirectories[dir] = true;
+                previous = dir;
+                dir = getDirectoryPath(dir);
+            } while (dir !== previous);
+        });
         return {
             args: <string[]>[],
             newLine: "\r\n",
@@ -30,7 +36,7 @@ module ts {
                 return hasProperty(fileMap, path);
             },
             directoryExists: (path: string): boolean => {
-                return hasProperty(directories, path);
+                return hasProperty(existingDirectories, path);
             },
             createDirectory: (path: string) => {
             },

Original file line number	Diff line number	Diff line change
`@@ -554,14 +554,14 @@ namespace ts {`
`554`	`554`	`const filesSeen: Map<boolean> = {};`
`555`	`555`
`556`	`556`	`let exclude: string[] = [];`
`557`		`- if(json["exclude"] instanceof Array){`
	`557`	`+ if (json["exclude"] instanceof Array) {`
`558`	`558`	`exclude = json["exclude"];`
`559`	`559`	`}`
`560`	`560`	`else {`
`561`	`561`	`// by default exclude node_modules, and any specificied output directory`
`562`		`- exclude = ["node_modules"]`
`563`		`- let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];`
`564`		`- if(outDir) {`
	`562`	`+ exclude = ["node_modules"];`
	`563`	`+ const outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];`
	`564`	`+ if (outDir) {`
`565`	`565`	`exclude.push(outDir);`
`566`	`566`	`}`
`567`	`567`	`}`