From 1ef68e061213b6b170bd979d31d4805da2357272 Mon Sep 17 00:00:00 2001 From: Leo <45218470+ngleo@users.noreply.github.com> Date: Thu, 12 Jun 2025 02:21:54 +0100 Subject: feat: External editor settings (#882) --- .../cli/src/ui/components/EditorSettingsDialog.tsx | 168 +++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 packages/cli/src/ui/components/EditorSettingsDialog.tsx (limited to 'packages/cli/src/ui/components/EditorSettingsDialog.tsx') diff --git a/packages/cli/src/ui/components/EditorSettingsDialog.tsx b/packages/cli/src/ui/components/EditorSettingsDialog.tsx new file mode 100644 index 00000000..304354b5 --- /dev/null +++ b/packages/cli/src/ui/components/EditorSettingsDialog.tsx @@ -0,0 +1,168 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import React, { useState } from 'react'; +import { Box, Text, useInput } from 'ink'; +import { Colors } from '../colors.js'; +import { + EDITOR_DISPLAY_NAMES, + editorSettingsManager, + type EditorDisplay, +} from '../editors/editorSettingsManager.js'; +import { RadioButtonSelect } from './shared/RadioButtonSelect.js'; +import { LoadedSettings, SettingScope } from '../../config/settings.js'; +import { EditorType, isEditorAvailable } from '@gemini-cli/core'; + +interface EditorDialogProps { + onSelect: (editorType: EditorType | undefined, scope: SettingScope) => void; + settings: LoadedSettings; + onExit: () => void; +} + +export function EditorSettingsDialog({ + onSelect, + settings, + onExit, +}: EditorDialogProps): React.JSX.Element { + const [selectedScope, setSelectedScope] = useState( + SettingScope.User, + ); + const [focusedSection, setFocusedSection] = useState<'editor' | 'scope'>( + 'editor', + ); + useInput((_, key) => { + if (key.tab) { + setFocusedSection((prev) => (prev === 'editor' ? 'scope' : 'editor')); + } + if (key.escape) { + onExit(); + } + }); + + const editorItems: EditorDisplay[] = + editorSettingsManager.getAvailableEditorDisplays(); + + const currentPreference = + settings.forScope(selectedScope).settings.preferredEditor; + let editorIndex = currentPreference + ? editorItems.findIndex( + (item: EditorDisplay) => item.type === currentPreference, + ) + : 0; + if (editorIndex === -1) { + console.error(`Editor is not supported: ${currentPreference}`); + editorIndex = 0; + } + + const scopeItems = [ + { label: 'User Settings', value: SettingScope.User }, + { label: 'Workspace Settings', value: SettingScope.Workspace }, + ]; + + const handleEditorSelect = (editorType: EditorType | 'not_set') => { + if (editorType === 'not_set') { + onSelect(undefined, selectedScope); + return; + } + onSelect(editorType, selectedScope); + }; + + const handleScopeSelect = (scope: SettingScope) => { + setSelectedScope(scope); + setFocusedSection('editor'); + }; + + let otherScopeModifiedMessage = ''; + const otherScope = + selectedScope === SettingScope.User + ? SettingScope.Workspace + : SettingScope.User; + if (settings.forScope(otherScope).settings.preferredEditor !== undefined) { + otherScopeModifiedMessage = + settings.forScope(selectedScope).settings.preferredEditor !== undefined + ? `(Also modified in ${otherScope})` + : `(Modified in ${otherScope})`; + } + + let mergedEditorName = 'None'; + if ( + settings.merged.preferredEditor && + isEditorAvailable(settings.merged.preferredEditor) + ) { + mergedEditorName = + EDITOR_DISPLAY_NAMES[settings.merged.preferredEditor as EditorType]; + } + + return ( + + + + {focusedSection === 'editor' ? '> ' : ' '}Select Editor{' '} + {otherScopeModifiedMessage} + + ({ + label: item.name, + value: item.type, + disabled: item.disabled, + }))} + initialIndex={editorIndex} + onSelect={handleEditorSelect} + isFocused={focusedSection === 'editor'} + key={selectedScope} + /> + + + + {focusedSection === 'scope' ? '> ' : ' '}Apply To + + + + + + + (Use Enter to select, Tab to change focus) + + + + + + Editor Preference + + + These editors are currently supported. Please note that some editors + cannot be used in sandbox mode. + + + Your preferred editor is:{' '} + + {mergedEditorName} + + . + + + + + ); +} -- cgit v1.2.3