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

packages/cli/src/ui/utils/CodeColorizer.tsx

@@ -149,7 +149,7 @@ export function colorizeCode({
   const activeTheme = theme || themeManager.getActiveTheme();
   const showLineNumbers = hideLineNumbers
     ? false
-    : (settings?.merged.ui?.showLineNumbers ?? true);
+    : settings.merged.ui.showLineNumbers;
 
   const useMaxSizedBox = !isAlternateBufferEnabled(settings);
   try {

packages/cli/src/ui/utils/ui-sizing.ts

@@ -27,7 +27,7 @@ export const calculateMainAreaWidth = (
   terminalWidth: number,
   settings: LoadedSettings,
 ): number => {
-  if (settings.merged.ui?.useFullWidth) {
+  if (settings.merged.ui.useFullWidth) {
     if (isAlternateBufferEnabled(settings)) {
       return terminalWidth - 1;
     }

packages/cli/src/ui/utils/updateCheck.test.ts

@@ -46,7 +46,7 @@ describe('checkForUpdates', () => {
   });
 
   it('should return null if disableUpdateNag is true', async () => {
-    mockSettings.merged.general!.disableUpdateNag = true;
+    mockSettings.merged.general.disableUpdateNag = true;
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
     expect(getPackageJson).not.toHaveBeenCalled();

packages/cli/src/ui/utils/updateCheck.ts

@@ -51,7 +51,7 @@ export async function checkForUpdates(
   settings: LoadedSettings,
 ): Promise<UpdateObject | null> {
   try {
-    if (settings.merged.general?.disableUpdateNag) {
+    if (settings.merged.general.disableUpdateNag) {
       return null;
     }
     // Skip update check when running from source (development mode)