Merge vscode 1.67 (#20883)

* Fix initial build breaks from 1.67 merge (#2514)

* Update yarn lock files

* Update build scripts

* Fix tsconfig

* Build breaks

* WIP

* Update yarn lock files

* Misc breaks

* Updates to package.json

* Breaks

* Update yarn

* Fix breaks

* Breaks

* Build breaks

* Breaks

* Breaks

* Breaks

* Breaks

* Breaks

* Missing file

* Breaks

* Breaks

* Breaks

* Breaks

* Breaks

* Fix several runtime breaks (#2515)

* Missing files

* Runtime breaks

* Fix proxy ordering issue

* Remove commented code

* Fix breaks with opening query editor

* Fix post merge break

* Updates related to setup build and other breaks (#2516)

* Fix bundle build issues

* Update distro

* Fix distro merge and update build JS files

* Disable pipeline steps

* Remove stats call

* Update license name

* Make new RPM dependencies a warning

* Fix extension manager version checks

* Update JS file

* Fix a few runtime breaks

* Fixes

* Fix runtime issues

* Fix build breaks

* Update notebook tests (part 1)

* Fix broken tests

* Linting errors

* Fix hygiene

* Disable lint rules

* Bump distro

* Turn off smoke tests

* Disable integration tests

* Remove failing "activate" test

* Remove failed test assertion

* Disable other broken test

* Disable query history tests

* Disable extension unit tests

* Disable failing tasks

src/sql/workbench/browser/actions/layoutActions.ts

@@ -5,7 +5,8 @@
 
 import { Action } from 'vs/base/common/actions';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { FocusedViewContext, IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
+import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
+import { IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 
 // --- Toggle View with Command

src/sql/workbench/browser/designer/designerPropertiesPane.ts

@@ -8,7 +8,7 @@ import { CreateComponentsFunc, DesignerUIComponent, SetComponentValueFunc } from
 import { DesignerViewModel, DesignerDataPropertyInfo, DesignerPropertyPath } from 'sql/workbench/browser/designer/interfaces';
 import * as DOM from 'vs/base/browser/dom';
 import { equals } from 'vs/base/common/objects';
-import { MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
+import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
 import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 

src/sql/workbench/browser/designer/designerScriptEditor.ts

@@ -8,7 +8,6 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/modelService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
@@ -21,7 +20,6 @@ import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IEditorOpenContext } from 'vs/workbench/common/editor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -30,6 +28,8 @@ import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { IModelService } from 'vs/editor/common/services/model';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 
 class DesignerCodeEditor extends CodeEditorWidget {
 }

src/sql/workbench/browser/editor/profiler/dashboardInput.ts

@@ -6,12 +6,12 @@
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { IModeService } from 'vs/editor/common/services/modeService';
 
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
+import { IModelService } from 'vs/editor/common/services/model';
+import { ILanguageService } from 'vs/editor/common/languages/language';
 
 export class DashboardInput extends EditorInput {
 
@@ -35,7 +35,7 @@ export class DashboardInput extends EditorInput {
 	constructor(
 		_connectionProfile: IConnectionProfile,
 		@IConnectionManagementService private _connectionService: IConnectionManagementService,
-		@IModeService modeService: IModeService,
+		@ILanguageService modeService: ILanguageService,
 		@IModelService model: IModelService
 	) {
 		super();
@@ -47,7 +47,7 @@ export class DashboardInput extends EditorInput {
 		// vscode has a comment that Mode's will eventually be removed (not sure the state of this comment)
 		// so this might be able to be undone when that happens
 		if (!model.getModel(this.resource)) {
-			model.createModel('', modeService.create('dashboard'), this.resource);
+			model.createModel('', modeService.createById('dashboard'), this.resource);
 		}
 		this._initializedPromise = _connectionService.connectIfNotConnected(_connectionProfile, 'dashboard').then(
 			u => {

src/sql/workbench/browser/modal/calloutDialog.ts

@@ -10,9 +10,9 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
 
 export abstract class CalloutDialog<T> extends Modal {
 

src/sql/workbench/browser/modal/modal.ts

@@ -21,7 +21,6 @@ import { IThemable } from 'vs/base/common/styler';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { localize } from 'vs/nls';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -30,6 +29,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Emitter } from 'vs/base/common/event';
+import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
 
 export enum MessageLevel {
 	Error = 0,

src/sql/workbench/browser/modal/optionsDialog.ts

@@ -24,12 +24,12 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { append, $, clearNode } from 'vs/base/browser/dom';
 import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 import { attachModalDialogStyler } from 'sql/workbench/common/styler';
 import { ServiceOptionType } from 'sql/platform/connection/common/interfaces';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { GroupHeaderBackground } from 'sql/platform/theme/common/colorRegistry';
+import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
 
 export interface IOptionsDialogOptions extends IModalOptions {
 	cancelLabel?: string;

src/sql/workbench/browser/modelComponents/diffeditor.component.ts

@@ -12,8 +12,6 @@ import * as DOM from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
 import { URI } from 'vs/base/common/uri';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { IModelService } from 'vs/editor/common/services/modelService';
 
 import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
 import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
@@ -30,6 +28,8 @@ import { convertSizeToNumber } from 'sql/base/browser/dom';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IModelService } from 'vs/editor/common/services/model';
+import { ILanguageService } from 'vs/editor/common/languages/language';
 
 @Component({
 	template: `
@@ -58,7 +58,7 @@ export default class DiffEditorComponent extends ComponentBase<azdata.DiffEditor
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef,
 		@Inject(IInstantiationService) private _instantiationService: IInstantiationService,
 		@Inject(IModelService) private _modelService: IModelService,
-		@Inject(IModeService) private _modeService: IModeService,
+		@Inject(ILanguageService) private _modeService: ILanguageService,
 		@Inject(ITextModelService) private _textModelService: ITextModelService,
 		@Inject(ILogService) logService: ILogService,
 		@Inject(IEditorService) private _editorService: IEditorService,
@@ -89,7 +89,7 @@ export default class DiffEditorComponent extends ComponentBase<azdata.DiffEditor
 		let textModelContentProvider = this._textModelService.registerTextModelContentProvider('sqlDiffEditor', {
 			provideTextContent: (resource: URI): Promise<ITextModel> => {
 				let modelContent = '';
-				let languageSelection = this._modeService.create('plaintext');
+				let languageSelection = this._modeService.createById('plaintext');
 				return Promise.resolve(this._modelService.createModel(modelContent, languageSelection, resource));
 			}
 		});
@@ -153,7 +153,7 @@ export default class DiffEditorComponent extends ComponentBase<azdata.DiffEditor
 	private updateLanguageMode() {
 		if (this._editorModel && this._editor) {
 			this._languageMode = this.languageMode;
-			let languageSelection = this._modeService.create(this._languageMode);
+			let languageSelection = this._modeService.createById(this._languageMode);
 			this._modelService.setMode(this._editorModel.originalModel.textEditorModel, languageSelection);
 			this._modelService.setMode(this._editorModel.modifiedModel.textEditorModel, languageSelection);
 		}

src/sql/workbench/browser/modelComponents/editor.component.ts

@@ -13,8 +13,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ITextModel } from 'vs/editor/common/model';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { IModelService } from 'vs/editor/common/services/modelService';
 
 import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
 import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor';
@@ -26,6 +24,8 @@ import { SimpleProgressIndicator } from 'sql/workbench/services/progress/browser
 import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/platform/dashboard/browser/interfaces';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { convertSizeToNumber } from 'sql/base/browser/dom';
+import { IModelService } from 'vs/editor/common/services/model';
+import { ILanguageService } from 'vs/editor/common/languages/language';
 
 @Component({
 	template: '',
@@ -48,7 +48,7 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef,
 		@Inject(IInstantiationService) private _instantiationService: IInstantiationService,
 		@Inject(IModelService) private _modelService: IModelService,
-		@Inject(IModeService) private _modeService: IModeService,
+		@Inject(ILanguageService) private _modeService: ILanguageService,
 		@Inject(ILogService) private _logService: ILogService,
 		@Inject(IEditorService) private readonly editorService: IEditorService,
 		@Inject(ILogService) logService: ILogService
@@ -71,7 +71,7 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
 		this._editor.setVisible(true);
 		let uri = this.createUri();
 
-		this._editorInput = await this.editorService.createEditorInput({ forceUntitled: true, resource: uri, mode: 'plaintext' }) as UntitledTextEditorInput;
+		this._editorInput = await this.editorService.createEditorInput({ forceUntitled: true, resource: uri, languageId: 'plaintext' }) as UntitledTextEditorInput;
 
 		await this._editor.setInput(this._editorInput, undefined, undefined);
 		const model = await this._editorInput.resolve();
@@ -141,7 +141,7 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
 	private updateLanguageMode() {
 		if (this._editorModel && this._editor) {
 			this._languageMode = this.languageMode;
-			let languageSelection = this._modeService.create(this._languageMode);
+			let languageSelection = this._modeService.createById(this._languageMode);
 			this._modelService.setMode(this._editorModel, languageSelection);
 		}
 	}

src/sql/workbench/browser/modelComponents/queryTextEditor.ts

@@ -14,7 +14,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IEditorOpenContext } from 'vs/workbench/common/editor';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -24,6 +23,7 @@ import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/u
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 
 /**
  * Extension of TextResourceEditor that is always readonly rather than only with non UntitledInputs

src/sql/workbench/browser/modelComponents/treeViewDataProvider.ts

@@ -4,15 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 // eslint-disable-next-line code-import-patterns
-import { ExtHostModelViewTreeViewsShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { ExtHostModelViewTreeViewsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 // eslint-disable-next-line code-import-patterns
-import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 // eslint-disable-next-line code-import-patterns
 import * as vsTreeView from 'vs/workbench/api/browser/mainThreadTreeViews';
 import { ResolvableTreeItem } from 'vs/workbench/common/views';
 import { deepClone } from 'vs/base/common/objects';
+import { IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
+import { SqlExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 
 export class ResolvableTreeComponentItem extends ResolvableTreeItem implements ITreeComponentItem {
 

src/sql/workbench/browser/parts/editor/editorStatusModeSelect.ts

@@ -11,15 +11,15 @@ import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 
 import { ILanguageAssociationRegistry, Extensions as LanguageAssociationExtensions } from 'sql/workbench/services/languageAssociation/common/languageAssociation';
-import { IModeSupport } from 'vs/workbench/services/textfile/common/textfiles';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { ILanguageSupport } from 'vs/workbench/services/textfile/common/textfiles';
 
 const languageAssociationRegistry = Registry.as<ILanguageAssociationRegistry>(LanguageAssociationExtensions.LanguageAssociations);
 
 /**
  * Handles setting a mode from the editor status and converts inputs if necessary
  */
-export async function setMode(accessor: ServicesAccessor, modeSupport: IModeSupport, activeEditor: EditorInput, language: string): Promise<void> {
+export async function setLanguageId(accessor: ServicesAccessor, modeSupport: ILanguageSupport, activeEditor: EditorInput, language: string): Promise<void> {
 	const editorService = accessor.get(IEditorService);
 	const activeWidget = getCodeEditor(editorService.activeTextEditorControl);
 	const activeControl = editorService.activeEditorPane;
@@ -33,7 +33,7 @@ export async function setMode(accessor: ServicesAccessor, modeSupport: IModeSupp
 			notificationService.error(localize('languageChangeUnsupported', "Changing editor types on unsaved files is unsupported"));
 			return;
 		}
-		modeSupport.setMode(language);
+		modeSupport.setLanguageId(language);
 		let input: EditorInput;
 		if (oldInputCreator) { // only transform the input if we have someone who knows how to deal with it (e.x QueryInput -> UntitledInput, etc)
 			input = oldInputCreator.createBase(activeEditor);