Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>

src/sql/platform/accounts/common/accountActions.ts

@@ -45,7 +45,7 @@ export class AddAccountAction extends Action {
 		this._addAccountStartEmitter = new Emitter<void>();
 	}
 
-	public async run(): Promise<void> {
+	public override async run(): Promise<void> {
 
 		// Fire the event that we've started adding accounts
 		this._addAccountStartEmitter.fire();
@@ -76,7 +76,7 @@ export class RemoveAccountAction extends Action {
 		super(RemoveAccountAction.ID, RemoveAccountAction.LABEL, 'remove-account-action codicon remove');
 	}
 
-	public async run(): Promise<void> {
+	public override async run(): Promise<void> {
 		// Ask for Confirm
 		const confirm: IConfirmation = {
 			message: localize('confirmRemoveUserAccountMessage', "Are you sure you want to remove '{0}'?", this._account.displayInfo.displayName),
@@ -113,7 +113,7 @@ export class ApplyFilterAction extends Action {
 		super(id, label, 'apply-filters-action codicon filter');
 	}
 
-	public async run(): Promise<void> {
+	public override async run(): Promise<void> {
 		// Todo: apply filter to the account
 	}
 }
@@ -132,7 +132,7 @@ export class RefreshAccountAction extends Action {
 	) {
 		super(RefreshAccountAction.ID, RefreshAccountAction.LABEL, 'refresh-account-action codicon refresh');
 	}
-	public async run(): Promise<void> {
+	public override async run(): Promise<void> {
 		if (this.account) {
 			try {
 				await this._accountManagementService.refreshAccount(this.account);

src/sql/platform/accounts/test/common/accountStore.test.ts

@@ -7,9 +7,9 @@ import * as assert from 'assert';
 import * as azdata from 'azdata';
 import AccountStore from 'sql/platform/accounts/common/accountStore';
 import { EventVerifierSingle } from 'sql/base/test/common/event';
-import { ConsoleLogService } from 'vs/platform/log/common/log';
+import { ConsoleLogger, LogService } from 'vs/platform/log/common/log';
 
-const consoleLogService = new ConsoleLogService;
+const consoleLogService = new LogService(new ConsoleLogger());
 suite('Account Store Tests', () => {
 	test('AddOrUpdate - Uninitialized memento', () => {
 		// Setup: Create account store w/o initialized memento

src/sql/platform/actions/browser/menuEntryActionViewItem.ts

@@ -25,15 +25,15 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
 	private _labeledItemClassDispose?: IDisposable;
 
 	constructor(
-		public _action: MenuItemAction,
+		_action: MenuItemAction,
 		@IKeybindingService labeledkeybindingService: IKeybindingService,
-		@INotificationService protected _notificationService: INotificationService,
+		@INotificationService _notificationService: INotificationService,
 		private readonly _defaultCSSClassToAdd: string = ''
 	) {
 		super(_action, labeledkeybindingService, _notificationService);
 	}
 
-	updateLabel(): void {
+	override updateLabel(): void {
 		if (this.label) {
 			this.label.innerText = this._commandAction.label;
 		}
@@ -41,7 +41,7 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
 
 	// Overwrite item class to ensure that we can pass in a CSS class that other items use
 	// Leverages the _defaultCSSClassToAdd property that's passed into the constructor
-	protected _updateItemClass(item: ICommandAction): void {
+	protected override _updateItemClass(item: ICommandAction): void {
 		dispose(this._labeledItemClassDispose);
 		this._labeledItemClassDispose = undefined;
 
@@ -79,7 +79,7 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
 		}
 	}
 
-	dispose(): void {
+	override dispose(): void {
 		if (this._labeledItemClassDispose) {
 			dispose(this._labeledItemClassDispose);
 			this._labeledItemClassDispose = undefined;
@@ -98,15 +98,15 @@ export class MaskedLabeledMenuItemActionItem extends MenuEntryActionViewItem {
 	private _labeledItemClassDispose?: IDisposable;
 
 	constructor(
-		public _action: MenuItemAction,
+		_action: MenuItemAction,
 		@IKeybindingService labeledkeybindingService: IKeybindingService,
-		@INotificationService protected _notificationService: INotificationService,
+		@INotificationService _notificationService: INotificationService,
 		private readonly _defaultCSSClassToAdd: string = ''
 	) {
 		super(_action, labeledkeybindingService, _notificationService);
 	}
 
-	updateLabel(): void {
+	override updateLabel(): void {
 		if (this.label) {
 			this.label.innerText = this._commandAction.label;
 		}
@@ -114,7 +114,7 @@ export class MaskedLabeledMenuItemActionItem extends MenuEntryActionViewItem {
 
 	// Overwrite item class to ensure that we can pass in a CSS class that other items use
 	// Leverages the _defaultCSSClassToAdd property that's passed into the constructor
-	protected _updateItemClass(item: ICommandAction): void {
+	protected override _updateItemClass(item: ICommandAction): void {
 		dispose(this._labeledItemClassDispose);
 		this._labeledItemClassDispose = undefined;
 
@@ -153,7 +153,7 @@ export class MaskedLabeledMenuItemActionItem extends MenuEntryActionViewItem {
 		}
 	}
 
-	dispose(): void {
+	override dispose(): void {
 		if (this._labeledItemClassDispose) {
 			dispose(this._labeledItemClassDispose);
 			this._labeledItemClassDispose = undefined;

src/sql/platform/clipboard/electron-browser/clipboardService.ts

@@ -9,7 +9,6 @@ import { BrowserClipboardService } from 'sql/platform/clipboard/browser/clipboar
 import { clipboard, nativeImage } from 'electron';
 
 export class ClipboardService extends BrowserClipboardService {
-	_serviceBrand: undefined;
 
 	constructor(
 		@vsIClipboardService _vsClipboardService: vsIClipboardService,
@@ -21,7 +20,7 @@ export class ClipboardService extends BrowserClipboardService {
 	/**
 	 * Writes the input image as a dataurl to the clipbaord
 	 */
-	async writeImageDataUrl(data: string): Promise<void> {
+	override async writeImageDataUrl(data: string): Promise<void> {
 		let image = nativeImage.createFromDataURL(data);
 		return clipboard.writeImage(image);
 	}

src/sql/platform/connection/common/connectionProfile.ts

@@ -175,7 +175,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 		return (this._groupName === ConnectionProfile.RootGroupName);
 	}
 
-	public clone(): ConnectionProfile {
+	public override clone(): ConnectionProfile {
 		let instance = new ConnectionProfile(this.capabilitiesService, this);
 		return instance;
 	}
@@ -205,7 +205,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 	 * This key uniquely identifies a connection in a group
 	 * Example: "providerName:MSSQL|authenticationType:|databaseName:database|serverName:server3|userName:user|group:testid"
 	 */
-	public getOptionsKey(): string {
+	public override getOptionsKey(): string {
 		let id = super.getOptionsKey();
 		let databaseDisplayName: string = this.options['databaseDisplayName'];
 		if (databaseDisplayName) {

src/sql/platform/connection/common/providerConnectionInfo.ts

@@ -86,7 +86,7 @@ export class ProviderConnectionInfo extends Disposable implements azdata.Connect
 		}
 	}
 
-	public dispose(): void {
+	public override dispose(): void {
 		if (this._onCapabilitiesRegisteredDisposable) {
 			dispose(this._onCapabilitiesRegisteredDisposable);
 		}

src/sql/platform/connection/test/node/connectionStatusManager.test.ts

@@ -16,6 +16,7 @@ import { NullLogService } from 'vs/platform/log/common/log';
 import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
 import { assign } from 'vs/base/common/objects';
+import product from 'vs/platform/product/common/product';
 
 let connections: ConnectionStatusManager;
 let capabilitiesService: TestCapabilitiesService;
@@ -81,7 +82,7 @@ suite('SQL ConnectionStatusManager tests', () => {
 		capabilitiesService = new TestCapabilitiesService();
 		connectionProfileObject = new ConnectionProfile(capabilitiesService, connectionProfile);
 
-		const environmentService = new NativeEnvironmentService(parseArgs(process.argv, OPTIONS));
+		const environmentService = new NativeEnvironmentService(parseArgs(process.argv, OPTIONS), { _serviceBrand: undefined, ...product });
 		connections = new ConnectionStatusManager(capabilitiesService, new NullLogService(), environmentService, new TestNotificationService());
 		connection1Id = Utils.generateUri(connectionProfile);
 		connection2Id = 'connection2Id';

src/sql/platform/instantiation/test/common/instantiationServiceMock.ts

@@ -24,7 +24,7 @@ export class TestInstantiationService extends VsTestInstantiationService {
 		this._createInstanceStubsMap.set(ctorOrDescriptor, obj);
 	}
 
-	createInstance(ctorOrDescriptor: any | SyncDescriptor<any>, ...rest: any[]): any {
+	override createInstance(ctorOrDescriptor: any | SyncDescriptor<any>, ...rest: any[]): any {
 		if (this._createInstanceStubsMap.has(ctorOrDescriptor)) {
 			return this._createInstanceStubsMap.get(ctorOrDescriptor);
 		}