Fix microsoft#24050 - lost this error msg when I switched from an error blacklist to a whitelist

roblourens · roblourens · commit f22230f40763 · 2017-04-28T10:54:53.000-07:00
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
@@ -152,7 +152,15 @@ export class RipgrepEngine {
 			return this.config.searchPaths && this.config.searchPaths.indexOf(errorPath) >= 0 ? firstLine : undefined;
 		}
 
-		return strings.startsWith(firstLine, 'Error parsing regex') ? firstLine : undefined;
+		if (strings.startsWith(firstLine, 'Error parsing regex')) {
+			return firstLine;
+		}
+
+		if (strings.startsWith(firstLine, 'error parsing glob')) {
+			return firstLine;
+		}
+
+		return undefined;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,15 @@ export class RipgrepEngine {`
`152`	`152`	`return this.config.searchPaths && this.config.searchPaths.indexOf(errorPath) >= 0 ? firstLine : undefined;`
`153`	`153`	`}`
`154`	`154`
`155`		`- return strings.startsWith(firstLine, 'Error parsing regex') ? firstLine : undefined;`
	`155`	`+ if (strings.startsWith(firstLine, 'Error parsing regex')) {`
	`156`	`+ return firstLine;`
	`157`	`+ }`
	`158`	`+`
	`159`	`+ if (strings.startsWith(firstLine, 'error parsing glob')) {`
	`160`	`+ return firstLine;`
	`161`	`+ }`
	`162`	`+`
	`163`	`+ return undefined;`
`156`	`164`	`}`
`157`	`165`	`}`
`158`	`166`