remove some vscode differences (#12146)

.vscode/launch.json

@@ -69,10 +69,9 @@
 			}
 		},
 		{
-			"type": "pwa-chrome",
+			"type": "chrome",
 			"request": "attach",
 			"name": "Attach to azuredatastudio",
-			"timeout": 50000,
 			"port": 9222
 		},
 		{
@@ -113,7 +112,7 @@
 			"preLaunchTask": "Ensure Prelaunch Dependencies",
 		},
 		{
-			"type": "chrome",
+			"type": "node",
 			"request": "launch",
 			"name": "Launch ADS (Web) (TBD)",
 			"program": "${workspaceFolder}/resources/web/code-web.js",

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -211,13 +211,6 @@ steps:
     zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
   displayName: Clean Archive
 
-- script: |
-    set -e
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    node build/azure-pipelines/common/createAsset.js darwin-unnotarized archive "VSCode-darwin-$VSCODE_QUALITY.zip" $(agent.builddirectory)/VSCode-darwin.zip
-  displayName: Publish Unnotarized Build
-
 - script: |
     APP_ROOT=$(agent.builddirectory)/VSCode-darwin
     APP_NAME="`ls $APP_ROOT | head -n 1`"

build/azure-pipelines/product-build.yml

@@ -6,7 +6,7 @@ schedules:
   displayName: Mon-Fri at 7:00
   branches:
     include:
-    - main
+    - master
 
 resources:
   containers:

extensions/markdown-language-features/package.json

@@ -26,7 +26,7 @@
 		"onCommand:markdown.showSource",
 		"onCommand:markdown.showPreviewSecuritySelector",
 		"onCommand:markdown.api.render",
-    "onCommand:notebook.showPreview",
+		"onCommand:notebook.showPreview",
 		"onWebviewPanel:markdown.preview",
 		"onCustomEditor:vscode.markdown.preview.editor"
 	],

src/sql/base/browser/ui/selectBox/selectBox.ts

