mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-05 09:35:39 -05:00
Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)
* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 * disable strict null check
This commit is contained in:
@@ -3,4 +3,4 @@
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import 'sql/workbench/api/electron-browser/mainThreadModalDialog';
|
||||
import '../browser/extensionHost.contribution.common';
|
||||
@@ -1,32 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
|
||||
import { SqlMainContext, MainThreadDashboardShape, ExtHostDashboardShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
|
||||
import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
|
||||
import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadDashboard)
|
||||
export class MainThreadDashboard implements MainThreadDashboardShape {
|
||||
private _proxy: ExtHostDashboardShape;
|
||||
|
||||
constructor(
|
||||
context: IExtHostContext,
|
||||
@IDashboardService dashboardService: IDashboardService
|
||||
) {
|
||||
this._proxy = context.getProxy(SqlExtHostContext.ExtHostDashboard);
|
||||
dashboardService.onDidChangeToDashboard(e => {
|
||||
this._proxy.$onDidChangeToDashboard(e);
|
||||
});
|
||||
|
||||
dashboardService.onDidOpenDashboard(e => {
|
||||
this._proxy.$onDidOpenDashboard(e);
|
||||
});
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import 'vs/css!sql/media/icons/common-icons';
|
||||
|
||||
import { WebViewDialog } from 'sql/workbench/parts/webview/electron-browser/webViewDialog';
|
||||
import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
|
||||
|
||||
import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
|
||||
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadModalDialog)
|
||||
export class MainThreadModalDialog implements MainThreadModalDialogShape {
|
||||
private readonly _proxy: ExtHostModalDialogsShape;
|
||||
private readonly _dialogs = new Map<number, WebViewDialog>();
|
||||
|
||||
constructor(
|
||||
context: IExtHostContext,
|
||||
@IInstantiationService private readonly _instantiationService: IInstantiationService
|
||||
) {
|
||||
this._proxy = context.getProxy(SqlExtHostContext.ExtHostModalDialogs);
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
$createDialog(handle: number): void {
|
||||
const dialog = this._instantiationService.createInstance(WebViewDialog);
|
||||
|
||||
this._dialogs.set(handle, dialog);
|
||||
dialog.onMessage(args => {
|
||||
this._proxy.$onMessage(handle, args);
|
||||
});
|
||||
|
||||
dialog.onClosed(args => {
|
||||
this._proxy.$onClosed(handle);
|
||||
});
|
||||
}
|
||||
|
||||
$disposeDialog(handle: number): void {
|
||||
const dialog = this._dialogs.get(handle);
|
||||
dialog.close();
|
||||
}
|
||||
|
||||
$setTitle(handle: number, value: string): void {
|
||||
const dialog = this._dialogs.get(handle);
|
||||
dialog.headerTitle = value;
|
||||
}
|
||||
|
||||
$setHtml(handle: number, value: string): void {
|
||||
const dialog = this._dialogs.get(handle);
|
||||
dialog.html = value;
|
||||
}
|
||||
|
||||
$show(handle: number): void {
|
||||
const dialog = this._dialogs.get(handle);
|
||||
dialog.render();
|
||||
dialog.open();
|
||||
}
|
||||
|
||||
async $sendMessage(handle: number, message: any): Promise<boolean> {
|
||||
const dialog = this._dialogs.get(handle);
|
||||
dialog.sendMessage(message);
|
||||
return Promise.resolve(true);
|
||||
}
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
|
||||
import { TaskRegistry, ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks';
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
|
||||
|
||||
import {
|
||||
SqlExtHostContext,
|
||||
SqlMainContext,
|
||||
ExtHostTasksShape,
|
||||
MainThreadTasksShape
|
||||
} from 'sql/workbench/api/node/sqlExtHost.protocol';
|
||||
|
||||
import { IConnectionProfile } from 'azdata';
|
||||
|
||||
import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadTasks)
|
||||
export class MainThreadTasks implements MainThreadTasksShape {
|
||||
|
||||
private readonly _disposables = new Map<string, IDisposable>();
|
||||
private readonly _generateCommandsDocumentationRegistration: IDisposable;
|
||||
private readonly _proxy: ExtHostTasksShape;
|
||||
|
||||
constructor(
|
||||
extHostContext: IExtHostContext
|
||||
) {
|
||||
this._proxy = extHostContext.getProxy(SqlExtHostContext.ExtHostTasks);
|
||||
}
|
||||
|
||||
dispose() {
|
||||
this._disposables.forEach(value => value.dispose());
|
||||
this._disposables.clear();
|
||||
|
||||
this._generateCommandsDocumentationRegistration.dispose();
|
||||
}
|
||||
|
||||
$registerTask(id: string): Promise<any> {
|
||||
this._disposables.set(
|
||||
id,
|
||||
TaskRegistry.registerTask(id, (accessor, profile: IConnectionProfile, ...args) => {
|
||||
if (profile instanceof ConnectionProfile) {
|
||||
profile = profile.toIConnectionProfile();
|
||||
}
|
||||
this._proxy.$executeContributedTask(id, profile, ...args);
|
||||
})
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
$unregisterTask(id: string): Promise<any> {
|
||||
if (this._disposables.has(id)) {
|
||||
this._disposables.get(id).dispose();
|
||||
this._disposables.delete(id);
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user