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

separate getting remote content and preview content

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-03-05 16:12:35 +01:00
parent acc91e10d0
commit ecf67444f8
12 changed files with 95 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/services/userDataSync/electron-browser/settingsSyncService.ts
View File

@@ -84,12 +84,12 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
return this.channel.call('resolveConflicts', [conflicts]);
}
getRemoteContent(preview?: boolean): Promise<string | null> {
return this.channel.call('getRemoteContent', [!!preview]);
getRemoteContent(ref?: string): Promise<string | null> {
return this.channel.call('getRemoteContent', [ref]);
}
resolveContent(ref: string): Promise<string | null> {
return this.channel.call('resolveContent', [ref]);
getRemoteContentFromPreview(): Promise<string | null> {
return this.channel.call('getRemoteContentFromPreview', []);
}
private async updateStatus(status: SyncStatus): Promise<void> {

11
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
View File

@@ -3,13 +3,14 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { SyncStatus, SyncSource, IUserDataSyncService, UserDataSyncError, ResourceKey } from 'vs/platform/userDataSync/common/userDataSync';
import { SyncStatus, SyncSource, IUserDataSyncService, UserDataSyncError } from 'vs/platform/userDataSync/common/userDataSync';
import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
import { Disposable } from 'vs/base/common/lifecycle';
import { Emitter, Event } from 'vs/base/common/event';
import { IChannel } from 'vs/base/parts/ipc/common/ipc';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { CancellationToken } from 'vs/base/common/cancellation';
import { URI } from 'vs/base/common/uri';
export class UserDataSyncService extends Disposable implements IUserDataSyncService {
@@ -88,12 +89,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('stop');
}
getRemoteContent(source: SyncSource, preview: boolean): Promise<string | null> {
return this.channel.call('getRemoteContent', [source, preview]);
}
resolveContent(key: ResourceKey, ref: string): Promise<string | null> {
return this.channel.call('resolveContent', [key, ref]);
resolveContent(resource: URI): Promise<string | null> {
return this.channel.call('resolveContent', [resource]);
}
isFirstTimeSyncWithMerge(): Promise<boolean> {