From cffadfee38232dd371ed997dbd450f082ae2cae8 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 14 Jul 2017 17:02:02 -0700
Subject: [PATCH] Exclude input box should take precedence over the settings
 excludes on folderQuery (not taking into new precedence rules, to be
 implemented later)

---
 src/vs/workbench/services/search/node/fileSearch.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index 1ecdb0f0c94..f77c6390bec 100644
--- 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