Skip to content
Merged
Show file tree
Hide file tree
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
41 changes: 41 additions & 0 deletions packages/cli/src/ui/components/EditorSettingsDialog.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,45 @@ describe('EditorSettingsDialog', () => {
}
expect(frame).toContain('(Also modified');
});

it('emits error feedback only once when preferredEditor is invalid', async () => {
const mockEmitFeedback = vi.fn();
vi.spyOn(
await import('@google/gemini-cli-core').then((m) => m.coreEvents),
'emitFeedback',
).mockImplementation(mockEmitFeedback);

const invalidSettings = {
forScope: (_scope: string) => ({
settings: {
general: {
preferredEditor: 'invalideditor',
},
},
}),
merged: {
general: {
preferredEditor: 'invalideditor',
},
},
} as unknown as LoadedSettings;

const { unmount } = await renderWithProvider(
<EditorSettingsDialog
onSelect={vi.fn()}
settings={invalidSettings}
onExit={vi.fn()}
/>,
);

await waitFor(() => {
expect(mockEmitFeedback).toHaveBeenCalledWith(
'error',
'Editor is not supported: invalideditor',
);
});

expect(mockEmitFeedback).toHaveBeenCalledTimes(1);
unmount();
});
});
15 changes: 13 additions & 2 deletions packages/cli/src/ui/components/EditorSettingsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import type React from 'react';
import { useState } from 'react';
import { useState, useEffect } from 'react';
import { Box, Text } from 'ink';
import { theme } from '../semantic-colors.js';
import {
Expand All @@ -22,6 +22,7 @@ import {
type EditorType,
isEditorAvailable,
EDITOR_DISPLAY_NAMES,
coreEvents,
} from '@google/gemini-cli-core';
import { useKeypress } from '../hooks/useKeypress.js';

Expand Down Expand Up @@ -70,10 +71,20 @@ export function EditorSettingsDialog({
(item: EditorDisplay) => item.type === currentPreference,
)
: 0;
if (editorIndex === -1) {
const isUnsupportedEditor = editorIndex === -1;
if (isUnsupportedEditor) {
editorIndex = 0;
}

useEffect(() => {
if (isUnsupportedEditor && currentPreference) {
coreEvents.emitFeedback(
'error',
`Editor is not supported: ${currentPreference}`,
);
}
}, [isUnsupportedEditor, currentPreference]);

const scopeItems: Array<{
label: string;
value: LoadableSettingScope;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,6 @@ exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios >
────────────────────────────────────────────────────────────────────────────────────────────────────"
`;

exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of the line' 2`] = `
"────────────────────────────────────────────────────────────────────────────────────────────────────
> hello
────────────────────────────────────────────────────────────────────────────────────────────────────"
`;

exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'for multi-byte unicode characters' 1`] = `
"────────────────────────────────────────────────────────────────────────────────────────────────────
> hello 👍 world
Expand Down
Loading