zyedidia/micro
1
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2025-06-18 23:05:40 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

modify duplicateLine to keep cursor still

Browse Source 
also fixes issue where undo or changing the selection can revert to `origSelection`
This commit is contained in:
WitheringAway 2025-01-30 15:43:19 -05:00
parent 5ee7fb6014
commit a6e039ef76
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/action/actions.go
View File

@ -11,6 +11,7 @@ import (
"time" "time"
shellquote "github.com/kballard/go-shellquote" shellquote "github.com/kballard/go-shellquote"
"github.com/micro-editor/tcell/v2"
"github.com/zyedidia/micro/v2/internal/buffer" "github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/v2/internal/clipboard" "github.com/zyedidia/micro/v2/internal/clipboard"
"github.com/zyedidia/micro/v2/internal/config" "github.com/zyedidia/micro/v2/internal/config"
@ -18,7 +19,6 @@ import (
"github.com/zyedidia/micro/v2/internal/screen" "github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/v2/internal/shell" "github.com/zyedidia/micro/v2/internal/shell"
"github.com/zyedidia/micro/v2/internal/util" "github.com/zyedidia/micro/v2/internal/util"
"github.com/micro-editor/tcell/v2"
) )
// ScrollUp is not an action // ScrollUp is not an action
@ -1438,12 +1438,13 @@ func (h *BufPane) Duplicate() bool {
// DuplicateLine duplicates the current line. If there is a selection, DuplicateLine // DuplicateLine duplicates the current line. If there is a selection, DuplicateLine
// duplicates all the lines that are (fully or partially) in the selection. // duplicates all the lines that are (fully or partially) in the selection.
func (h *BufPane) DuplicateLine() bool { func (h *BufPane) DuplicateLine() bool {
if h.Cursor.HasSelection() { loc := h.Cursor.Loc
origLoc := h.Cursor.Loc lastVisualX := h.Cursor.LastVisualX
origLastVisualX := h.Cursor.LastVisualX lastWrappedVisualX := h.Cursor.LastWrappedVisualX
origLastWrappedVisualX := h.Cursor.LastWrappedVisualX curSelection := h.Cursor.CurSelection
origSelection := h.Cursor.CurSelection origSelection := h.Cursor.OrigSelection
if h.Cursor.HasSelection() {
start := h.Cursor.CurSelection[0] start := h.Cursor.CurSelection[0]
end := h.Cursor.CurSelection[1] end := h.Cursor.CurSelection[1]
if start.GreaterThan(end) { if start.GreaterThan(end) {
@ -1460,11 +1461,6 @@ func (h *BufPane) DuplicateLine() bool {
h.Buf.Insert(h.Cursor.Loc, "\n"+string(h.Buf.LineBytes(y))) h.Buf.Insert(h.Cursor.Loc, "\n"+string(h.Buf.LineBytes(y)))
} }
h.Cursor.Loc = origLoc
h.Cursor.LastVisualX = origLastVisualX
h.Cursor.LastWrappedVisualX = origLastWrappedVisualX
h.Cursor.CurSelection = origSelection
if start.Y < end.Y { if start.Y < end.Y {
InfoBar.Message(fmt.Sprintf("Duplicated %d lines", end.Y-start.Y+1)) InfoBar.Message(fmt.Sprintf("Duplicated %d lines", end.Y-start.Y+1))
} else { } else {
@ -1475,6 +1471,13 @@ func (h *BufPane) DuplicateLine() bool {
h.Buf.Insert(h.Cursor.Loc, "\n"+string(h.Buf.LineBytes(h.Cursor.Y))) h.Buf.Insert(h.Cursor.Loc, "\n"+string(h.Buf.LineBytes(h.Cursor.Y)))
InfoBar.Message("Duplicated line") InfoBar.Message("Duplicated line")
} }
h.Cursor.Loc = loc
h.Cursor.LastVisualX = lastVisualX
h.Cursor.LastWrappedVisualX = lastWrappedVisualX
h.Cursor.CurSelection = curSelection
h.Cursor.OrigSelection = origSelection
h.Relocate() h.Relocate()
return true return true
} }