Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

Create new hunks instead of expanding the existing ones

Browse Source 
This is necessary to distinguish between "real" diff lines and those
created due to expansion.
This commit is contained in:
René Pfeuffer
2020-06-09 10:49:58 +02:00
parent 586d9ac0d3
commit fde26cd8b7
2 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scm-ui/ui-components/src/repos/DiffExpander.ts
View File

@@ -110,8 +110,10 @@ class DiffExpander {
lines.pop();
}
const newChanges: Change[] = [];
let oldLineNumber = hunk!.changes![0]!.oldLineNumber! - lines.length;
let newLineNumber = hunk!.changes![0]!.newLineNumber! - lines.length;
const minOldLineNumberOfNewHunk = hunk.oldStart! - lines.length;
const minNewLineNumberOfNewHunk = hunk.newStart! - lines.length;
let oldLineNumber = minOldLineNumberOfNewHunk;
let newLineNumber = minNewLineNumberOfNewHunk;
lines.forEach(line => {
newChanges.push({
@@ -124,23 +126,21 @@ class DiffExpander {
oldLineNumber += 1;
newLineNumber += 1;
});
hunk.changes.forEach(change => newChanges.push(change));
const newHunk = {
...hunk,
oldStart: hunk.oldStart! - lines.length,
newStart: hunk.newStart! - lines.length,
oldLines: hunk.oldLines! + lines.length,
newLines: hunk.newLines! + lines.length,
const newHunk: Hunk = {
content: "",
oldStart: minOldLineNumberOfNewHunk,
newStart: minNewLineNumberOfNewHunk,
oldLines: lines.length,
newLines: lines.length,
changes: newChanges
};
const newHunks: Hunk[] = [];
this.file.hunks!.forEach((oldHunk: Hunk, i: number) => {
if (i === n) {
newHunks.push(newHunk);
} else {
newHunks.push(oldHunk);
}
newHunks.push(oldHunk);
});
const newFile = { ...this.file, hunks: newHunks };
callback(newFile);
@@ -151,9 +151,13 @@ class DiffExpander {
if (lines[lines.length - 1] === "") {
lines.pop();
}
const newChanges = [...hunk.changes];
let oldLineNumber: number = this.getMaxOldLineNumber(newChanges);
let newLineNumber: number = this.getMaxNewLineNumber(newChanges);
const newChanges: Change[] = [];
const maxOldLineNumberFromPrecedingHunk = this.getMaxOldLineNumber(hunk.changes);
const maxNewLineNumberFromPrecedingHunk = this.getMaxNewLineNumber(hunk.changes);
let oldLineNumber: number = maxOldLineNumberFromPrecedingHunk;
let newLineNumber: number = maxNewLineNumberFromPrecedingHunk;
lines.forEach(line => {
oldLineNumber += 1;
@@ -167,19 +171,21 @@ class DiffExpander {
});
});
const newHunk = {
...hunk,
oldLines: hunk.oldLines! + lines.length,
newLines: hunk.newLines! + lines.length,
const newHunk: Hunk = {
changes: newChanges,
content: "",
oldStart: maxOldLineNumberFromPrecedingHunk + 1,
newStart: maxNewLineNumberFromPrecedingHunk + 1,
oldLines: lines.length,
newLines: lines.length,
fullyExpanded: requestedLines < 0 || lines.length < requestedLines
};
const newHunks: Hunk[] = [];
this.file.hunks!.forEach((oldHunk: Hunk, i: number) => {
newHunks.push(oldHunk);
if (i === n) {
newHunks.push(newHunk);
} else {
newHunks.push(oldHunk);
}
});
const newFile = { ...this.file, hunks: newHunks };