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

This commit is contained in:
Jacob Richman
2025-08-20 12:49:15 -07:00
committed by GitHub
parent fd64d89da0
commit 52e340a11b
16 changed files with 122 additions and 386 deletions

View File

@@ -1,24 +0,0 @@
/**
* @license
* Copyright 2025 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
import { createContext, useContext } from 'react';
import { LoadedSettings } from '../../config/settings.js';
export interface SettingsContextType {
settings: LoadedSettings;
recomputeSettings: () => void;
}
// This context is initialized in gemini.tsx with the loaded settings.
export const SettingsContext = createContext<SettingsContextType | null>(null);
export function useSettings(): LoadedSettings {
const context = useContext(SettingsContext);
if (!context) {
throw new Error('useSettings must be used within a SettingsProvider');
}
return context.settings;
}

View File

@@ -12,7 +12,6 @@ import {
useState,
} from 'react';
import { LoadedSettings, SettingScope } from '../../config/settings.js';
import { SettingsContext } from './SettingsContext.js';
export type VimMode = 'NORMAL' | 'INSERT';
@@ -27,13 +26,11 @@ const VimModeContext = createContext<VimModeContextType | undefined>(undefined);
export const VimModeProvider = ({
children,
settings: initialSettings,
settings,
}: {
children: React.ReactNode;
settings: LoadedSettings;
}) => {
const settingsContext = useContext(SettingsContext);
const settings = settingsContext?.settings || initialSettings;
const initialVimEnabled = settings.merged.vimMode ?? false;
const [vimEnabled, setVimEnabled] = useState(initialVimEnabled);
const [vimMode, setVimMode] = useState<VimMode>(