MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-17 09:30:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make merged settings non-nullable and fix all lints related to that. (#16647)

Browse Source
This commit is contained in:
Jacob Richman
2026-01-15 09:26:10 -08:00
committed by GitHub
parent 2b6bfe4097
commit f7f38e2b9e
59 changed files with 964 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/core/initializer.test.ts
View File

@@ -127,7 +127,7 @@ describe('initializer', () => {
});
it('should handle undefined auth type', async () => {
mockSettings.merged.security!.auth!.selectedType = undefined;
mockSettings.merged.security.auth.selectedType = undefined;
const result = await initializeApp(
mockConfig as unknown as Config,
mockSettings,

4
packages/cli/src/core/initializer.ts
View File

@@ -39,13 +39,13 @@ export async function initializeApp(
const authHandle = startupProfiler.start('authenticate');
const authError = await performInitialAuth(
config,
settings.merged.security?.auth?.selectedType,
settings.merged.security.auth.selectedType,
);
authHandle?.end();
const themeError = validateTheme(settings);
const shouldOpenAuthDialog =
settings.merged.security?.auth?.selectedType === undefined || !!authError;
settings.merged.security.auth.selectedType === undefined || !!authError;
logCliConfiguration(
config,

2
packages/cli/src/core/theme.test.ts
View File

@@ -46,7 +46,7 @@ describe('theme', () => {
});
it('should return null if theme is undefined', () => {
mockSettings.merged.ui!.theme = undefined;
mockSettings.merged.ui.theme = undefined;
const result = validateTheme(mockSettings);
expect(result).toBeNull();
expect(themeManager.findThemeByName).not.toHaveBeenCalled();

2
packages/cli/src/core/theme.ts
View File

@@ -13,7 +13,7 @@ import { type LoadedSettings } from '../config/settings.js';
* @returns An error message if the theme is not found, otherwise null.
*/
export function validateTheme(settings: LoadedSettings): string | null {
const effectiveTheme = settings.merged.ui?.theme;
const effectiveTheme = settings.merged.ui.theme;
if (effectiveTheme && !themeManager.findThemeByName(effectiveTheme)) {
return `Theme "${effectiveTheme}" not found.`;
}