feat: add folder suggestions to /dir add command (#15724)

This commit is contained in:
Jack Wotherspoon
2026-01-02 16:08:11 -05:00
committed by GitHub
parent 006de1dd31
commit 0f3555a4d2
6 changed files with 466 additions and 6 deletions
@@ -4,10 +4,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
import { vi, describe, it, expect, beforeEach } from 'vitest';
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
import type { Mock } from 'vitest';
import { directoryCommand } from './directoryCommand.js';
import { expandHomeDir } from '../utils/directoryUtils.js';
import {
expandHomeDir,
getDirectorySuggestions,
} from '../utils/directoryUtils.js';
import type { Config, WorkspaceContext } from '@google/gemini-cli-core';
import type { MultiFolderTrustDialogProps } from '../components/MultiFolderTrustDialog.js';
import type { CommandContext, OpenCustomDialogActionReturn } from './types.js';
@@ -17,6 +20,15 @@ import * as path from 'node:path';
import * as trustedFolders from '../../config/trustedFolders.js';
import type { LoadedTrustedFolders } from '../../config/trustedFolders.js';
vi.mock('../utils/directoryUtils.js', async (importOriginal) => {
const actual =
await importOriginal<typeof import('../utils/directoryUtils.js')>();
return {
...actual,
getDirectorySuggestions: vi.fn(),
};
});
describe('directoryCommand', () => {
let mockContext: CommandContext;
let mockConfig: Config;
@@ -217,6 +229,47 @@ describe('directoryCommand', () => {
expect.any(Number),
);
});
describe('completion', () => {
const completion = addCommand!.completion!;
it('should return empty suggestions for an empty path', async () => {
const results = await completion(mockContext, '');
expect(results).toEqual([]);
});
it('should return empty suggestions for whitespace only path', async () => {
const results = await completion(mockContext, ' ');
expect(results).toEqual([]);
});
it('should return suggestions for a single path', async () => {
vi.mocked(getDirectorySuggestions).mockResolvedValue(['docs/', 'src/']);
const results = await completion(mockContext, 'd');
expect(getDirectorySuggestions).toHaveBeenCalledWith('d');
expect(results).toEqual(['docs/', 'src/']);
});
it('should return suggestions for multiple paths', async () => {
vi.mocked(getDirectorySuggestions).mockResolvedValue(['src/']);
const results = await completion(mockContext, 'docs/,s');
expect(getDirectorySuggestions).toHaveBeenCalledWith('s');
expect(results).toEqual(['docs/,src/']);
});
it('should handle leading whitespace in suggestions', async () => {
vi.mocked(getDirectorySuggestions).mockResolvedValue(['src/']);
const results = await completion(mockContext, 'docs/, s');
expect(getDirectorySuggestions).toHaveBeenCalledWith('s');
expect(results).toEqual(['docs/, src/']);
});
});
});
describe('add with folder trust enabled', () => {