vrr/qwen-code
2
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2026-05-05 23:42:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Revert "Ignore workspace settings for untrusted folders" (#6672)

Browse source
This commit is contained in:
Jacob Richman 2025-08-20 12:49:15 -07:00 • committed by GitHub
parent fd64d89da0
commit 52e340a11b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 122 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packages/cli/src/ui/hooks/useEditorSettings.ts
View file

@ -4,15 +4,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
import { useState, useCallback, useContext } from 'react';
import { SettingScope } from '../../config/settings.js';
import { useState, useCallback } from 'react';
import { LoadedSettings, SettingScope } from '../../config/settings.js';
import { type HistoryItem, MessageType } from '../types.js';
import {
allowEditorTypeInSandbox,
checkHasEditorType,
EditorType,
} from '@google/gemini-cli-core';
import { SettingsContext } from '../contexts/SettingsContext.js';
interface UseEditorSettingsReturn {
isEditorDialogOpen: boolean;
@ -25,11 +24,11 @@ interface UseEditorSettingsReturn {
}
export const useEditorSettings = (
loadedSettings: LoadedSettings,
setEditorError: (error: string | null) => void,
addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void,
): UseEditorSettingsReturn => {
const [isEditorDialogOpen, setIsEditorDialogOpen] = useState(false);
const settingsContext = useContext(SettingsContext);
const openEditorDialog = useCallback(() => {
setIsEditorDialogOpen(true);
@ -46,11 +45,7 @@ export const useEditorSettings = (
}
try {
settingsContext?.settings.setValue(
scope,
'preferredEditor',
editorType,
);
loadedSettings.setValue(scope, 'preferredEditor', editorType);
addItem(
{
type: MessageType.INFO,
@ -64,7 +59,7 @@ export const useEditorSettings = (
setEditorError(`Failed to set editor preference: ${error}`);
}
},
[settingsContext, setEditorError, addItem],
[loadedSettings, setEditorError, addItem],
);
const exitEditorDialog = useCallback(() => {