Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

prepare to merge to master

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-09-15 19:41:26 +02:00
parent b3771f115f
commit 4ffcfff8b9
12 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -542,7 +542,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
createInputBox(): vscode.InputBox {
return extHostQuickOpen.createInputBox(extension.identifier);
},
registerUserDataProvider: (identity: string, userDataProvider: vscode.UserDataProvider): vscode.Disposable => {
registerUserDataSyncProvider: (identity: string, userDataProvider: vscode.UserDataSyncProvider): vscode.Disposable => {
checkProposedApiEnabled(extension);
return extHostUserData.registerUserDataProvider(identity, userDataProvider);
}

8
src/vs/workbench/api/common/extHostTypes.ts
View File

@@ -14,7 +14,7 @@ import { generateUuid } from 'vs/base/common/uuid';
import * as vscode from 'vscode';
import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from 'vs/platform/files/common/files';
import { RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
import { RemoteUserDataErrorCode, markAsUserDataError } from 'vs/workbench/services/userData/common/userData';
import { UserDataSyncStoreErrorCode, markAsUserDataSyncStoreError } from 'vs/workbench/services/userData/common/userData';
function es5ClassCompat(target: Function): any {
///@ts-ignore
@@ -2373,15 +2373,15 @@ export class Decoration {
export class UserDataError extends Error {
static Rejected(message?: string): UserDataError {
return new UserDataError(message, RemoteUserDataErrorCode.Rejected);
return new UserDataError(message, UserDataSyncStoreErrorCode.Rejected);
}
constructor(message?: string, code: RemoteUserDataErrorCode = RemoteUserDataErrorCode.Unknown) {
constructor(message?: string, code: UserDataSyncStoreErrorCode = UserDataSyncStoreErrorCode.Unknown) {
super(message);
// mark the error as user data provider error so that
// we can extract the error code on the receiving side
markAsUserDataError(this, code);
markAsUserDataSyncStoreError(this, code);
// workaround when extending builtin objects and when compiling to ES5, see:
// https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work

4
src/vs/workbench/api/common/extHostUserData.ts
View File

@@ -12,7 +12,7 @@ import { IUserData } from 'vs/workbench/services/userData/common/userData';
export class ExtHostUserData implements ExtHostUserDataShape {
private name: string | null = null;
private userDataProvider: vscode.UserDataProvider | null = null;
private userDataProvider: vscode.UserDataSyncProvider | null = null;
constructor(
private readonly proxy: MainThreadUserDataShape,
@@ -20,7 +20,7 @@ export class ExtHostUserData implements ExtHostUserDataShape {
) {
}
registerUserDataProvider(name: string, userDataProvider: vscode.UserDataProvider): vscode.Disposable {
registerUserDataProvider(name: string, userDataProvider: vscode.UserDataSyncProvider): vscode.Disposable {
if (this.userDataProvider) {
this.logService.warn(`A user data provider '${this.name}' already exists hence ignoring the remote user data provider '${name}'.`);
return Disposable.None;