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

Fix background decorations (fixes #28368)

Browse Source
This commit is contained in:
Christof Marti
2017-06-26 11:14:30 -07:00
parent f7f7d7400d
commit d9d481afcd
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/merge-conflict/src/mergeConflictParser.ts
View File

@@ -102,7 +102,7 @@ export class MergeConflictParser {
header: scanned.startHeader.range,
decoratorContent: new vscode.Range(
scanned.startHeader.rangeIncludingLineBreak.end,
MergeConflictParser.shiftBackOneCharacter(document, tokenAfterCurrentBlock.range.start)),
MergeConflictParser.shiftBackOneCharacter(document, tokenAfterCurrentBlock.range.start, scanned.startHeader.rangeIncludingLineBreak.end)),
// Current content is range between header (shifted for linebreak) and splitter or common ancestors mark start
content: new vscode.Range(
scanned.startHeader.rangeIncludingLineBreak.end,
@@ -115,7 +115,7 @@ export class MergeConflictParser {
header: currentTokenLine.range,
decoratorContent: new vscode.Range(
currentTokenLine.rangeIncludingLineBreak.end,
MergeConflictParser.shiftBackOneCharacter(document, nextTokenLine.range.start)),
MergeConflictParser.shiftBackOneCharacter(document, nextTokenLine.range.start, currentTokenLine.rangeIncludingLineBreak.end)),
// Each common ancestors block is range between one common ancestors token
// (shifted for linebreak) and start of next common ancestors token or splitter
content: new vscode.Range(
@@ -129,7 +129,7 @@ export class MergeConflictParser {
header: scanned.endFooter.range,
decoratorContent: new vscode.Range(
scanned.splitter.rangeIncludingLineBreak.end,
MergeConflictParser.shiftBackOneCharacter(document, scanned.endFooter.range.start)),
MergeConflictParser.shiftBackOneCharacter(document, scanned.endFooter.range.start, scanned.splitter.rangeIncludingLineBreak.end)),
// Incoming content is range between splitter (shifted for linebreak) and footer start
content: new vscode.Range(
scanned.splitter.rangeIncludingLineBreak.end,
@@ -150,7 +150,11 @@ export class MergeConflictParser {
return text.includes(startHeaderMarker) && text.includes(endFooterMarker);
}
private static shiftBackOneCharacter(document: vscode.TextDocument, range: vscode.Position): vscode.Position {
private static shiftBackOneCharacter(document: vscode.TextDocument, range: vscode.Position, unlessEqual: vscode.Position): vscode.Position {
if (range.isEqual(unlessEqual)) {
return range;
}
let line = range.line;
let character = range.character - 1;

12
extensions/merge-conflict/src/mergeDecorator.ts
View File

@@ -197,11 +197,17 @@ export default class MergeDectorator implements vscode.Disposable {
conflicts.forEach(conflict => {
// TODO, this could be more effective, just call getMatchPositions once with a map of decoration to position
pushDecoration('current.content', { range: conflict.current.decoratorContent });
pushDecoration('incoming.content', { range: conflict.incoming.decoratorContent });
if (!conflict.current.decoratorContent.isEmpty) {
pushDecoration('current.content', { range: conflict.current.decoratorContent });
}
if (!conflict.incoming.decoratorContent.isEmpty) {
pushDecoration('incoming.content', { range: conflict.incoming.decoratorContent });
}
conflict.commonAncestors.forEach(commonAncestorsRegion => {
pushDecoration('commonAncestors.content', { range: commonAncestorsRegion.decoratorContent });
if (!commonAncestorsRegion.decoratorContent.isEmpty) {
pushDecoration('commonAncestors.content', { range: commonAncestorsRegion.decoratorContent });
}
});
if (this.config.enableDecorations) {