#70332 Strict null check - complete preferences

src/tsconfig.strictNullChecks.json

@@ -15,6 +15,7 @@
 		"./vs/workbench/electron-browser/**/*",
 		"./vs/workbench/contrib/emmet/**/*",
 		"./vs/workbench/contrib/externalTerminal/**/*",
+		"./vs/workbench/contrib/preferences/**/*.ts",
 		"./vs/workbench/contrib/scm/**/*.ts",
 		"./vs/workbench/contrib/snippets/**/*.ts",
 		"./vs/workbench/contrib/outline/**/*.ts",
@@ -35,8 +36,6 @@
 		"./vs/workbench/contrib/debug/**/*.ts",
 		"./vs/workbench/contrib/files/**/*.ts",
 		"./vs/workbench/contrib/webview/**/*.ts",
-		"./vs/workbench/contrib/preferences/common/**/*.ts",
-		"./vs/workbench/contrib/preferences/**/settings*.ts",
 		"./vs/workbench/contrib/search/**/*.ts",
 		"./vs/workbench/contrib/terminal/**/*"
 	],
@@ -227,21 +226,6 @@
 		"./vs/workbench/contrib/output/common/outputLinkComputer.ts",
 		"./vs/workbench/contrib/output/common/outputLinkProvider.ts",
 		"./vs/workbench/contrib/output/test/outputLinkProvider.test.ts",
-		"./vs/workbench/contrib/preferences/browser/preferencesEditor.ts",
-		"./vs/workbench/contrib/preferences/browser/preferencesRenderers.ts",
-		"./vs/workbench/contrib/preferences/browser/keybindingsEditor.ts",
-		"./vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts",
-		"./vs/workbench/contrib/preferences/browser/keybindingWidgets.ts",
-		"./vs/workbench/contrib/preferences/browser/preferencesActions.ts",
-		"./vs/workbench/contrib/preferences/browser/preferencesWidgets.ts",
-		"./vs/workbench/contrib/preferences/browser/settingsLayout.ts",
-		"./vs/workbench/contrib/preferences/browser/settingsWidgets.ts",
-		"./vs/workbench/contrib/preferences/browser/tocTree.ts",
-		"./vs/workbench/contrib/preferences/common/preferences.ts",
-		"./vs/workbench/contrib/preferences/common/preferencesContribution.ts",
-		"./vs/workbench/contrib/preferences/common/smartSnippetInserter.ts",
-		"./vs/workbench/contrib/preferences/electron-browser/preferencesSearch.ts",
-		"./vs/workbench/contrib/preferences/test/common/smartSnippetInserter.test.ts",
 		"./vs/workbench/contrib/quickopen/browser/commandsHandler.ts",
 		"./vs/workbench/contrib/quickopen/browser/gotoLineHandler.ts",
 		"./vs/workbench/contrib/quickopen/browser/gotoSymbolHandler.ts",

src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts

@@ -227,7 +227,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
 		if (control && control instanceof KeybindingsEditor) {
-			control.defineKeybinding(control.activeKeybindingEntry);
+			control.defineKeybinding(control.activeKeybindingEntry!);
 		}
 	}
 });
@@ -239,8 +239,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_E),
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
-		if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry.keybindingItem.keybinding) {
-			control.defineWhenExpression(control.activeKeybindingEntry);
+		if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry!.keybindingItem.keybinding) {
+			control.defineWhenExpression(control.activeKeybindingEntry!);
 		}
 	}
 });
@@ -256,7 +256,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
 		if (control && control instanceof KeybindingsEditor) {
-			control.removeKeybinding(control.activeKeybindingEntry);
+			control.removeKeybinding(control.activeKeybindingEntry!);
 		}
 	}
 });
@@ -269,7 +269,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
 		if (control && control instanceof KeybindingsEditor) {
-			control.resetKeybinding(control.activeKeybindingEntry);
+			control.resetKeybinding(control.activeKeybindingEntry!);
 		}
 	}
 });
@@ -323,7 +323,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
 		if (control) {
-			control.showSimilarKeybindings(control.activeKeybindingEntry);
+			control.showSimilarKeybindings(control.activeKeybindingEntry!);
 		}
 	}
 });
@@ -336,7 +336,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
 		if (control) {
-			control.copyKeybinding(control.activeKeybindingEntry);
+			control.copyKeybinding(control.activeKeybindingEntry!);
 		}
 	}
 });
@@ -349,7 +349,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, args: any) => {
 		const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
 		if (control) {
-			control.copyKeybindingCommand(control.activeKeybindingEntry);
+			control.copyKeybindingCommand(control.activeKeybindingEntry!);
 		}
 	}
 });