Do not trimForExclusions (fixes #29520) (#29632)

microsoft · Jun 27, 2017 · 2cdeb68 · 2cdeb68
1 parent 74abb32
commit 2cdeb68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
@@ -224,6 +224,9 @@ export type ParsedPattern = (path: string, basename?: string) => boolean;
 export type ParsedExpression = (path: string, basename?: string, siblingsFn?: () => string[] | TPromise<string[]>) => string | TPromise<string> /* the matching pattern */;
 
 export interface IGlobOptions {
+	/**
+	 * Simplify patterns for use as exclusion filters during tree traversal to skip entire subtrees. Cannot be used outside of a tree traversal.
+	 */
 	trimForExclusions?: boolean;
 }
 

diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts
@@ -124,7 +124,7 @@ export abstract class BaseHistoryService {
 				if (!this.mapRootToExpression.has(root.toString()) || !objects.equals(this.mapRootToExpression.get(root.toString()), rootExcludes)) {
 					changed = true;
 
-					this.mapRootToExcludes.set(root.toString(), parse(rootExcludes, { trimForExclusions: true }));
+					this.mapRootToExcludes.set(root.toString(), parse(rootExcludes));
 					this.mapRootToExpression.set(root.toString(), objects.clone(rootExcludes));
 				}
 			});
@@ -135,7 +135,7 @@ export abstract class BaseHistoryService {
 		if (!this.mapRootToExpression.has(null) || !objects.equals(this.mapRootToExpression.get(null), globalExcludes)) {
 			changed = true;
 
-			this.mapRootToExcludes.set(null, parse(globalExcludes, { trimForExclusions: true }));
+			this.mapRootToExcludes.set(null, parse(globalExcludes));
 			this.mapRootToExpression.set(null, objects.clone(globalExcludes));
 		}