Merge from vscode merge-base (#22780)

* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"

This reverts commit 47a1745180.

* Fix notebook download task

* Remove done call from extensions-ci

src/sql/workbench/services/accountManagement/browser/accountManagementService.ts

@@ -67,7 +67,7 @@ export class AccountManagementService implements IAccountManagementService {
 		@IAdsTelemetryService private _telemetryService: IAdsTelemetryService
 	) {
 		this._mementoContext = new Memento(AccountManagementService.ACCOUNT_MEMENTO, this._storageService);
-		const mementoObj = this._mementoContext.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
+		const mementoObj = this._mementoContext.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE);
 		this._accountStore = this._instantiationService.createInstance(AccountStore, mementoObj);
 
 		// Setup the event emitters

src/sql/workbench/services/connection/browser/connectionManagementService.ts

@@ -123,7 +123,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		this._connectionStatusManager = _instantiationService.createInstance(ConnectionStatusManager);
 		if (this._storageService) {
 			this._mementoContext = new Memento(ConnectionManagementService.CONNECTION_MEMENTO, this._storageService);
-			this._mementoObj = this._mementoContext.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
+			this._mementoObj = this._mementoContext.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE);
 		}
 
 		this.initializeConnectionProvidersMap();

src/sql/workbench/services/insights/common/insightsUtils.ts

@@ -12,6 +12,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 
+/* eslint-disable */
 /**
  * Resolves the given file path using the VS ConfigurationResolver service, replacing macros such as
  * ${workspaceRoot} with their expected values and then testing each path to see if it exists. It will
@@ -58,3 +59,4 @@ export async function resolveQueryFilePath(services: ServicesAccessor, filePath?
 
 	throw Error(localize('insightsDidNotFindResolvedFile', "Could not find query file at any of the following paths :\n {0}", resolvedFileUris.map(uri => uri.fsPath).join('\n')));
 }
+/* eslint-enable */

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

@@ -15,7 +15,7 @@ import { INotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes
 import { ICellModel, INotebookModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
 import { NotebookChangeType, CellType } from 'sql/workbench/services/notebook/common/contracts';
 import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams';
-import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
+import { AbstractTextCodeEditor } from 'vs/workbench/browser/parts/editor/textCodeEditor';
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorPane } from 'vs/workbench/common/editor';
 import { INotebookInput } from 'sql/workbench/services/notebook/browser/interface';
@@ -196,7 +196,7 @@ export interface INotebookSection {
 export interface ICellEditorProvider {
 	isCellOutput: boolean;
 	cellGuid(): string;
-	getEditor(): BaseTextEditor<ICodeEditorViewState> | undefined;
+	getEditor(): AbstractTextCodeEditor<ICodeEditorViewState> | undefined;
 	deltaDecorations(newDecorationsRange: NotebookRange | NotebookRange[], oldDecorationsRange: NotebookRange | NotebookRange[]): void;
 }
 

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

@@ -866,11 +866,11 @@ export class NotebookService extends Disposable implements INotebookService {
 	}
 
 	private get providersMemento(): NotebookProvidersMemento {
-		return this._providersMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE) as NotebookProvidersMemento;
+		return this._providersMemento.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE) as NotebookProvidersMemento;
 	}
 
 	private get trustedNotebooksMemento(): TrustedNotebooksMemento {
-		let cache = this._trustedNotebooksMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE) as TrustedNotebooksMemento;
+		let cache = this._trustedNotebooksMemento.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE) as TrustedNotebooksMemento;
 		if (!cache.trustedNotebooksCache) {
 			cache.trustedNotebooksCache = {};
 		}

src/sql/workbench/services/objectExplorer/browser/asyncServerTree.ts

@@ -12,12 +12,11 @@ import { IAsyncDataTreeNode, IAsyncDataTreeUpdateChildrenOptions } from 'vs/base
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { IAsyncDataSource, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export class AsyncServerTree extends WorkbenchAsyncDataTree<ConnectionProfileGroup, ServerTreeElement, FuzzyScore> {
 
@@ -32,14 +31,13 @@ export class AsyncServerTree extends WorkbenchAsyncDataTree<ConnectionProfileGro
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IAccessibilityService accessibilityService: IAccessibilityService,
+		@IInstantiationService instantiationService: IInstantiationService
 	) {
 		super(
 			user, container, delegate,
 			renderers, dataSource, options,
-			contextKeyService, listService,
-			themeService, configurationService, keybindingService, accessibilityService);
+			instantiationService, contextKeyService, listService,
+			themeService, configurationService);
 
 		// Adding support for expand/collapse on enter/space
 		this.onKeyDown(e => {

src/sql/workbench/services/profiler/browser/profilerService.ts

@@ -72,7 +72,7 @@ export class ProfilerService implements IProfilerService {
 		@IStorageService private _storageService: IStorageService
 	) {
 		this._context = new Memento('ProfilerEditor', this._storageService);
-		this._memento = this._context.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
+		this._memento = this._context.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE);
 	}
 
 	public registerProvider(providerId: string, provider: azdata.ProfilerProvider): void {