Anchor patterns (fixes #36438)

microsoft · Oct 26, 2017 · 77ba628 · 77ba628
1 parent 9c62fff
commit 77ba628
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -8,7 +8,7 @@ import { rgPath } from 'vscode-ripgrep';
 
 import { isMacintosh as isMac } from 'vs/base/common/platform';
 import * as glob from 'vs/base/common/glob';
-import { normalizeNFD } from 'vs/base/common/strings';
+import { normalizeNFD, startsWith } from 'vs/base/common/strings';
 
 import { IFolderSearch, IRawSearch } from './search';
 import { foldersToIncludeGlobs, foldersToRgExcludeGlobs } from './ripgrepTextSearch';
@@ -26,14 +26,14 @@ function getRgArgs(config: IRawSearch, folderQuery: IFolderSearch, includePatter
 
 	// includePattern can't have siblingClauses
 	foldersToIncludeGlobs([folderQuery], includePattern, false).forEach(globArg => {
-		args.push('-g', isMac ? normalizeNFD(globArg) : globArg);
+		args.push('-g', anchor(isMac ? normalizeNFD(globArg) : globArg));
 	});
 
 	let siblingClauses: glob.IExpression;
 
 	const rgGlobs = foldersToRgExcludeGlobs([folderQuery], excludePattern, undefined, false);
 	rgGlobs.globArgs
-		.forEach(rgGlob => args.push('-g', `!${isMac ? normalizeNFD(rgGlob) : rgGlob}`));
+		.forEach(rgGlob => args.push('-g', `!${anchor(isMac ? normalizeNFD(rgGlob) : rgGlob)}`));
 	siblingClauses = rgGlobs.siblingClauses;
 
 	if (config.disregardIgnoreFiles) {
@@ -57,3 +57,7 @@ function getRgArgs(config: IRawSearch, folderQuery: IFolderSearch, includePatter
 
 	return { globArgs: args, siblingClauses };
 }
+
+function anchor(glob: string) {
+	return startsWith(glob, '**') || startsWith(glob, '/') ? glob : `/${glob}`;
+}
diff --git a/src/vs/workbench/services/search/test/node/fixtures2/36438/modules/do-not-find.txt b/src/vs/workbench/services/search/test/node/fixtures2/36438/modules/do-not-find.txt
diff --git a/src/vs/workbench/services/search/test/node/fixtures2/36438/more/modules/find.txt b/src/vs/workbench/services/search/test/node/fixtures2/36438/more/modules/find.txt
diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts
@@ -22,6 +22,10 @@ const ROOT_FOLDER_QUERY: IFolderSearch[] = [
 	TEST_ROOT_FOLDER
 ];
 
+const ROOT_FOLDER_QUERY_36438: IFolderSearch[] = [
+	{ folder: path.normalize(require.toUrl('./fixtures2/36438')) }
+];
+
 const MULTIROOT_QUERIES: IFolderSearch[] = [
 	{ folder: EXAMPLES_FIXTURES },
 	{ folder: MORE_FIXTURES }
@@ -381,6 +385,44 @@ suite('FileSearchEngine', () => {
 		});
 	});
 
+	test('Files: exclude folder without wildcard #36438', function (done: () => void) {
+		this.timeout(testTimeout);
+		let engine = new FileSearchEngine({
+			folderQueries: ROOT_FOLDER_QUERY_36438,
+			excludePattern: { 'modules': true }
+		});
+
+		let count = 0;
+		engine.search((result) => {
+			if (result) {
+				count++;
+			}
+		}, () => { }, (error) => {
+			assert.ok(!error);
+			assert.equal(count, 1);
+			done();
+		});
+	});
+
+	test('Files: include folder without wildcard #36438', function (done: () => void) {
+		this.timeout(testTimeout);
+		let engine = new FileSearchEngine({
+			folderQueries: ROOT_FOLDER_QUERY_36438,
+			includePattern: { 'modules/**': true }
+		});
+
+		let count = 0;
+		engine.search((result) => {
+			if (result) {
+				count++;
+			}
+		}, () => { }, (error) => {
+			assert.ok(!error);
+			assert.equal(count, 1);
+			done();
+		});
+	});
+
 	test('Files: *.* exclude folder with leading wildcard', function (done: () => void) {
 		this.timeout(testTimeout);
 		let engine = new FileSearchEngine({