From 9ac3e8b79ecc584805c27d3602612c30f2adee80 Mon Sep 17 00:00:00 2001 From: DevMassive <76215222+DevMassive@users.noreply.github.com> Date: Thu, 7 Aug 2025 08:41:04 +0900 Subject: feat: Improve @-command file path completion with fzf integration (#5650) Co-authored-by: Jacob Richman --- packages/core/src/utils/filesearch/fileSearch.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'packages/core/src/utils/filesearch/fileSearch.ts') diff --git a/packages/core/src/utils/filesearch/fileSearch.ts b/packages/core/src/utils/filesearch/fileSearch.ts index db14bc65..76a099f7 100644 --- a/packages/core/src/utils/filesearch/fileSearch.ts +++ b/packages/core/src/utils/filesearch/fileSearch.ts @@ -11,6 +11,7 @@ import picomatch from 'picomatch'; import { Ignore } from './ignore.js'; import { ResultCache } from './result-cache.js'; import * as cache from './crawlCache.js'; +import { Fzf, FzfResultItem } from 'fzf'; export type FileSearchOptions = { projectRoot: string; @@ -77,6 +78,18 @@ export async function filter( return results; } +/** + * Filters a list of paths based on a given pattern using fzf. + * @param allPaths The list of all paths to filter. + * @param pattern The fzf pattern to filter by. + * @returns The filtered and sorted list of paths. + */ +function filterByFzf(allPaths: string[], pattern: string) { + return new Fzf(allPaths) + .find(pattern) + .map((entry: FzfResultItem) => entry.item); +} + export type SearchOptions = { signal?: AbortSignal; maxResults?: number; @@ -137,7 +150,9 @@ export class FileSearch { filteredCandidates = candidates; } else { // Apply the user's picomatch pattern filter - filteredCandidates = await filter(candidates, pattern, options.signal); + filteredCandidates = pattern.includes('*') + ? await filter(candidates, pattern, options.signal) + : filterByFzf(this.allFiles, pattern); this.resultCache!.set(pattern, filteredCandidates); } -- cgit v1.2.3