mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-26 03:29:00 +01:00
fix settings merging
This commit is contained in:
Sandeep Somavarapu
@@ -4,7 +4,6 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import { values } from 'vs/base/common/map';
|
||||
import { parse, findNodeAtLocation, parseTree } from 'vs/base/common/json';
|
||||
import { EditOperation } from 'vs/editor/common/core/editOperation';
|
||||
import { IModeService } from 'vs/editor/common/services/modeService';
|
||||
@@ -26,75 +25,21 @@ class SettingsMergeService implements ISettingsMergeService {
|
||||
@IModeService private readonly modeService: IModeService
|
||||
) { }
|
||||
|
||||
async merge(localContent: string, remoteContent: string, baseContent: string | null): Promise<string> {
|
||||
async merge(localContent: string, remoteContent: string, baseContent: string | null): Promise<{ mergeContent: string, hasChanges: boolean, hasConflicts: boolean }> {
|
||||
const local = parse(localContent);
|
||||
const remote = parse(remoteContent);
|
||||
const base = baseContent ? parse(baseContent) : null;
|
||||
const { changes, conflicts } = this.getChanges(local, remote, base);
|
||||
|
||||
if (!changes.length && !conflicts.length) {
|
||||
return localContent;
|
||||
}
|
||||
|
||||
const settingsPreviewModel = this.modelService.createModel(localContent, this.modeService.create('jsonc'));
|
||||
for (const change of changes) {
|
||||
this.editSetting(settingsPreviewModel, change.key, change.value);
|
||||
}
|
||||
for (const key of conflicts) {
|
||||
const tree = parseTree(settingsPreviewModel.getValue());
|
||||
const valueNode = findNodeAtLocation(tree, [key]);
|
||||
const eol = settingsPreviewModel.getEOL();
|
||||
const remoteEdit = setProperty(`{${eol}\t${eol}}`, [key], remote[key], { tabSize: 4, insertSpaces: false, eol: eol })[0];
|
||||
const remoteContent = remoteEdit ? `${remoteEdit.content.substring(remoteEdit.offset + remoteEdit.length + 1)},${eol}` : '';
|
||||
if (valueNode) {
|
||||
// Updated in Local and Remote with different value
|
||||
const keyPosition = settingsPreviewModel.getPositionAt(valueNode.parent!.offset);
|
||||
const valuePosition = settingsPreviewModel.getPositionAt(valueNode.offset + valueNode.length);
|
||||
const editOperations = [
|
||||
EditOperation.insert(new Position(keyPosition.lineNumber - 1, settingsPreviewModel.getLineMaxColumn(keyPosition.lineNumber - 1)), `${eol}<<<<<<< local`),
|
||||
EditOperation.insert(new Position(valuePosition.lineNumber, settingsPreviewModel.getLineMaxColumn(valuePosition.lineNumber)), `${eol}=======${eol}${remoteContent}>>>>>>> remote`)
|
||||
];
|
||||
settingsPreviewModel.pushEditOperations([new Selection(keyPosition.lineNumber, keyPosition.column, keyPosition.lineNumber, keyPosition.column)], editOperations, () => []);
|
||||
} else {
|
||||
// Removed in Local, but updated in Remote
|
||||
const position = new Position(settingsPreviewModel.getLineCount() - 1, settingsPreviewModel.getLineMaxColumn(settingsPreviewModel.getLineCount() - 1));
|
||||
const editOperations = [
|
||||
EditOperation.insert(position, `${eol}<<<<<<< local${eol}=======${eol}${remoteContent}>>>>>>> remote`)
|
||||
];
|
||||
settingsPreviewModel.pushEditOperations([new Selection(position.lineNumber, position.column, position.lineNumber, position.column)], editOperations, () => []);
|
||||
}
|
||||
}
|
||||
return settingsPreviewModel.getValue();
|
||||
}
|
||||
|
||||
private editSetting(model: ITextModel, key: string, value: any | undefined): void {
|
||||
const insertSpaces = false;
|
||||
const tabSize = 4;
|
||||
const eol = model.getEOL();
|
||||
const edit = setProperty(model.getValue(), [key], value, { tabSize, insertSpaces, eol })[0];
|
||||
if (edit) {
|
||||
const startPosition = model.getPositionAt(edit.offset);
|
||||
const endPosition = model.getPositionAt(edit.offset + edit.length);
|
||||
const range = new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column);
|
||||
let currentText = model.getValueInRange(range);
|
||||
if (edit.content !== currentText) {
|
||||
const editOperation = currentText ? EditOperation.replace(range, edit.content) : EditOperation.insert(startPosition, edit.content);
|
||||
model.pushEditOperations([new Selection(startPosition.lineNumber, startPosition.column, startPosition.lineNumber, startPosition.column)], [editOperation], () => []);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private getChanges(local: { [key: string]: any }, remote: { [key: string]: any }, base: { [key: string]: any } | null): { changes: { key: string; value: any | undefined; }[], conflicts: string[] } {
|
||||
const localToRemote = this.compare(local, remote);
|
||||
if (localToRemote.added.size === 0 && localToRemote.removed.size === 0 && localToRemote.updated.size === 0) {
|
||||
// No changes found between local and remote.
|
||||
return { changes: [], conflicts: [] };
|
||||
return { mergeContent: localContent, hasChanges: false, hasConflicts: false };
|
||||
}
|
||||
|
||||
const changes: { key: string, value: any | undefined }[] = [];
|
||||
const conflicts: Set<string> = new Set<string>();
|
||||
const baseToLocal = base ? this.compare(base, local) : { added: Object.keys(local).reduce((r, k) => { r.add(k); return r; }, new Set<string>()), removed: new Set<string>(), updated: new Set<string>() };
|
||||
const baseToRemote = base ? this.compare(base, remote) : { added: Object.keys(remote).reduce((r, k) => { r.add(k); return r; }, new Set<string>()), removed: new Set<string>(), updated: new Set<string>() };
|
||||
const settingsPreviewModel = this.modelService.createModel(localContent, this.modeService.create('jsonc'));
|
||||
|
||||
// Removed settings in Local
|
||||
for (const key of baseToLocal.removed.keys()) {
|
||||
@@ -113,7 +58,7 @@ class SettingsMergeService implements ISettingsMergeService {
|
||||
if (baseToLocal.updated.has(key)) {
|
||||
conflicts.add(key);
|
||||
} else {
|
||||
changes.push({ key, value: undefined });
|
||||
this.editSetting(settingsPreviewModel, key, undefined);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,7 +88,7 @@ class SettingsMergeService implements ISettingsMergeService {
|
||||
conflicts.add(key);
|
||||
}
|
||||
} else {
|
||||
changes.push({ key, value: remote[key] });
|
||||
this.editSetting(settingsPreviewModel, key, remote[key]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,11 +118,52 @@ class SettingsMergeService implements ISettingsMergeService {
|
||||
conflicts.add(key);
|
||||
}
|
||||
} else {
|
||||
changes.push({ key, value: remote[key] });
|
||||
this.editSetting(settingsPreviewModel, key, remote[key]);
|
||||
}
|
||||
}
|
||||
|
||||
return { changes, conflicts: values(conflicts) };
|
||||
for (const key of conflicts.keys()) {
|
||||
const tree = parseTree(settingsPreviewModel.getValue());
|
||||
const valueNode = findNodeAtLocation(tree, [key]);
|
||||
const eol = settingsPreviewModel.getEOL();
|
||||
const remoteEdit = setProperty(`{${eol}\t${eol}}`, [key], remote[key], { tabSize: 4, insertSpaces: false, eol: eol })[0];
|
||||
const remoteContent = remoteEdit ? `${remoteEdit.content.substring(remoteEdit.offset + remoteEdit.length + 1)},${eol}` : '';
|
||||
if (valueNode) {
|
||||
// Updated in Local and Remote with different value
|
||||
const keyPosition = settingsPreviewModel.getPositionAt(valueNode.parent!.offset);
|
||||
const valuePosition = settingsPreviewModel.getPositionAt(valueNode.offset + valueNode.length);
|
||||
const editOperations = [
|
||||
EditOperation.insert(new Position(keyPosition.lineNumber - 1, settingsPreviewModel.getLineMaxColumn(keyPosition.lineNumber - 1)), `${eol}<<<<<<< local`),
|
||||
EditOperation.insert(new Position(valuePosition.lineNumber, settingsPreviewModel.getLineMaxColumn(valuePosition.lineNumber)), `${eol}=======${eol}${remoteContent}>>>>>>> remote`)
|
||||
];
|
||||
settingsPreviewModel.pushEditOperations([new Selection(keyPosition.lineNumber, keyPosition.column, keyPosition.lineNumber, keyPosition.column)], editOperations, () => []);
|
||||
} else {
|
||||
// Removed in Local, but updated in Remote
|
||||
const position = new Position(settingsPreviewModel.getLineCount() - 1, settingsPreviewModel.getLineMaxColumn(settingsPreviewModel.getLineCount() - 1));
|
||||
const editOperations = [
|
||||
EditOperation.insert(position, `${eol}<<<<<<< local${eol}=======${eol}${remoteContent}>>>>>>> remote`)
|
||||
];
|
||||
settingsPreviewModel.pushEditOperations([new Selection(position.lineNumber, position.column, position.lineNumber, position.column)], editOperations, () => []);
|
||||
}
|
||||
}
|
||||
return { mergeContent: settingsPreviewModel.getValue(), hasChanges: true, hasConflicts: conflicts.size > 0 };
|
||||
}
|
||||
|
||||
private editSetting(model: ITextModel, key: string, value: any | undefined): void {
|
||||
const insertSpaces = false;
|
||||
const tabSize = 4;
|
||||
const eol = model.getEOL();
|
||||
const edit = setProperty(model.getValue(), [key], value, { tabSize, insertSpaces, eol })[0];
|
||||
if (edit) {
|
||||
const startPosition = model.getPositionAt(edit.offset);
|
||||
const endPosition = model.getPositionAt(edit.offset + edit.length);
|
||||
const range = new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column);
|
||||
let currentText = model.getValueInRange(range);
|
||||
if (edit.content !== currentText) {
|
||||
const editOperation = currentText ? EditOperation.replace(range, edit.content) : EditOperation.insert(startPosition, edit.content);
|
||||
model.pushEditOperations([new Selection(startPosition.lineNumber, startPosition.column, startPosition.lineNumber, startPosition.column)], [editOperation], () => []);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private compare(from: { [key: string]: any }, to: { [key: string]: any }): { added: Set<string>, removed: Set<string>, updated: Set<string> } {
|
||||
|
||||
Reference in New Issue
Block a user