提交 de3b3ac5 编写于 作者: J Jackson Kearl

Don't exclude all unless there are no includes at all

上级 79193030
......@@ -205,6 +205,7 @@ export class QueryBuilder {
const folderQueries: IFolderQuery[] = [];
const foldersToSearch: ResourceMap<IFolderQuery> = new ResourceMap();
const includePattern: glob.IExpression = {};
let hasIncludedFile = false;
files.forEach(file => {
if (file.scheme === Schemas.walkThrough) { return; }
......@@ -216,6 +217,7 @@ export class QueryBuilder {
let folderQuery = foldersToSearch.get(searchRoot);
if (!folderQuery) {
hasIncludedFile = true;
folderQuery = { folder: searchRoot, includePattern: {} };
folderQueries.push(folderQuery);
foldersToSearch.set(searchRoot, folderQuery);
......@@ -225,6 +227,7 @@ export class QueryBuilder {
assertIsDefined(folderQuery.includePattern)[relPath.replace(/\\/g, '/')] = true;
} else {
if (file.fsPath) {
hasIncludedFile = true;
includePattern[file.fsPath] = true;
}
}
......@@ -234,7 +237,7 @@ export class QueryBuilder {
folderQueries,
includePattern,
usingSearchPaths: true,
excludePattern: folderQueries.length ? undefined : { '**/*': true }
excludePattern: hasIncludedFile ? undefined : { '**/*': true }
};
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册