Exclude input box should take precedence over the settings excludes o…

…n folderQuery (not taking into new precedence rules, to be implemented later)
microsoft · Jul 17, 2017 · cffadfe · cffadfe
1 parent f7d1155
commit cffadfe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -90,7 +90,7 @@ export class FileWalker {
 		this.folderExcludePatterns = new Map<string, glob.ParsedExpression>();
 
 		config.folderQueries.forEach(folderQuery => {
-			const folderExcludeExpression: glob.IExpression = objects.assign({}, this.config.excludePattern || {}, folderQuery.excludePattern || {});
+			const folderExcludeExpression: glob.IExpression = objects.assign({}, folderQuery.excludePattern || {}, this.config.excludePattern || {});
 
 			// Add excludes for other root folders
 			config.folderQueries