Fix #29660 - 'src' in the search 'include' field should be treated as…

… '**/src/**' now
microsoft · Jul 31, 2017 · adfbd11 · adfbd11
1 parent 8eb1c45
commit adfbd11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/vs/workbench/parts/search/common/queryBuilder.ts b/src/vs/workbench/parts/search/common/queryBuilder.ts
@@ -124,7 +124,7 @@ export class QueryBuilder {
  p = '*' + p; // convert ".js" to "*.js"
  }
 
- return strings.format('{{0}/**,**/{0}}', p); // convert foo to {foo/**,**/foo} to cover files and folders
+ return strings.format('{**/{0}/**,**/{0}}', p); // convert foo to {foo/**,**/foo} to cover files and folders
  });
 
  const result: ISearchPathsResult = {};

diff --git a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
@@ -613,7 +613,7 @@ function cleanUndefinedQueryValues(q: any): void {
 }
 
 function globalGlob(str: string): string {
- return `{${str}/**,**/${str}}`;
+ return `{**/${str}/**,**/${str}}`;
 }
 
 function patternsToIExpression(...patterns: string[]): IExpression {