Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features

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

@@ -112,14 +112,14 @@ export class QueryTextEditor extends BaseTextEditor {
 
 	public setWidth(width: number) {
 		if (this._dimension) {
-			this._dimension.width = width;
+			this._dimension = new DOM.Dimension(width, this._dimension.height);
 			this.layout();
 		}
 	}
 
 	public setHeight(height: number) {
 		if (this._dimension) {
-			this._dimension.height = height;
+			this._dimension = new DOM.Dimension(this._dimension.width, height);
 			this.layout(this._dimension);
 		}
 	}

src/sql/workbench/common/enablePreviewFeatures.ts

@@ -5,13 +5,12 @@
 
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { localize } from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
 
 export class EnablePreviewFeatures implements IWorkbenchContribution {
 
@@ -19,11 +18,9 @@ export class EnablePreviewFeatures implements IWorkbenchContribution {
 
 	constructor(
 		@IStorageService storageService: IStorageService,
-		@IOpenerService openerService: IOpenerService,
 		@INotificationService notificationService: INotificationService,
 		@IWindowService windowService: IWindowService,
-		@IWindowsService windowsService: IWindowsService,
-		@ITelemetryService telemetryService: ITelemetryService,
+		@IHostService hostService: IHostService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		let previewFeaturesEnabled = configurationService.getValue('workbench')['enablePreviewFeatures'];
@@ -32,7 +29,7 @@ export class EnablePreviewFeatures implements IWorkbenchContribution {
 		}
 		Promise.all([
 			windowService.isFocused(),
-			windowsService.getWindowCount()
+			hostService.windowCount
 		]).then(([focused, count]) => {
 			if (!focused && count > 1) {
 				return null;

src/sql/workbench/common/workspaceActions.ts

@@ -5,16 +5,17 @@
 
 import { Action } from 'vs/base/common/actions';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
-import { URI } from 'vs/base/common/uri';
+//tslint:disable-next-line:layering
+import { ElectronMainService } from 'vs/platform/electron/electron-main/electronMainService';
 
 export class ShowFileInFolderAction extends Action {
 
-	constructor(private path: string, label: string, private windowsService: IWindowsService) {
+	constructor(private path: string, label: string, private windowsService: ElectronMainService) {
 		super('showItemInFolder.action.id', label);
 	}
 
 	run(): Promise<void> {
-		return this.windowsService.showItemInFolder(URI.file(this.path));
+		return this.windowsService.showItemInFolder(this.path);
 	}
 }
 

src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts

@@ -6,9 +6,6 @@
 import { escape } from 'vs/base/common/strings';
 import { localize } from 'vs/nls';
 
-export function used() {
-}
-
 let productQuality: string;
 
 export function setProductQuality(quality: string): void {

src/sql/workbench/parts/query/browser/queryEditor.ts

@@ -22,7 +22,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { SplitView, Sizing } from 'vs/base/browser/ui/splitview/splitview';
 import { Event } from 'vs/base/common/event';
-import { dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { ISelectionData } from 'azdata';
 import { Action, IActionViewItem } from 'vs/base/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

src/sql/workbench/parts/query/common/resultSerializer.ts

@@ -4,14 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
-import * as Constants from 'sql/workbench/parts/query/common/constants';
 import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants';
 import { SaveResultsRequestParams } from 'azdata';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
 import { ISaveRequest, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces';
 
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IWindowsService, FileFilter } from 'vs/platform/windows/common/windows';
+import { FileFilter } from 'vs/platform/windows/common/windows';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { URI } from 'vs/base/common/uri';
 import * as path from 'vs/base/common/path';
@@ -26,6 +25,7 @@ import { getRootPath, resolveCurrentDirectory, resolveFilePath } from 'sql/platf
 import { IOutputService, IOutputChannelRegistry, IOutputChannel, Extensions as OutputExtensions } from 'vs/workbench/contrib/output/common/output';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 let prevSavePath: string;
 
@@ -60,9 +60,9 @@ export class ResultSerializer {
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@IEditorService private _editorService: IEditorService,
 		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
-		@IWindowsService private _windowsService: IWindowsService,
 		@IFileDialogService private readonly fileDialogService: IFileDialogService,
-		@INotificationService private _notificationService: INotificationService
+		@INotificationService private _notificationService: INotificationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) { }
 
 	/**
@@ -313,14 +313,14 @@ export class ResultSerializer {
 			[{
 				label: nls.localize('openLocation', "Open file location"),
 				run: () => {
-					let action = new ShowFileInFolderAction(savedFilePath, label || path.sep, this._windowsService);
+					let action = this._instantiationService.createInstance(ShowFileInFolderAction, savedFilePath, label || path.sep);
 					action.run();
 					action.dispose();
 				}
 			}, {
 				label: nls.localize('openFile', "Open file"),
 				run: () => {
-					let action = new OpenFileInFolderAction(savedFilePath, label || path.sep, this._windowsService);
+					let action = this._instantiationService.createInstance(OpenFileInFolderAction, savedFilePath, label || path.sep);
 					action.run();
 					action.dispose();
 				}

src/sql/workbench/services/connection/browser/media/connectionDialog.css

@@ -106,9 +106,9 @@
 	height: 100%;
 }
 
-.vs-dark .connection-dialog .connection-history-actions .action-label.icon,
-.hc-black .connection-dialog .connection-history-actions .action-label.icon,
-.connection-dialog .connection-history-actions .action-label.icon {
+.vs-dark .connection-dialog .connection-history-actions .action-label.codicon,
+.hc-black .connection-dialog .connection-history-actions .action-label.codicon,
+.connection-dialog .connection-history-actions .action-label.codicon {
 	display: block;
 	height: 20px;
 	line-height: 20px;

src/sql/workbench/services/insights/test/electron-browser/insightsUtils.test.ts

@@ -25,6 +25,8 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { IWorkbenchConstructionOptions } from 'vs/workbench/workbench.web.api';
 
 class TestEnvironmentService implements IWorkbenchEnvironmentService {
+	settingsSyncPreviewResource: URI;
+	webviewExternalEndpoint: string;
 	logFile: URI;
 	options?: IWorkbenchConstructionOptions;
 	galleryMachineIdResource?: URI;

src/sql/workbench/update/electron-browser/releaseNotes.ts

@@ -5,8 +5,7 @@
 
 import nls = require('vs/nls');
 import { Action } from 'vs/base/common/actions';
-import pkg from 'vs/platform/product/node/package';
-import product from 'vs/platform/product/node/product';
+import product from 'vs/platform/product/common/product';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { URI } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -37,7 +36,7 @@ export class ShowCurrentReleaseNotesAction extends AbstractShowReleaseNotesActio
 		label = ShowCurrentReleaseNotesAction.LABEL,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super(id, label, pkg.version, instantiationService);
+		super(id, label, product.version, instantiationService);
 	}
 }