@@ -128,8 +128,8 @@ export class SelectBox extends vsSelectBox {
 
 	private static createOptions(options: SelectOptionItemSQL[] | string[] | ISelectOptionItem[]): SelectOptionItemSQL[] {
 		let selectOptions: SelectOptionItemSQL[];
-		if (Array.isArray<string>(options) && typeof (options[0]) === 'string') {
+		if (Array.isArray(options) && typeof (options[0]) === 'string') {
-			selectOptions = options.map(o => {
+			selectOptions = (options as string[]).map(o => {
 				return { text: o, value: o } as SelectOptionItemSQL;
 			});
 		} else { // Handle both SelectOptionItemSql and ISelectOptionItem

src/sql/workbench/contrib/accounts/browser/accountManagement.contribution.ts

@@ -76,7 +76,7 @@ ExtensionsRegistry.registerExtensionPoint<IAccountContrib | IAccountContrib[]>({
 
 	for (let extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<IAccountContrib>(value)) {
+		if (Array.isArray(value)) {
 			for (let command of value) {
 				handleCommand(command, extension);
 			}

src/sql/workbench/contrib/connection/common/connectionProviderExtension.ts

@@ -199,7 +199,7 @@ function resolveIconPath(extension: IExtensionPointUser<any>): void {
 
 	let baseDir = extension.description.extensionLocation.fsPath;
 	let properties: ConnectionProviderProperties = extension.value;
-	if (Array.isArray<ConnectionProviderProperties>(properties)) {
+	if (Array.isArray(properties)) {
 		for (let p of properties) {
 			toAbsolutePath(p['iconPath']);
 		}

src/sql/workbench/contrib/dashboard/browser/containers/dashboardContainer.contribution.ts

@@ -103,7 +103,7 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardContainerContrib | IDashboar
 
 	for (const extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<IDashboardContainerContrib>(value)) {
+		if (Array.isArray(value)) {
 			for (const command of value) {
 				handleCommand(command, extension);
 			}

src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts

@@ -161,7 +161,7 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabCo
 
 	for (const extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<IDashboardTabContrib>(value)) {
+		if (Array.isArray(value)) {
 			for (const command of value) {
 				handleTab(command, extension);
 			}
@@ -215,7 +215,7 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabCo
 
 	for (const extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<IDashboardTabGroupContrib>(value)) {
+		if (Array.isArray(value)) {
 			for (const command of value) {
 				handleTabGroup(command, extension);
 			}

src/sql/workbench/contrib/dashboard/browser/dashboardRegistry.ts

@@ -298,7 +298,7 @@ ExtensionsRegistry.registerExtensionPoint<ProviderProperties | ProviderPropertie
 
 	for (let extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<ProviderProperties>(value)) {
+		if (Array.isArray(value)) {
 			for (let command of value) {
 				handleCommand(command, extension);
 			}

src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts

@@ -37,7 +37,7 @@ ExtensionsRegistry.registerExtensionPoint<IInsightTypeContrib | IInsightTypeCont
 
 	for (const extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<IInsightTypeContrib>(value)) {
+		if (Array.isArray(value)) {
 			for (const command of value) {
 				handleCommand(command, extension);
 			}

src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts

@@ -191,7 +191,7 @@ export class NotebookService extends Disposable implements INotebookService {
 			this._providers.set(p.id, new ProviderDescriptor());
 		}
 		if (registration.fileExtensions) {
-			if (Array.isArray<string>(registration.fileExtensions)) {
+			if (Array.isArray(registration.fileExtensions)) {
 				for (let fileType of registration.fileExtensions) {
 					this.addFileProvider(fileType, registration);
 				}

src/sql/workbench/services/notebook/common/notebookRegistry.ts

@@ -197,7 +197,7 @@ ExtensionsRegistry.registerExtensionPoint<NotebookProviderRegistration | Noteboo
 
 	for (let extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<NotebookProviderRegistration>(value)) {
+		if (Array.isArray(value)) {
 			for (let command of value) {
 				handleExtension(command, extension);
 			}
@@ -215,7 +215,7 @@ ExtensionsRegistry.registerExtensionPoint<NotebookLanguageMagicRegistration | No
 
 	for (let extension of extensions) {
 		const { value } = extension;
-		if (Array.isArray<NotebookLanguageMagicRegistration>(value)) {
+		if (Array.isArray(value)) {
 			for (let command of value) {
 				handleExtension(command, extension);
 			}

src/typings/lib.array-ext.d.ts

@@ -1,11 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-interface ArrayConstructor {
-	isArray<T>(arg: ReadonlyArray<T> | null | undefined): arg is ReadonlyArray<T>;
-	isArray<T>(arg: Array<T> | null | undefined): arg is Array<T>;
-	isArray(arg: any): arg is Array<any>;
-	isArray<T>(arg: any): arg is Array<T>;
-}

src/vs/base/browser/ui/selectBox/selectBoxCustom.ts

@@ -704,8 +704,8 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 		let elementWidth = 0;
 
 		if (container) {
-			let longest = -1;
+			let longest = 0;
-			let longestLength = -1;
+			let longestLength = 0;
 
 			this.options.forEach((option, index) => {
 				const len = option.text.length + (!!option.decoratorRight ? option.decoratorRight.length : 0);
@@ -715,9 +715,8 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 				}
 			});
 
-			if (longest >= 0) {
+
-				container.innerHTML = this.options[longest].text + (!!this.options[longest].decoratorRight ? (this.options[longest].decoratorRight + ' ') : '');
+			container.innerHTML = this.options[longest].text + (!!this.options[longest].decoratorRight ? (this.options[longest].decoratorRight + ' ') : '');
-			}
 
 			elementWidth = dom.getTotalWidth(container);
 		}

src/vs/base/browser/ui/tree/objectTreeModel.ts

@@ -189,7 +189,7 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		let childrenNodes = [...node.children] as ITreeNode<T, TFilterData>[];
 
 		if (recursive || first) {
-			childrenNodes = mergeSort(childrenNodes, this.sorter!.compare.bind(this.sorter)) as ITreeNode<T, TFilterData>[];
+			childrenNodes = mergeSort(childrenNodes, this.sorter!.compare.bind(this.sorter)) as ITreeNode<T, TFilterData>[]; // {{SQL CARBON EDIT}} strict-null-checks
 		}
 
 		return Iterable.map<ITreeNode<T | null, TFilterData>, ITreeElement<T>>(childrenNodes, node => ({

src/vs/base/common/uri.ts

@@ -383,7 +383,7 @@ export class URI implements UriComponents {
 	static revive(data: UriComponents | URI | undefined | null): URI | undefined | null;
 	static revive(data: UriComponents | URI | undefined | null): URI | undefined | null {
 		if (!data) {
-			// {{SQL CARBON EDIT}} @todo chlafren change back to data when we enable strict null checks
+			// {{SQL CARBON EDIT}} strict-null-check
 			return undefined;
 		} else if (data instanceof URI) {
 			return data;

src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts

@@ -18,7 +18,7 @@ interface IIPCEvent {
 function createScopedOnMessageEvent(senderId: number, eventName: string): Event<VSBuffer | null> {
 	const onMessage = Event.fromNodeEventEmitter<IIPCEvent>(ipcMain, eventName, (event, message) => ({ event, message }));
 	const onMessageFromSender = Event.filter(onMessage, ({ event }) => event.sender.id === senderId);
-	// {{SQL CARBON EDIT}} cast message as null since typescript isn't saying its always null
+	// {{SQL CARBON EDIT}} strict-null-checks
 	return Event.map(onMessageFromSender, ({ message }) => message ? VSBuffer.wrap(message) : message as null);
 }
 

src/vs/platform/userDataSync/common/userDataAutoSyncService.ts

@@ -57,7 +57,7 @@ export class UserDataAutoSyncEnablementService extends Disposable {
 				return true;
 			case 'off':
 				return false;
-			default: return this.storageService.getBoolean(enablementKey, StorageScope.GLOBAL, this.environmentService.enableSyncByDefault);
+			default: return this.storageService.getBoolean(enablementKey, StorageScope.GLOBAL, this.environmentService.enableSyncByDefault); // {{SQL CARBON EDIT}} strict-null-checks move this to a default case
 		}
 	}
 

src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts

@@ -127,13 +127,11 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	}
 
 	private static _reviveCodeActionDto(data: ReadonlyArray<ICodeActionDto>): modes.CodeAction[] {
-		let dataCast = data as unknown; // {{ SQL CARBON EDIT }}
+		if (data) {
-		let returnval = dataCast as modes.CodeAction[]; // {{ SQL CARBON EDIT }}
-		if (returnval) {
 			data.forEach(code => reviveWorkspaceEditDto(code.edit));
 		}
 
-		return <modes.CodeAction[]>returnval; // {{ SQL CARBON EDIT }}
+		return <modes.CodeAction[]><unknown>data; // {{SQL CARBON EDIT}} strict-null-check
 	}
 
 	private static _reviveLinkDTO(data: ILinkDto): modes.ILink {

src/vs/workbench/api/common/extHostNotebook.ts

@@ -1083,7 +1083,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		const provider = this._notebookContentProviders.get(viewType);
 		const revivedUri = URI.revive(uri);
 		if (!provider) {
-			return undefined; // {{SQL CARBON EDIT}}
+			return undefined; // {{SQL CARBON EDIT}} strict-null-checks
 		}
 
 		const storageRoot = this._extensionStoragePaths.workspaceValue(provider.extension) ?? this._extensionStoragePaths.globalValue(provider.extension);

src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts

@@ -302,7 +302,7 @@ export function appendStylizedStringToContainer(
 export function calcANSI8bitColor(colorNumber: number): RGBA | undefined {
 	if (colorNumber % 1 !== 0) {
 		// Should be integer
-		// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 this is necessary because we don't use strict null checks
+		// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 this is necessary because we don't use strict-null-checks
 		return undefined;
 	} if (colorNumber >= 16 && colorNumber <= 231) {
 		// Converts to one of 216 RGB colors
@@ -327,7 +327,7 @@ export function calcANSI8bitColor(colorNumber: number): RGBA | undefined {
 		const colorLevel: number = Math.round(colorNumber / 23 * 255);
 		return new RGBA(colorLevel, colorLevel, colorLevel);
 	} else {
-		// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 this is necessary because we don't use strict null checks
+		// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 this is necessary because we don't use strict-null-checks
 		return undefined;
 	}
 }

src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts

@@ -160,9 +160,6 @@ abstract class NotebookAction extends Action2 {
 		}
 
 		const activeCell = editor.getActiveCell();
-		if (!activeCell) {
-			return undefined; // {{SQL CARBON EDIT}} strict-null-checks
-		}
 
 		return {
 			cell: activeCell,

src/vs/workbench/contrib/notebook/browser/notebookEditor.ts

@@ -231,7 +231,6 @@ export class NotebookEditor extends EditorPane {
 				return group.activeEditorPane._widget.value?.getEditorViewState();
 			}
 		}
-
 		return undefined; // {{SQL CARBON EDIT}} strict-null-check
 	}
 

src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts

@@ -192,8 +192,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	get activeCodeEditor(): IEditor | undefined {
 		if (this._isDisposed) {
-			// {{SQL CARBON EDIT}}
+			return undefined; // {{SQL CARBON EDIT}} strict-null-check
-			return undefined;
 		}
 
 		const [focused] = this._list!.getFocusedElements();
@@ -769,14 +768,14 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
 
 				if (tokenSource.token.isCancellationRequested) {
-					return undefined; // {{ SQL CARBON EDIT }}
+					return undefined; // {{SQL CARBON EDIT}} strict-null-check
 				}
 
 				this._activeKernelResolvePromise = (this.activeKernel as INotebookKernelInfo2).resolve(this.viewModel!.uri, this.getId(), tokenSource.token);
 				await this._activeKernelResolvePromise;
 
 				if (tokenSource.token.isCancellationRequested) {
-					return undefined; // {{ SQL CARBON EDIT }}
+					return undefined; // {{SQL CARBON EDIT}} strict-null-check
 				}
 			}
 

src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts

@@ -306,7 +306,7 @@ export class SimpleFileDialog {
 
 			this.filePickBox.onDidCustom(() => {
 				if (isAcceptHandled || this.busy) {
-					return undefined; // {{SQL CARBON EDIT}} @todo anthonydresser return to return; when we do strict null checks
+					return undefined; // {{SQL CARBON EDIT}} @todo anthonydresser return to return; when we do strict-null-checks
 				}
 
 				isAcceptHandled = true;

src/vs/workbench/services/search/node/ripgrepFileSearch.ts

@@ -145,7 +145,7 @@ function globExprsToRgGlobs(patterns: glob.IExpression, folder?: string, exclude
 				}
 
 				globArgs.push(fixDriveC(key));
-				// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 cast value because we aren't using strict null checks
+				// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 cast value because we aren't using strict-null-checks
 			} else if (value && (<glob.SiblingClause>value).when) {
 				siblingClauses[key] = value;
 			}

src/vs/workbench/services/themes/browser/workbenchThemeService.ts

@@ -37,12 +37,11 @@ import { isWeb } from 'vs/base/common/platform';
 
 // implementation
 
-const DEFAULT_COLOR_THEME_ID = 'vs sql-theme-carbon-themes-light_carbon-json';
+const DEFAULT_COLOR_THEME_ID = 'vs sql-theme-carbon-themes-light_carbon-json'; // {{SQL CARBON EDIT}}
 
 const PERSISTED_OS_COLOR_SCHEME = 'osColorScheme';
 
-// {{SQL CARBON EDIT}}
+const defaultThemeExtensionId = 'sql-theme-carbon';// {{SQL CARBON EDIT}}
-const defaultThemeExtensionId = 'sql-theme-carbon';
 const oldDefaultThemeExtensionId = 'vscode-theme-colorful-defaults';
 
 const DEFAULT_FILE_ICON_THEME_ID = 'vscode.vscode-theme-seti-vs-seti';

src/vs/workbench/services/themes/common/themeConfiguration.ts

@@ -33,7 +33,7 @@ const colorThemeSettingEnumDescriptions: string[] = [];
 const colorThemeSettingSchema: IConfigurationPropertySchema = {
 	type: 'string',
 	description: nls.localize('colorTheme', "Specifies the color theme used in the workbench."),
-	default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_LIGHT_SETTING_VALUE,
+	default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_LIGHT_SETTING_VALUE, // {{SQL CARBON EDIT}}
 	enum: colorThemeSettingEnum,
 	enumDescriptions: colorThemeSettingEnumDescriptions,
 	errorMessage: nls.localize('colorThemeError', "Theme is unknown or not installed."),

src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts

@@ -141,7 +141,7 @@ suite.skip('TextSearch performance (integration)', () => {
 					let i = n;
 					return (function iterate(): Promise<undefined> | undefined {
 						if (!i--) {
-							return undefined;
+							return undefined; // {{SQL CARBON EDIT}} strict-null-checks
 						}
 
 						return runSearch()