From 52e340a11bc6c9ca10674799fa784566d4bbd538 Mon Sep 17 00:00:00 2001
From: Jacob Richman <jacob314@gmail.com>
Date: Wed, 20 Aug 2025 12:49:15 -0700
Subject: Revert "Ignore workspace settings for untrusted folders" (#6672)

---
 packages/cli/src/ui/contexts/SettingsContext.ts | 24 ------------------------
 packages/cli/src/ui/contexts/VimModeContext.tsx |  5 +----
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 packages/cli/src/ui/contexts/SettingsContext.ts

(limited to 'packages/cli/src/ui/contexts')

diff --git a/packages/cli/src/ui/contexts/SettingsContext.ts b/packages/cli/src/ui/contexts/SettingsContext.ts
deleted file mode 100644
index 610a778d..00000000
--- a/packages/cli/src/ui/contexts/SettingsContext.ts
+++ /dev/null
@@ -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;
-}
diff --git a/packages/cli/src/ui/contexts/VimModeContext.tsx b/packages/cli/src/ui/contexts/VimModeContext.tsx
index 40de0b53..b27034ef 100644
--- a/packages/cli/src/ui/contexts/VimModeContext.tsx
+++ b/packages/cli/src/ui/contexts/VimModeContext.tsx
@@ -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>(
-- 
cgit v1.2.3