Fix regression in CopyLine, CutLine, DeleteLine for last line (zyedidia#3519)

dmaluka · web-flow · commit 1ead9ce4fd44 · 2024-10-24T18:01:45.000+02:00
Fix regression introduced in commit fdacb28 ("CopyLine, CutLine, DeleteLine: respect selection"): when CopyLine, CutLine or DeleteLine is done in the last line of the buffer and this line is not empty, this line gets selected but does not get copied/cut/deleted (and worse, it remains selected).
diff --git a/internal/action/actions.go b/internal/action/actions.go
@@ -1300,7 +1300,13 @@ func (h *BufPane) selectLines() int {
 	} else {
 		h.Cursor.SelectLine()
 	}
-	return h.Cursor.CurSelection[1].Y - h.Cursor.CurSelection[0].Y
+
+	nlines := h.Cursor.CurSelection[1].Y - h.Cursor.CurSelection[0].Y
+	if nlines == 0 && h.Cursor.HasSelection() {
+		// selected last line and it is not empty
+		nlines++
+	}
+	return nlines
 }
 
 // Copy the selection to the system clipboard

Original file line number	Diff line number	Diff line change
`@@ -1300,7 +1300,13 @@ func (h *BufPane) selectLines() int {`
`1300`	`1300`	`} else {`
`1301`	`1301`	`h.Cursor.SelectLine()`
`1302`	`1302`	`}`
`1303`		`- return h.Cursor.CurSelection[1].Y - h.Cursor.CurSelection[0].Y`
	`1303`	`+`
	`1304`	`+ nlines := h.Cursor.CurSelection[1].Y - h.Cursor.CurSelection[0].Y`
	`1305`	`+ if nlines == 0 && h.Cursor.HasSelection() {`
	`1306`	`+ // selected last line and it is not empty`
	`1307`	`+ nlines++`
	`1308`	`+ }`
	`1309`	`+ return nlines`
`1304`	`1310`	`}`
`1305`	`1311`
`1306`	`1312`	`// Copy the selection to the system clipboard`