Automatically navigate to the next merge conflict upon resolving a merge conflict
This commit is contained in:
parent
b8df1293c1
commit
7c26e93b21
|
@ -95,6 +95,11 @@
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "%config.decoratorsEnabled%",
|
"description": "%config.decoratorsEnabled%",
|
||||||
"default": true
|
"default": true
|
||||||
|
},
|
||||||
|
"merge-conflict.autoNavigateNextConflict.enabled": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "%config.autoNavigateNextConflictEnabled%",
|
||||||
|
"default": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,5 +14,6 @@
|
||||||
"command.compare": "Compare Current Conflict",
|
"command.compare": "Compare Current Conflict",
|
||||||
"config.title": "Merge Conflict",
|
"config.title": "Merge Conflict",
|
||||||
"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
|
"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
|
||||||
"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"
|
"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor",
|
||||||
|
"config.autoNavigateNextConflictEnabled": "Enable/disable automatic navigation between merge conflicts within editor when resolving conflicts"
|
||||||
}
|
}
|
|
@ -196,6 +196,13 @@ export default class CommandHandler implements vscode.Disposable {
|
||||||
// Tracker can forget as we know we are going to do an edit
|
// Tracker can forget as we know we are going to do an edit
|
||||||
this.tracker.forget(editor.document);
|
this.tracker.forget(editor.document);
|
||||||
conflict.commitEdit(type, editor);
|
conflict.commitEdit(type, editor);
|
||||||
|
|
||||||
|
// navigate to the next merge conflict
|
||||||
|
const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
|
||||||
|
if (mergeConflictConfig.get<boolean>('autoNavigateNextConflict.enabled')) {
|
||||||
|
this.navigateNext(editor);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async acceptAll(type: interfaces.CommitType, editor: vscode.TextEditor): Promise<void> {
|
private async acceptAll(type: interfaces.CommitType, editor: vscode.TextEditor): Promise<void> {
|
||||||
|
|
Loading…
Reference in a new issue