Skip to content

Commit 4ccab0d

Browse files
sandy081sandy081
committed
1 parent 302e86a commit 4ccab0d

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

‎src/vs/platform/userDataSync/common/keybindingsSync.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ interface IKeybindingsResourcePreview extends IFileResourcePreview {
3838

3939
export function getKeybindingsContentFromSyncContent(syncContent: string, platformSpecific: boolean): string | null {
4040
const parsed = <ISyncContent>JSON.parse(syncContent);
41-
if (platformSpecific) {
41+
if (!platformSpecific) {
4242
return isUndefined(parsed.all) ? null : parsed.all;
4343
}
4444
switch (OS) {

‎src/vs/platform/userDataSync/test/common/userDataSyncClient.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IRequestService } from 'vs/platform/request/common/request';
77
import { IRequestOptions, IRequestContext, IHeaders } from 'vs/base/parts/request/common/request';
88
import { CancellationToken } from 'vs/base/common/cancellation';
9-
import { IUserData, IUserDataManifest, ALL_SYNC_RESOURCES, IUserDataSyncLogService, IUserDataSyncStoreService, IUserDataSyncUtilService, IUserDataSyncResourceEnablementService, IUserDataSyncService, getDefaultIgnoredSettings, IUserDataSyncBackupStoreService, SyncResource, ServerResource, IUserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSync';
9+
import { IUserData, IUserDataManifest, ALL_SYNC_RESOURCES, IUserDataSyncLogService, IUserDataSyncStoreService, IUserDataSyncUtilService, IUserDataSyncResourceEnablementService, IUserDataSyncService, getDefaultIgnoredSettings, IUserDataSyncBackupStoreService, SyncResource, ServerResource, IUserDataSyncStoreManagementService, registerConfiguration } from 'vs/platform/userDataSync/common/userDataSync';
1010
import { bufferToStream, VSBuffer } from 'vs/base/common/buffer';
1111
import { generateUuid } from 'vs/base/common/uuid';
1212
import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
@@ -49,6 +49,7 @@ export class UserDataSyncClient extends Disposable {
4949
}
5050

5151
async setUp(empty: boolean = false): Promise<void> {
52+
registerConfiguration();
5253
const userRoamingDataHome = URI.file('userdata').with({ scheme: Schemas.inMemory });
5354
const userDataSyncHome = joinPath(userRoamingDataHome, '.sync');
5455
const environmentService = this.instantiationService.stub(IEnvironmentService, <Partial<IEnvironmentService>>{

0 commit comments

Comments
 (0)