Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

extensions/agent/src/dialogs/jobStepDialog.ts

@@ -259,9 +259,9 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 					title: this.CommandLabelString,
 					actions: [this.openButton, this.parseButton]
 				}], {
-						horizontal: false,
-						componentWidth: 420
-					}).component();
+					horizontal: false,
+					componentWidth: 420
+				}).component();
 			this.typeDropdown.onValueChanged((type) => {
 				switch (type.selected) {
 					case (JobStepDialog.TSQLScript):
@@ -375,8 +375,8 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 						component: this.userInputBox,
 						title: this.RunAsUserLabel
 					}], {
-						componentWidth: 400
-					}).component();
+					componentWidth: 400
+				}).component();
 
 			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
 			formWrapper.loading = false;
@@ -419,9 +419,9 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 					component: this.retryAttemptsBox,
 					title: this.RetryAttemptsLabel
 				}], {
-					horizontal: false,
-					componentWidth: '100%'
-				})
+				horizontal: false,
+				componentWidth: '100%'
+			})
 			.component();
 
 		let retryIntervalContainer = view.modelBuilder.formContainer()
@@ -430,8 +430,8 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 					component: this.retryIntervalBox,
 					title: this.RetryIntervalLabel
 				}], {
-					horizontal: false
-				})
+				horizontal: false
+			})
 			.component();
 
 		let retryFlexContainer = view.modelBuilder.flexContainer()
@@ -574,4 +574,4 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 			return validationResult.valid;
 		});
 	}
-}
+}