mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-20 17:22:51 -05:00
Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)
This commit is contained in:
@@ -16,7 +16,6 @@ import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/wo
|
||||
|
||||
import * as vscode from 'vscode';
|
||||
import * as azdata from 'azdata';
|
||||
import { assign } from 'vs/base/common/objects';
|
||||
import { TelemetryView, TelemetryAction } from 'sql/platform/telemetry/common/telemetryKeys';
|
||||
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
|
||||
import { IEditorInput, IEditorPane } from 'vs/workbench/common/editor';
|
||||
@@ -92,7 +91,7 @@ export class MainThreadModelViewDialog extends Disposable implements MainThreadM
|
||||
|
||||
public $openDialog(handle: number, dialogName?: string): Thenable<void> {
|
||||
let dialog = this.getDialog(handle);
|
||||
const options = assign({}, DefaultDialogOptions);
|
||||
const options = Object.assign({}, DefaultDialogOptions);
|
||||
options.width = dialog.width;
|
||||
options.dialogStyle = dialog.dialogStyle;
|
||||
options.dialogPosition = dialog.dialogPosition;
|
||||
@@ -247,7 +246,7 @@ export class MainThreadModelViewDialog extends Disposable implements MainThreadM
|
||||
|
||||
public $openWizard(handle: number, source?: string): Thenable<void> {
|
||||
let wizard = this.getWizard(handle);
|
||||
const options = assign({}, DefaultWizardOptions);
|
||||
const options = Object.assign({}, DefaultWizardOptions);
|
||||
options.width = wizard.width;
|
||||
this._dialogService.showWizard(wizard, options, source);
|
||||
return Promise.resolve();
|
||||
|
||||
Reference in New Issue
Block a user