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/workbench/common/editor/query/queryEditorInput.ts

@@ -177,17 +177,17 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
 	public get text(): AbstractTextResourceEditorInput { return this._text; }
 	public get results(): QueryResultsInput { return this._results; }
 	// Description is shown beside the tab name in the combobox of open editors
-	public getDescription(): string | undefined { return this._description; }
+	public override getDescription(): string | undefined { return this._description; }
 	public supportsSplitEditor(): boolean { return false; }
-	public revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {
+	public override revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {
 		return this._text.revert(group, options);
 	}
 
-	public isReadonly(): boolean {
+	public override isReadonly(): boolean {
 		return false;
 	}
 
-	public matches(otherInput: any): boolean {
+	public override matches(otherInput: any): boolean {
 		// we want to be able to match against our underlying input as well, bascially we are our underlying input
 		if (otherInput instanceof QueryEditorInput) {
 			return this._text.matches(otherInput._text);
@@ -197,10 +197,10 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
 	}
 
 	// Forwarding resource functions to the inline sql file editor
-	public isDirty(): boolean { return this._text.isDirty(); }
+	public override isDirty(): boolean { return this._text.isDirty(); }
 	public get resource(): URI { return this._text.resource; }
 
-	public getName(longForm?: boolean): string {
+	public override getName(longForm?: boolean): string {
 		if (this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').showConnectionInfoInTitle) {
 			let profile = this.connectionManagementService.getConnectionProfile(this.uri);
 			let title = '';
@@ -222,16 +222,16 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
 		}
 	}
 
-	save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
+	override save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
 		return this.text.save(group, options);
 	}
 
-	saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
+	override saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
 		return this.text.saveAs(group, options);
 	}
 
 	// Called to get the tooltip of the tab
-	public getTitle(): string {
+	public override getTitle(): string {
 		return this.getName(true);
 	}
 
@@ -313,7 +313,7 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
 		return this.connectionManagementService.getTabColorForUri(this.uri);
 	}
 
-	public dispose() {
+	public override dispose() {
 		super.dispose(); // we want to dispose first so that for future logic we know we are disposed
 		this.queryModelService.disposeQuery(this.uri);
 		this.connectionManagementService.disconnectEditor(this, true);

src/sql/workbench/common/editor/query/queryResultsInput.ts

@@ -50,15 +50,15 @@ export class QueryResultsInput extends EditorInput {
 		super();
 	}
 
-	getTypeId(): string {
+	override get typeId(): string {
 		return QueryResultsInput.ID;
 	}
 
-	getName(): string {
+	override getName(): string {
 		return localize('extensionsInputName', "Extension");
 	}
 
-	matches(other: any): boolean {
+	override matches(other: any): boolean {
 		if (other instanceof QueryResultsInput) {
 			return (other._uri === this._uri);
 		}
@@ -66,7 +66,7 @@ export class QueryResultsInput extends EditorInput {
 		return false;
 	}
 
-	resolve(refresh?: boolean): Promise<any> {
+	override resolve(refresh?: boolean): Promise<any> {
 		return Promise.resolve(null);
 	}
 
@@ -74,7 +74,7 @@ export class QueryResultsInput extends EditorInput {
 		return false;
 	}
 
-	public dispose(): void {
+	public override dispose(): void {
 		super.dispose();
 	}
 

src/sql/workbench/common/editor/query/untitledQueryEditorInput.ts

@@ -8,11 +8,11 @@ import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResult
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
 
-import { IEncodingSupport, EncodingMode } from 'vs/workbench/common/editor';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
+import { EncodingMode, IEncodingSupport } from 'vs/workbench/services/textfile/common/textfiles';
 
 export class UntitledQueryEditorInput extends QueryEditorInput implements IEncodingSupport {
 
@@ -29,11 +29,11 @@ export class UntitledQueryEditorInput extends QueryEditorInput implements IEncod
 		super(description, text, results, connectionManagementService, queryModelService, configurationService);
 	}
 
-	public resolve(): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel> {
+	public override resolve(): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel> {
 		return this.text.resolve();
 	}
 
-	public get text(): UntitledTextEditorInput {
+	public override get text(): UntitledTextEditorInput {
 		return this._text as UntitledTextEditorInput;
 	}
 
@@ -49,7 +49,7 @@ export class UntitledQueryEditorInput extends QueryEditorInput implements IEncod
 		return this.text.getMode();
 	}
 
-	public getTypeId(): string {
+	override get typeId(): string {
 		return UntitledQueryEditorInput.ID;
 	}
 
@@ -57,11 +57,11 @@ export class UntitledQueryEditorInput extends QueryEditorInput implements IEncod
 		return this.text.getEncoding();
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
-		this.text.setEncoding(encoding, mode);
+	public setEncoding(encoding: string, mode: EncodingMode): Promise<void> {
+		return this.text.setEncoding(encoding, mode);
 	}
 
-	isUntitled(): boolean {
+	override isUntitled(): boolean {
 		// Subclasses need to explicitly opt-in to being untitled.
 		return true;
 	}

src/sql/workbench/common/styler.ts

@@ -11,9 +11,9 @@ import { IThemable } from 'vs/base/common/styler';
 import { attachStyler, IStyleOverrides } from 'vs/platform/theme/common/styler';
 import {
 	SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND,
-	PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, VERTICAL_TAB_ACTIVE_BACKGROUND, DASHBOARD_BORDER,
-
+	PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND
 } from 'vs/workbench/common/theme';
+import { VERTICAL_TAB_ACTIVE_BACKGROUND, DASHBOARD_BORDER } from 'sql/workbench/common/theme';
 
 export interface IModalDialogStyleOverrides extends IStyleOverrides {
 	dialogForeground?: cr.ColorIdentifier,

src/sql/workbench/common/theme.ts

@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { registerColor, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { Color, RGBA } from 'vs/base/common/color';
+import { TAB_ACTIVE_BACKGROUND } from 'vs/workbench/common/theme';
+
+export const VERTICAL_TAB_ACTIVE_BACKGROUND = registerColor('tab.verticalTabActiveBackground', {
+	dark: '#444444',
+	light: '#e1f0fe',
+	hc: TAB_ACTIVE_BACKGROUND
+}, localize('verticalTabActiveBackground', "Active tab background color for vertical tabs"));
+
+export const DASHBOARD_BORDER = registerColor('dashboard.border', {
+	dark: '#8A8886',
+	light: '#DDDDDD',
+	hc: contrastBorder
+}, localize('dashboardBorder', "Color for borders in dashboard"));
+
+export const DASHBOARD_WIDGET_TITLE = registerColor('dashboardWidget.title', {
+	light: '#323130',
+	dark: '#FFFFFF',
+	hc: '#FFFFFF'
+}, localize('dashboardWidget', 'Color of dashboard widget title'));
+
+export const DASHBOARD_WIDGET_SUBTEXT = registerColor('dashboardWidget.subText', {
+	light: '#484644',
+	dark: '#8A8886',
+	hc: '#FFFFFF'
+}, localize('dashboardWidgetSubtext', "Color for dashboard widget subtext"));
+
+export const PROPERTIES_CONTAINER_PROPERTY_VALUE = registerColor('propertiesContainer.propertyValue', {
+	light: '#000000',
+	dark: 'FFFFFF',
+	hc: 'FFFFFF'
+}, localize('propertiesContainerPropertyValue', "Color for property values displayed in the properties container component"));
+
+export const PROPERTIES_CONTAINER_PROPERTY_NAME = registerColor('propertiesContainer.propertyName', {
+	light: '#161616',
+	dark: '#8A8886',
+	hc: '#FFFFFF'
+}, localize('propertiesContainerPropertyName', "Color for property names displayed in the properties container component"));
+
+export const TOOLBAR_OVERFLOW_SHADOW = registerColor('toolbar.overflowShadow', {
+	light: new Color(new RGBA(0, 0, 0, .132)),
+	dark: new Color(new RGBA(0, 0, 0, 0.25)),
+	hc: null
+}, localize('toolbarOverflowShadow', "Toolbar overflow shadow color"));