29
}
30
32
>
return parse(content) || [];
33
>
}
34
35
>
export async function merge(localContent: string, remoteContent: string, baseContent: string | null, formattingOptions: FormattingOptions, userDataSyncUtilService: IUserDataSyncUtilService): Promise<{ mergeContent: string; hasChanges: boolean; hasConflicts: boolean }> {
keybindingsMerge.ts
36
>
const local = parseKeybindings(localContent);
37
>
const remote = parseKeybindings(remoteContent);
38
>
const base = baseContent ? parseKeybindings(baseContent) : null;
39
>
40
>
const userbindings: string[] = [...local, ...remote, ...(base || [])].map(keybinding => keybinding.key);
41
>
const normalizedKeys = await userDataSyncUtilService.resolveUserBindings(userbindings);
42
>
const keybindingsMergeResult = computeMergeResultByKeybinding(local, remote, base, normalizedKeys);
43
>
44
>
if (!keybindingsMergeResult.hasLocalForwarded && !keybindingsMergeResult.hasRemoteForwarded) {
45
// No changes found between local and remote.
46
return { mergeContent: localContent, hasChanges: false, hasConflicts: false };
47
}
48
49
>
if (!keybindingsMergeResult.hasLocalForwarded && keybindingsMergeResult.hasRemoteForwarded) {
keybindingsMerge.ts
50
return { mergeContent: remoteContent, hasChanges: true, hasConflicts: false };
51
}
52
53
>
if (keybindingsMergeResult.hasLocalForwarded && !keybindingsMergeResult.hasRemoteForwarded) {
keybindingsMerge.ts
54
// Local has moved forward and remote has not. Return local.
55
return { mergeContent: localContent, hasChanges: true, hasConflicts: false };