Add logic to getNextSelectionRange so that selection remains at bottom when last line is staged

kuychaco · vanessayuenn · kuychaco · commit 16854842f2e3 · 2018-11-16T14:49:24.000-08:00
Co-Authored-By: Vanessa Yuen &lt;vanessayuenn@users.noreply.github.com&gt;
diff --git a/lib/models/patch/multi-file-patch.js b/lib/models/patch/multi-file-patch.js
@@ -162,20 +162,30 @@ export default class MultiFilePatch {
 
     let newSelectionRow = 0;
     let remainingChangedLines = lastSelectionIndex;
+
+    let foundRow = false;
+    let lastChangedRow;
+
     // counts the same number of lines but backwards in the new patch.
     patchLoop: for (const filePatch of this.getFilePatches()) {
       for (const hunk of filePatch.getHunks()) {
         for (const change of hunk.getChanges()) {
           if (remainingChangedLines < change.bufferRowCount()) {
             newSelectionRow = change.getStartBufferRow() + remainingChangedLines;
+            foundRow = true;
             break patchLoop;
           } else {
             remainingChangedLines -= change.bufferRowCount();
+            lastChangedRow = change.getEndBufferRow();
           }
         }
       }
     }
 
+    if (!foundRow) { // the selected line was the last changed line
+      newSelectionRow = lastChangedRow;
+    }
+
     return Range.fromObject([[newSelectionRow, 0], [newSelectionRow, Infinity]]);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -162,20 +162,30 @@ export default class MultiFilePatch {`
`162`	`162`
`163`	`163`	`let newSelectionRow = 0;`
`164`	`164`	`let remainingChangedLines = lastSelectionIndex;`
	`165`	`+`
	`166`	`+ let foundRow = false;`
	`167`	`+ let lastChangedRow;`
	`168`	`+`
`165`	`169`	`// counts the same number of lines but backwards in the new patch.`
`166`	`170`	`patchLoop: for (const filePatch of this.getFilePatches()) {`
`167`	`171`	`for (const hunk of filePatch.getHunks()) {`
`168`	`172`	`for (const change of hunk.getChanges()) {`
`169`	`173`	`if (remainingChangedLines < change.bufferRowCount()) {`
`170`	`174`	`newSelectionRow = change.getStartBufferRow() + remainingChangedLines;`
	`175`	`+ foundRow = true;`
`171`	`176`	`break patchLoop;`
`172`	`177`	`} else {`
`173`	`178`	`remainingChangedLines -= change.bufferRowCount();`
	`179`	`+ lastChangedRow = change.getEndBufferRow();`
`174`	`180`	`}`
`175`	`181`	`}`
`176`	`182`	`}`
`177`	`183`	`}`
`178`	`184`
	`185`	`+ if (!foundRow) { // the selected line was the last changed line`
	`186`	`+ newSelectionRow = lastChangedRow;`
	`187`	`+ }`
	`188`	`+`
`179`	`189`	`return Range.fromObject([[newSelectionRow, 0], [newSelectionRow, Infinity]]);`
`180`	`190`	`}`
`181`	`191`