Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/ext/queries/file-query-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as path from 'path';
import * as mm from 'micromatch';
import { Config } from '../utilities/config';
import { Logger } from '../utilities/logger';
import { Git } from '../utilities/git';

type FilterFn = (path: string, isDirectory: boolean) => boolean;

Expand All @@ -25,6 +26,7 @@ type WithGlobOptions = {
export class FileQueryApi {
private _config = Config.instance;
private _logger = new Logger('files-api');
private _git = new Git();

private constructor(
public readonly workspaceFolder: WorkspaceFolder,
Expand Down Expand Up @@ -109,6 +111,19 @@ export class FileQueryApi {
};
}

private getGitIgnoreFilter(): FilterFn | undefined {
if (!this._config.useGitIgnore) {
return;
}

this._logger.info(`\tgetting git ignore filter`);

return (file): boolean => {
const ignored = this._git.isIgnored(Uri.file(file));
return !ignored;
};
}

private async execute(): Promise<Uri[]> {
this._logger.info(`searching for files in workspace ${this.workspaceFolder.uri.fsPath}`);

Expand All @@ -124,6 +139,11 @@ export class FileQueryApi {
builder = builder.filter(excludeFilter);
}

const gitIgnoreFilter = this.getGitIgnoreFilter();
if (gitIgnoreFilter) {
builder = builder.filter(gitIgnoreFilter);
}

if (this._config.excludedFolders.length) {
const excludedFolders = this._config.excludedFolders.map(folder => path.resolve(this.workspaceFolder.uri.fsPath, folder));
builder = builder.exclude((_directoryName, directoryPath) => {
Expand Down