mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-14 17:22:20 -05:00
Initial VS Code 1.19 source merge (#571)
* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
@@ -17,9 +17,8 @@ import {
|
||||
import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
|
||||
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
|
||||
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadAccountManagement)
|
||||
export class MainThreadAccountManagement extends MainThreadAccountManagementShape {
|
||||
export class MainThreadAccountManagement implements MainThreadAccountManagementShape {
|
||||
private _providerMetadata: { [handle: number]: data.AccountProviderMetadata };
|
||||
private _proxy: ExtHostAccountManagementShape;
|
||||
private _toDispose: IDisposable[];
|
||||
@@ -28,7 +27,6 @@ export class MainThreadAccountManagement extends MainThreadAccountManagementShap
|
||||
extHostContext: IExtHostContext,
|
||||
@IAccountManagementService private _accountManagementService: IAccountManagementService
|
||||
) {
|
||||
super();
|
||||
this._providerMetadata = {};
|
||||
if (extHostContext) {
|
||||
this._proxy = extHostContext.get(SqlExtHostContext.ExtHostAccountManagement);
|
||||
|
||||
@@ -15,7 +15,7 @@ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
|
||||
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadCredentialManagement)
|
||||
export class MainThreadCredentialManagement extends MainThreadCredentialManagementShape {
|
||||
export class MainThreadCredentialManagement implements MainThreadCredentialManagementShape {
|
||||
|
||||
private _proxy: ExtHostCredentialManagementShape;
|
||||
|
||||
@@ -27,7 +27,6 @@ export class MainThreadCredentialManagement extends MainThreadCredentialManageme
|
||||
extHostContext: IExtHostContext,
|
||||
@ICredentialsService private credentialService: ICredentialsService
|
||||
) {
|
||||
super();
|
||||
if (extHostContext) {
|
||||
this._proxy = extHostContext.get(SqlExtHostContext.ExtHostCredentialManagement);
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
|
||||
* Main thread class for handling data protocol management registration.
|
||||
*/
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadDataProtocol)
|
||||
export class MainThreadDataProtocol extends MainThreadDataProtocolShape {
|
||||
export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
|
||||
|
||||
private _proxy: ExtHostDataProtocolShape;
|
||||
|
||||
@@ -55,7 +55,6 @@ export class MainThreadDataProtocol extends MainThreadDataProtocolShape {
|
||||
@ISerializationService private _serializationService: ISerializationService,
|
||||
@IFileBrowserService private _fileBrowserService: IFileBrowserService
|
||||
) {
|
||||
super();
|
||||
if (extHostContext) {
|
||||
this._proxy = extHostContext.get(SqlExtHostContext.ExtHostDataProtocol);
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
|
||||
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadResourceProvider)
|
||||
export class MainThreadResourceProvider extends MainThreadResourceProviderShape {
|
||||
export class MainThreadResourceProvider implements MainThreadResourceProviderShape {
|
||||
private _providerMetadata: {[handle: number]: data.AccountProviderMetadata};
|
||||
private _proxy: ExtHostResourceProviderShape;
|
||||
private _toDispose: IDisposable[];
|
||||
@@ -28,7 +28,6 @@ export class MainThreadResourceProvider extends MainThreadResourceProviderShape
|
||||
extHostContext: IExtHostContext,
|
||||
@IResourceProviderService private _resourceProviderService: IResourceProviderService
|
||||
) {
|
||||
super();
|
||||
this._providerMetadata = {};
|
||||
if (extHostContext) {
|
||||
this._proxy = extHostContext.get(SqlExtHostContext.ExtHostResourceProvider);
|
||||
|
||||
@@ -16,7 +16,7 @@ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
|
||||
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
|
||||
|
||||
@extHostNamedCustomer(SqlMainContext.MainThreadSerializationProvider)
|
||||
export class MainThreadSerializationProvider extends MainThreadSerializationProviderShape {
|
||||
export class MainThreadSerializationProvider implements MainThreadSerializationProviderShape {
|
||||
|
||||
private _proxy: ExtHostSerializationProviderShape;
|
||||
|
||||
@@ -29,7 +29,6 @@ export class MainThreadSerializationProvider extends MainThreadSerializationProv
|
||||
@ISerializationService private serializationService: ISerializationService
|
||||
|
||||
) {
|
||||
super();
|
||||
if (extHostContext) {
|
||||
this._proxy = extHostContext.get(SqlExtHostContext.ExtHostSerializationProvider);
|
||||
}
|
||||
|
||||
@@ -25,6 +25,8 @@ import { ExtHostThreadService } from 'vs/workbench/services/thread/node/extHostT
|
||||
import * as sqlExtHostTypes from 'sql/workbench/api/common/sqlExtHostTypes';
|
||||
import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
|
||||
import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { IExtensionApiFactory } from 'vs/workbench/api/node/extHost.api.impl';
|
||||
|
||||
export interface ISqlExtensionApiFactory {
|
||||
vsCodeFactory(extension: IExtensionDescription): typeof vscode;
|
||||
@@ -32,18 +34,17 @@ export interface ISqlExtensionApiFactory {
|
||||
}
|
||||
|
||||
/**
|
||||
* This method instantiates and returns the extension API surface. This overrides the default ApiFactory by extending it to add Carbon-related functions
|
||||
* This method instantiates and returns the extension API surface
|
||||
*/
|
||||
export function createApiFactory(
|
||||
initData: IInitData,
|
||||
threadService: ExtHostThreadService,
|
||||
extHostWorkspace: ExtHostWorkspace,
|
||||
extHostConfiguration: ExtHostConfiguration,
|
||||
extensionService: ExtHostExtensionService
|
||||
|
||||
|
||||
extensionService: ExtHostExtensionService,
|
||||
logService: ILogService
|
||||
): ISqlExtensionApiFactory {
|
||||
let vsCodeFactory = extHostApi.createApiFactory(initData, threadService, extHostWorkspace, extHostConfiguration, extensionService);
|
||||
let vsCodeFactory = extHostApi.createApiFactory(initData, threadService, extHostWorkspace, extHostConfiguration, extensionService, logService);
|
||||
|
||||
// Addressable instances
|
||||
const extHostAccountManagement = threadService.set(SqlExtHostContext.ExtHostAccountManagement, new ExtHostAccountManagement(threadService));
|
||||
|
||||
@@ -15,6 +15,7 @@ import 'sql/workbench/api/node/mainThreadDataProtocol';
|
||||
import 'sql/workbench/api/node/mainThreadSerializationProvider';
|
||||
import 'sql/workbench/api/node/mainThreadResourceProvider';
|
||||
import './mainThreadAccountManagement';
|
||||
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
|
||||
|
||||
export class SqlExtHostContribution implements IWorkbenchContribution {
|
||||
|
||||
@@ -30,5 +31,6 @@ export class SqlExtHostContribution implements IWorkbenchContribution {
|
||||
|
||||
// Register File Tracker
|
||||
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(
|
||||
SqlExtHostContribution
|
||||
SqlExtHostContribution,
|
||||
LifecyclePhase.Running
|
||||
);
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
import * as data from 'data';
|
||||
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
export abstract class ExtHostAccountManagementShape {
|
||||
$autoOAuthCancelled(handle: number): Thenable<void> { throw ni(); }
|
||||
$clear(handle: number, accountKey: data.AccountKey): Thenable<void> { throw ni(); }
|
||||
@@ -336,104 +336,69 @@ export abstract class ExtHostSerializationProviderShape {
|
||||
$saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<data.SaveResultRequestResult> { throw ni(); }
|
||||
}
|
||||
|
||||
export abstract class MainThreadAccountManagementShape {
|
||||
$registerAccountProvider(providerMetadata: data.AccountProviderMetadata, handle: number): Thenable<any> { throw ni(); }
|
||||
$unregisterAccountProvider(handle: number): Thenable<any> { throw ni(); }
|
||||
export interface MainThreadAccountManagementShape extends IDisposable {
|
||||
$registerAccountProvider(providerMetadata: data.AccountProviderMetadata, handle: number): Thenable<any>;
|
||||
$unregisterAccountProvider(handle: number): Thenable<any>;
|
||||
|
||||
$beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable<void> { throw ni(); }
|
||||
$endAutoOAuthDeviceCode(): void { throw ni(); }
|
||||
$beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable<void>;
|
||||
$endAutoOAuthDeviceCode(): void;
|
||||
|
||||
$accountUpdated(updatedAccount: data.Account): void { throw ni(); }
|
||||
$accountUpdated(updatedAccount: data.Account): void;
|
||||
}
|
||||
|
||||
export abstract class MainThreadResourceProviderShape {
|
||||
$registerResourceProvider(providerMetadata: data.ResourceProviderMetadata, handle: number): Thenable<any> { throw ni(); }
|
||||
$unregisterResourceProvider(handle: number): Thenable<any> { throw ni(); }
|
||||
export interface MainThreadResourceProviderShape extends IDisposable {
|
||||
$registerResourceProvider(providerMetadata: data.ResourceProviderMetadata, handle: number): Thenable<any>;
|
||||
$unregisterResourceProvider(handle: number): Thenable<any>;
|
||||
}
|
||||
|
||||
export abstract class MainThreadDataProtocolShape {
|
||||
$registerConnectionProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerBackupProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerRestoreProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerScriptingProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerQueryProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerProfilerProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerObjectExplorerProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerMetadataProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerTaskServicesProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerFileBrowserProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerCapabilitiesServiceProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$registerAdminServicesProvider(providerId: string, handle: number): TPromise<any> { throw ni(); }
|
||||
$unregisterProvider(handle: number): TPromise<any> { throw ni(); }
|
||||
$onConnectionComplete(handle: number, connectionInfoSummary: data.ConnectionInfoSummary): void { throw ni(); }
|
||||
$onIntelliSenseCacheComplete(handle: number, connectionUri: string): void { throw ni(); }
|
||||
$onConnectionChangeNotification(handle: number, changedConnInfo: data.ChangedConnectionInfo): void { throw ni(); }
|
||||
$onQueryComplete(handle: number, result: data.QueryExecuteCompleteNotificationResult): void { throw ni(); }
|
||||
$onBatchStart(handle: number, batchInfo: data.QueryExecuteBatchNotificationParams): void { throw ni(); }
|
||||
$onBatchComplete(handle: number, batchInfo: data.QueryExecuteBatchNotificationParams): void { throw ni(); }
|
||||
$onResultSetComplete(handle: number, resultSetInfo: data.QueryExecuteResultSetCompleteNotificationParams): void { throw ni(); }
|
||||
$onQueryMessage(handle: number, message: data.QueryExecuteMessageParams): void { throw ni(); }
|
||||
$onObjectExplorerSessionCreated(handle: number, message: data.ObjectExplorerSession): void { throw ni(); }
|
||||
$onObjectExplorerNodeExpanded(handle: number, message: data.ObjectExplorerExpandInfo): void { throw ni(); }
|
||||
$onTaskCreated(handle: number, sessionResponse: data.TaskInfo): void { throw ni(); }
|
||||
$onTaskStatusChanged(handle: number, sessionResponse: data.TaskProgressInfo): void { throw ni(); }
|
||||
$onFileBrowserOpened(handle: number, response: data.FileBrowserOpenedParams): void { throw ni(); }
|
||||
$onFolderNodeExpanded(handle: number, response: data.FileBrowserExpandedParams): void { throw ni(); }
|
||||
$onFilePathsValidated(handle: number, response: data.FileBrowserValidatedParams): void { throw ni(); }
|
||||
$onScriptingComplete(handle: number, message: data.ScriptingCompleteResult): void { throw ni(); }
|
||||
$onSessionEventsAvailable(handle: number, response: data.ProfilerSessionEvents): void { throw ni(); }
|
||||
export interface MainThreadDataProtocolShape extends IDisposable {
|
||||
$registerConnectionProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerBackupProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerRestoreProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerScriptingProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerQueryProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerProfilerProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerObjectExplorerProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerMetadataProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerTaskServicesProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerFileBrowserProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerCapabilitiesServiceProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$registerAdminServicesProvider(providerId: string, handle: number): TPromise<any>;
|
||||
$unregisterProvider(handle: number): TPromise<any>;
|
||||
$onConnectionComplete(handle: number, connectionInfoSummary: data.ConnectionInfoSummary): void;
|
||||
$onIntelliSenseCacheComplete(handle: number, connectionUri: string): void;
|
||||
$onConnectionChangeNotification(handle: number, changedConnInfo: data.ChangedConnectionInfo): void;
|
||||
$onQueryComplete(handle: number, result: data.QueryExecuteCompleteNotificationResult): void;
|
||||
$onBatchStart(handle: number, batchInfo: data.QueryExecuteBatchNotificationParams): void;
|
||||
$onBatchComplete(handle: number, batchInfo: data.QueryExecuteBatchNotificationParams): void;
|
||||
$onResultSetComplete(handle: number, resultSetInfo: data.QueryExecuteResultSetCompleteNotificationParams): void;
|
||||
$onQueryMessage(handle: number, message: data.QueryExecuteMessageParams): void;
|
||||
$onObjectExplorerSessionCreated(handle: number, message: data.ObjectExplorerSession): void;
|
||||
$onObjectExplorerNodeExpanded(handle: number, message: data.ObjectExplorerExpandInfo): void;
|
||||
$onTaskCreated(handle: number, sessionResponse: data.TaskInfo): void;
|
||||
$onTaskStatusChanged(handle: number, sessionResponse: data.TaskProgressInfo): void;
|
||||
$onFileBrowserOpened(handle: number, response: data.FileBrowserOpenedParams): void;
|
||||
$onFolderNodeExpanded(handle: number, response: data.FileBrowserExpandedParams): void;
|
||||
$onFilePathsValidated(handle: number, response: data.FileBrowserValidatedParams): void;
|
||||
$onScriptingComplete(handle: number, message: data.ScriptingCompleteResult): void;
|
||||
$onSessionEventsAvailable(handle: number, response: data.ProfilerSessionEvents): void;
|
||||
|
||||
/**
|
||||
* Callback when a session has completed initialization
|
||||
*/
|
||||
$onEditSessionReady(handle: number, ownerUri: string, success: boolean, message: string) { throw ni(); }
|
||||
$onEditSessionReady(handle: number, ownerUri: string, success: boolean, message: string);
|
||||
}
|
||||
|
||||
export abstract class MainThreadCredentialManagementShape {
|
||||
$registerCredentialProvider(handle: number): TPromise<any> { throw ni(); }
|
||||
$unregisterCredentialProvider(handle: number): TPromise<any> { throw ni(); }
|
||||
export interface MainThreadCredentialManagementShape extends IDisposable {
|
||||
$registerCredentialProvider(handle: number): TPromise<any>;
|
||||
$unregisterCredentialProvider(handle: number): TPromise<any>;
|
||||
}
|
||||
|
||||
export abstract class MainThreadSerializationProviderShape {
|
||||
$registerSerializationProvider(handle: number): TPromise<any> { throw ni(); }
|
||||
$unregisterSerializationProvider(handle: number): TPromise<any> { throw ni(); }
|
||||
export interface MainThreadSerializationProviderShape extends IDisposable {
|
||||
$registerSerializationProvider(handle: number): TPromise<any>;
|
||||
$unregisterSerializationProvider(handle: number): TPromise<any>;
|
||||
}
|
||||
|
||||
// export class SqlInstanceCollection {
|
||||
// private _items: { [id: string]: any; };
|
||||
|
||||
// constructor() {
|
||||
// this._items = Object.create(null);
|
||||
// }
|
||||
|
||||
// public define<T>(id: ProxyIdentifier<T>): InstanceSetter<T> {
|
||||
// let that = this;
|
||||
// return new class {
|
||||
// set<R extends T>(value: T): R {
|
||||
// that._set(id, value);
|
||||
// return <R>value;
|
||||
// }
|
||||
// };
|
||||
// }
|
||||
|
||||
// _set<T>(id: ProxyIdentifier<T>, value: T): void {
|
||||
// this._items[id.id] = value;
|
||||
// }
|
||||
|
||||
// public finish(isMain: boolean, threadService: IThreadService): void {
|
||||
// let expected = (isMain ? SqlMainContext : SqlExtHostContext);
|
||||
// Object.keys(expected).forEach((key) => {
|
||||
// let id = expected[key];
|
||||
// let value = this._items[id.id];
|
||||
|
||||
// if (!value) {
|
||||
// throw new Error(`Missing actor ${key} (isMain: ${id.isMain}, id: ${id.id})`);
|
||||
// }
|
||||
// threadService.set<any>(id, value);
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
|
||||
function ni() { return new Error('Not implemented'); }
|
||||
|
||||
// --- proxy identifiers
|
||||
|
||||
Reference in New Issue
Block a user