From 013d5dfbb002648f6848e656d6e4f8f3b6e094c5 Mon Sep 17 00:00:00 2001 From: JAYADITYA <96861162+JayadityaGit@users.noreply.github.com> Date: Thu, 5 Mar 2026 14:50:46 +0530 Subject: [PATCH] refactor(cli): categorize built-in themes into dark/ and light/ directories (#18634) --- packages/cli/src/config/settings.ts | 4 +-- packages/cli/src/test-utils/render.tsx | 2 +- .../cli/src/ui/hooks/useSnowfall.test.tsx | 2 +- packages/cli/src/ui/hooks/useSnowfall.ts | 2 +- .../src/ui/hooks/useTerminalTheme.test.tsx | 2 +- packages/cli/src/ui/hooks/useTerminalTheme.ts | 2 +- .../{ansi.ts => builtin/dark/ansi-dark.ts} | 6 ++-- .../{ => builtin/dark}/atom-one-dark.ts | 6 ++-- .../{ayu.ts => builtin/dark/ayu-dark.ts} | 6 ++-- .../dark/default-dark.ts} | 4 +-- .../dark/dracula-dark.ts} | 6 ++-- .../themes/{ => builtin/dark}/github-dark.ts | 6 ++-- .../dark/holiday-dark.ts} | 6 ++-- .../dark/shades-of-purple-dark.ts} | 6 ++-- .../{ => builtin/dark}/solarized-dark.ts | 8 ++--- .../themes/{ => builtin/light}/ansi-light.ts | 6 ++-- .../themes/{ => builtin/light}/ayu-light.ts | 6 ++-- .../{ => builtin/light}/default-light.ts | 4 +-- .../{ => builtin/light}/github-light.ts | 6 ++-- .../light/googlecode-light.ts} | 6 ++-- .../{ => builtin/light}/solarized-light.ts | 8 ++--- .../light/xcode-light.ts} | 6 ++-- .../src/ui/themes/{ => builtin}/no-color.ts | 8 ++--- packages/cli/src/ui/themes/theme-manager.ts | 36 +++++++++---------- 24 files changed, 77 insertions(+), 77 deletions(-) rename packages/cli/src/ui/themes/{ansi.ts => builtin/dark/ansi-dark.ts} (96%) rename packages/cli/src/ui/themes/{ => builtin/dark}/atom-one-dark.ts (95%) rename packages/cli/src/ui/themes/{ayu.ts => builtin/dark/ayu-dark.ts} (94%) rename packages/cli/src/ui/themes/{default.ts => builtin/dark/default-dark.ts} (97%) rename packages/cli/src/ui/themes/{dracula.ts => builtin/dark/dracula-dark.ts} (94%) rename packages/cli/src/ui/themes/{ => builtin/dark}/github-dark.ts (95%) rename packages/cli/src/ui/themes/{holiday.ts => builtin/dark/holiday-dark.ts} (96%) rename packages/cli/src/ui/themes/{shades-of-purple.ts => builtin/dark/shades-of-purple-dark.ts} (98%) rename packages/cli/src/ui/themes/{ => builtin/dark}/solarized-dark.ts (95%) rename packages/cli/src/ui/themes/{ => builtin/light}/ansi-light.ts (94%) rename packages/cli/src/ui/themes/{ => builtin/light}/ayu-light.ts (95%) rename packages/cli/src/ui/themes/{ => builtin/light}/default-light.ts (96%) rename packages/cli/src/ui/themes/{ => builtin/light}/github-light.ts (95%) rename packages/cli/src/ui/themes/{googlecode.ts => builtin/light/googlecode-light.ts} (95%) rename packages/cli/src/ui/themes/{ => builtin/light}/solarized-light.ts (95%) rename packages/cli/src/ui/themes/{xcode.ts => builtin/light/xcode-light.ts} (95%) rename packages/cli/src/ui/themes/{ => builtin}/no-color.ts (93%) diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index 21dd3eb35f..422dda6115 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -20,8 +20,8 @@ import { type AdminControlsSettings, } from '@google/gemini-cli-core'; import stripJsonComments from 'strip-json-comments'; -import { DefaultLight } from '../ui/themes/default-light.js'; -import { DefaultDark } from '../ui/themes/default.js'; +import { DefaultLight } from '../ui/themes/builtin/light/default-light.js'; +import { DefaultDark } from '../ui/themes/builtin/dark/default-dark.js'; import { isWorkspaceTrusted } from './trustedFolders.js'; import { type Settings, diff --git a/packages/cli/src/test-utils/render.tsx b/packages/cli/src/test-utils/render.tsx index 3100673e94..06f99c135c 100644 --- a/packages/cli/src/test-utils/render.tsx +++ b/packages/cli/src/test-utils/render.tsx @@ -50,7 +50,7 @@ import { AppContext, type AppState } from '../ui/contexts/AppContext.js'; import { createMockSettings } from './settings.js'; import { SessionStatsProvider } from '../ui/contexts/SessionContext.js'; import { themeManager, DEFAULT_THEME } from '../ui/themes/theme-manager.js'; -import { DefaultLight } from '../ui/themes/default-light.js'; +import { DefaultLight } from '../ui/themes/builtin/light/default-light.js'; import { pickDefaultThemeName } from '../ui/themes/theme.js'; import { generateSvgForTerminal } from './svg.js'; diff --git a/packages/cli/src/ui/hooks/useSnowfall.test.tsx b/packages/cli/src/ui/hooks/useSnowfall.test.tsx index 321da83090..e3e6df9100 100644 --- a/packages/cli/src/ui/hooks/useSnowfall.test.tsx +++ b/packages/cli/src/ui/hooks/useSnowfall.test.tsx @@ -23,7 +23,7 @@ vi.mock('../themes/theme-manager.js', () => ({ DEFAULT_THEME: { name: 'Default' }, })); -vi.mock('../themes/holiday.js', () => ({ +vi.mock('../themes/builtin/dark/holiday-dark.js', () => ({ Holiday: { name: 'Holiday' }, })); diff --git a/packages/cli/src/ui/hooks/useSnowfall.ts b/packages/cli/src/ui/hooks/useSnowfall.ts index 6edb2e4b92..60c6d6d78f 100644 --- a/packages/cli/src/ui/hooks/useSnowfall.ts +++ b/packages/cli/src/ui/hooks/useSnowfall.ts @@ -8,7 +8,7 @@ import { useState, useEffect, useMemo } from 'react'; import { getAsciiArtWidth } from '../utils/textUtils.js'; import { debugState } from '../debug.js'; import { themeManager } from '../themes/theme-manager.js'; -import { Holiday } from '../themes/holiday.js'; +import { Holiday } from '../themes/builtin/dark/holiday-dark.js'; import { useUIState } from '../contexts/UIStateContext.js'; import { useTerminalSize } from './useTerminalSize.js'; import { shortAsciiLogo } from '../components/AsciiArt.js'; diff --git a/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx b/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx index d20c6149b0..31df95495c 100644 --- a/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx +++ b/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx @@ -65,7 +65,7 @@ vi.mock('../themes/theme-manager.js', async (importOriginal) => { }; }); -vi.mock('../themes/default-light.js', () => ({ +vi.mock('../themes/builtin/light/default-light.js', () => ({ DefaultLight: { name: 'default-light' }, })); diff --git a/packages/cli/src/ui/hooks/useTerminalTheme.ts b/packages/cli/src/ui/hooks/useTerminalTheme.ts index 5590c2a97c..29168b281a 100644 --- a/packages/cli/src/ui/hooks/useTerminalTheme.ts +++ b/packages/cli/src/ui/hooks/useTerminalTheme.ts @@ -11,7 +11,7 @@ import { shouldSwitchTheme, } from '../themes/color-utils.js'; import { themeManager, DEFAULT_THEME } from '../themes/theme-manager.js'; -import { DefaultLight } from '../themes/default-light.js'; +import { DefaultLight } from '../themes/builtin/light/default-light.js'; import { useSettings } from '../contexts/SettingsContext.js'; import type { Config } from '@google/gemini-cli-core'; import { useTerminalContext } from '../contexts/TerminalContext.js'; diff --git a/packages/cli/src/ui/themes/ansi.ts b/packages/cli/src/ui/themes/builtin/dark/ansi-dark.ts similarity index 96% rename from packages/cli/src/ui/themes/ansi.ts rename to packages/cli/src/ui/themes/builtin/dark/ansi-dark.ts index a8c788bf54..79db07f3b2 100644 --- a/packages/cli/src/ui/themes/ansi.ts +++ b/packages/cli/src/ui/themes/builtin/dark/ansi-dark.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { darkSemanticColors } from './semantic-tokens.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { darkSemanticColors } from '../../semantic-tokens.js'; const ansiColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/atom-one-dark.ts b/packages/cli/src/ui/themes/builtin/dark/atom-one-dark.ts similarity index 95% rename from packages/cli/src/ui/themes/atom-one-dark.ts rename to packages/cli/src/ui/themes/builtin/dark/atom-one-dark.ts index 5217a8bf30..2abb98cb54 100644 --- a/packages/cli/src/ui/themes/atom-one-dark.ts +++ b/packages/cli/src/ui/themes/builtin/dark/atom-one-dark.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const atomOneDarkColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/ayu.ts b/packages/cli/src/ui/themes/builtin/dark/ayu-dark.ts similarity index 94% rename from packages/cli/src/ui/themes/ayu.ts rename to packages/cli/src/ui/themes/builtin/dark/ayu-dark.ts index 71798aacf2..d4084569e4 100644 --- a/packages/cli/src/ui/themes/ayu.ts +++ b/packages/cli/src/ui/themes/builtin/dark/ayu-dark.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const ayuDarkColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/default.ts b/packages/cli/src/ui/themes/builtin/dark/default-dark.ts similarity index 97% rename from packages/cli/src/ui/themes/default.ts rename to packages/cli/src/ui/themes/builtin/dark/default-dark.ts index e1d0247c01..817686395d 100644 --- a/packages/cli/src/ui/themes/default.ts +++ b/packages/cli/src/ui/themes/builtin/dark/default-dark.ts @@ -1,10 +1,10 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { darkTheme, Theme } from './theme.js'; +import { darkTheme, Theme } from '../../theme.js'; export const DefaultDark: Theme = new Theme( 'Default', diff --git a/packages/cli/src/ui/themes/dracula.ts b/packages/cli/src/ui/themes/builtin/dark/dracula-dark.ts similarity index 94% rename from packages/cli/src/ui/themes/dracula.ts rename to packages/cli/src/ui/themes/builtin/dark/dracula-dark.ts index 2cd2802c45..3a9afcea75 100644 --- a/packages/cli/src/ui/themes/dracula.ts +++ b/packages/cli/src/ui/themes/builtin/dark/dracula-dark.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const draculaColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/github-dark.ts b/packages/cli/src/ui/themes/builtin/dark/github-dark.ts similarity index 95% rename from packages/cli/src/ui/themes/github-dark.ts rename to packages/cli/src/ui/themes/builtin/dark/github-dark.ts index 28c14f598d..27b804857d 100644 --- a/packages/cli/src/ui/themes/github-dark.ts +++ b/packages/cli/src/ui/themes/builtin/dark/github-dark.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const githubDarkColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/holiday.ts b/packages/cli/src/ui/themes/builtin/dark/holiday-dark.ts similarity index 96% rename from packages/cli/src/ui/themes/holiday.ts rename to packages/cli/src/ui/themes/builtin/dark/holiday-dark.ts index 9cd77b43f0..e49ae046d0 100644 --- a/packages/cli/src/ui/themes/holiday.ts +++ b/packages/cli/src/ui/themes/builtin/dark/holiday-dark.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const holidayColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/shades-of-purple.ts b/packages/cli/src/ui/themes/builtin/dark/shades-of-purple-dark.ts similarity index 98% rename from packages/cli/src/ui/themes/shades-of-purple.ts rename to packages/cli/src/ui/themes/builtin/dark/shades-of-purple-dark.ts index 6e11aaec8b..b9e45fd924 100644 --- a/packages/cli/src/ui/themes/shades-of-purple.ts +++ b/packages/cli/src/ui/themes/builtin/dark/shades-of-purple-dark.ts @@ -1,6 +1,6 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ @@ -8,8 +8,8 @@ * Shades of Purple Theme — for Highlight.js. * @author Ahmad Awais */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const shadesOfPurpleColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/solarized-dark.ts b/packages/cli/src/ui/themes/builtin/dark/solarized-dark.ts similarity index 95% rename from packages/cli/src/ui/themes/solarized-dark.ts rename to packages/cli/src/ui/themes/builtin/dark/solarized-dark.ts index cef9fd9d22..44168138f7 100644 --- a/packages/cli/src/ui/themes/solarized-dark.ts +++ b/packages/cli/src/ui/themes/builtin/dark/solarized-dark.ts @@ -1,12 +1,12 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme, interpolateColor } from './theme.js'; -import { type SemanticColors } from './semantic-tokens.js'; -import { DEFAULT_SELECTION_OPACITY } from '../constants.js'; +import { type ColorsTheme, Theme, interpolateColor } from '../../theme.js'; +import { type SemanticColors } from '../../semantic-tokens.js'; +import { DEFAULT_SELECTION_OPACITY } from '../../../constants.js'; const solarizedDarkColors: ColorsTheme = { type: 'dark', diff --git a/packages/cli/src/ui/themes/ansi-light.ts b/packages/cli/src/ui/themes/builtin/light/ansi-light.ts similarity index 94% rename from packages/cli/src/ui/themes/ansi-light.ts rename to packages/cli/src/ui/themes/builtin/light/ansi-light.ts index 201cc500e5..0d3b2003f8 100644 --- a/packages/cli/src/ui/themes/ansi-light.ts +++ b/packages/cli/src/ui/themes/builtin/light/ansi-light.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { lightSemanticColors } from './semantic-tokens.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { lightSemanticColors } from '../../semantic-tokens.js'; const ansiLightColors: ColorsTheme = { type: 'light', diff --git a/packages/cli/src/ui/themes/ayu-light.ts b/packages/cli/src/ui/themes/builtin/light/ayu-light.ts similarity index 95% rename from packages/cli/src/ui/themes/ayu-light.ts rename to packages/cli/src/ui/themes/builtin/light/ayu-light.ts index 393ed44ba6..6c5a7616e1 100644 --- a/packages/cli/src/ui/themes/ayu-light.ts +++ b/packages/cli/src/ui/themes/builtin/light/ayu-light.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const ayuLightColors: ColorsTheme = { type: 'light', diff --git a/packages/cli/src/ui/themes/default-light.ts b/packages/cli/src/ui/themes/builtin/light/default-light.ts similarity index 96% rename from packages/cli/src/ui/themes/default-light.ts rename to packages/cli/src/ui/themes/builtin/light/default-light.ts index 1803e7fae0..2d60f6d2bb 100644 --- a/packages/cli/src/ui/themes/default-light.ts +++ b/packages/cli/src/ui/themes/builtin/light/default-light.ts @@ -1,10 +1,10 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { lightTheme, Theme } from './theme.js'; +import { lightTheme, Theme } from '../../theme.js'; export const DefaultLight: Theme = new Theme( 'Default Light', diff --git a/packages/cli/src/ui/themes/github-light.ts b/packages/cli/src/ui/themes/builtin/light/github-light.ts similarity index 95% rename from packages/cli/src/ui/themes/github-light.ts rename to packages/cli/src/ui/themes/builtin/light/github-light.ts index 18ac7a709e..a794a9312e 100644 --- a/packages/cli/src/ui/themes/github-light.ts +++ b/packages/cli/src/ui/themes/builtin/light/github-light.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const githubLightColors: ColorsTheme = { type: 'light', diff --git a/packages/cli/src/ui/themes/googlecode.ts b/packages/cli/src/ui/themes/builtin/light/googlecode-light.ts similarity index 95% rename from packages/cli/src/ui/themes/googlecode.ts rename to packages/cli/src/ui/themes/builtin/light/googlecode-light.ts index 1795451c91..67f5618d60 100644 --- a/packages/cli/src/ui/themes/googlecode.ts +++ b/packages/cli/src/ui/themes/builtin/light/googlecode-light.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme, lightTheme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme, lightTheme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const googleCodeColors: ColorsTheme = { type: 'light', diff --git a/packages/cli/src/ui/themes/solarized-light.ts b/packages/cli/src/ui/themes/builtin/light/solarized-light.ts similarity index 95% rename from packages/cli/src/ui/themes/solarized-light.ts rename to packages/cli/src/ui/themes/builtin/light/solarized-light.ts index b9ba313b1b..b30dbb7b7f 100644 --- a/packages/cli/src/ui/themes/solarized-light.ts +++ b/packages/cli/src/ui/themes/builtin/light/solarized-light.ts @@ -1,12 +1,12 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme, interpolateColor } from './theme.js'; -import { type SemanticColors } from './semantic-tokens.js'; -import { DEFAULT_SELECTION_OPACITY } from '../constants.js'; +import { type ColorsTheme, Theme, interpolateColor } from '../../theme.js'; +import { type SemanticColors } from '../../semantic-tokens.js'; +import { DEFAULT_SELECTION_OPACITY } from '../../../constants.js'; const solarizedLightColors: ColorsTheme = { type: 'light', diff --git a/packages/cli/src/ui/themes/xcode.ts b/packages/cli/src/ui/themes/builtin/light/xcode-light.ts similarity index 95% rename from packages/cli/src/ui/themes/xcode.ts rename to packages/cli/src/ui/themes/builtin/light/xcode-light.ts index 105c1d1a00..71c9442f7f 100644 --- a/packages/cli/src/ui/themes/xcode.ts +++ b/packages/cli/src/ui/themes/builtin/light/xcode-light.ts @@ -1,11 +1,11 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { type ColorsTheme, Theme } from './theme.js'; -import { interpolateColor } from './color-utils.js'; +import { type ColorsTheme, Theme } from '../../theme.js'; +import { interpolateColor } from '../../color-utils.js'; const xcodeColors: ColorsTheme = { type: 'light', diff --git a/packages/cli/src/ui/themes/no-color.ts b/packages/cli/src/ui/themes/builtin/no-color.ts similarity index 93% rename from packages/cli/src/ui/themes/no-color.ts rename to packages/cli/src/ui/themes/builtin/no-color.ts index 28b2a4e858..6f1a099454 100644 --- a/packages/cli/src/ui/themes/no-color.ts +++ b/packages/cli/src/ui/themes/builtin/no-color.ts @@ -1,12 +1,12 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import type { ColorsTheme } from './theme.js'; -import { Theme } from './theme.js'; -import type { SemanticColors } from './semantic-tokens.js'; +import type { ColorsTheme } from '../theme.js'; +import { Theme } from '../theme.js'; +import type { SemanticColors } from '../semantic-tokens.js'; const noColorColorsTheme: ColorsTheme = { type: 'ansi', diff --git a/packages/cli/src/ui/themes/theme-manager.ts b/packages/cli/src/ui/themes/theme-manager.ts index 775f085f6e..7456746d95 100644 --- a/packages/cli/src/ui/themes/theme-manager.ts +++ b/packages/cli/src/ui/themes/theme-manager.ts @@ -1,23 +1,23 @@ /** * @license - * Copyright 2025 Google LLC + * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import { AyuDark } from './ayu.js'; -import { AyuLight } from './ayu-light.js'; -import { AtomOneDark } from './atom-one-dark.js'; -import { Dracula } from './dracula.js'; -import { GitHubDark } from './github-dark.js'; -import { GitHubLight } from './github-light.js'; -import { GoogleCode } from './googlecode.js'; -import { Holiday } from './holiday.js'; -import { DefaultLight } from './default-light.js'; -import { DefaultDark } from './default.js'; -import { ShadesOfPurple } from './shades-of-purple.js'; -import { SolarizedDark } from './solarized-dark.js'; -import { SolarizedLight } from './solarized-light.js'; -import { XCode } from './xcode.js'; +import { AyuDark } from './builtin/dark/ayu-dark.js'; +import { AyuLight } from './builtin/light/ayu-light.js'; +import { AtomOneDark } from './builtin/dark/atom-one-dark.js'; +import { Dracula } from './builtin/dark/dracula-dark.js'; +import { GitHubDark } from './builtin/dark/github-dark.js'; +import { GitHubLight } from './builtin/light/github-light.js'; +import { GoogleCode } from './builtin/light/googlecode-light.js'; +import { Holiday } from './builtin/dark/holiday-dark.js'; +import { DefaultLight } from './builtin/light/default-light.js'; +import { DefaultDark } from './builtin/dark/default-dark.js'; +import { ShadesOfPurple } from './builtin/dark/shades-of-purple-dark.js'; +import { SolarizedDark } from './builtin/dark/solarized-dark.js'; +import { SolarizedLight } from './builtin/light/solarized-light.js'; +import { XCode } from './builtin/light/xcode-light.js'; import * as fs from 'node:fs'; import * as path from 'node:path'; import type { Theme, ThemeType, ColorsTheme } from './theme.js'; @@ -36,9 +36,9 @@ import { DEFAULT_SELECTION_OPACITY, DEFAULT_BORDER_OPACITY, } from '../constants.js'; -import { ANSI } from './ansi.js'; -import { ANSILight } from './ansi-light.js'; -import { NoColorTheme } from './no-color.js'; +import { ANSI } from './builtin/dark/ansi-dark.js'; +import { ANSILight } from './builtin/light/ansi-light.js'; +import { NoColorTheme } from './builtin/no-color.js'; import process from 'node:process'; import { debugLogger, homedir } from '@google/gemini-cli-core';