Fixes #50828, code-insiders --status triggered exception in main process

microsoft · May 31, 2018 · a0fce79 · a0fce79
1 parent c8ff448
commit a0fce79
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/src/vs/base/node/stats.ts b/src/vs/base/node/stats.ts
@@ -116,32 +116,32 @@ export function collectWorkspaceStats(folder: string, filter: string[]): Promise
 						if (--pending === 0) {
 							return done(results);
 						}
-					}
-
-					if (stats.isDirectory()) {
-						if (filter.indexOf(file) === -1) {
-							walk(join(dir, file), filter, token, (res: string[]) => {
-								results = results.concat(res);
+					} else {
+						if (stats.isDirectory()) {
+							if (filter.indexOf(file) === -1) {
+								walk(join(dir, file), filter, token, (res: string[]) => {
+									results = results.concat(res);
 
+									if (--pending === 0) {
+										return done(results);
+									}
+								});
+							} else {
 								if (--pending === 0) {
-									return done(results);
+									done(results);
 								}
-							});
+							}
 						} else {
-							if (--pending === 0) {
-								done(results);
+							if (token.count >= MAX_FILES) {
+								token.maxReached = true;
 							}
-						}
-					} else {
-						if (token.count >= MAX_FILES) {
-							token.maxReached = true;
-						}
 
-						token.count++;
-						results.push(file);
+							token.count++;
+							results.push(file);
 
-						if (--pending === 0) {
-							done(results);
+							if (--pending === 0) {
+								done(results);
+							}
 						}
 					}
 				});