github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-16 05:47:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Auto indent on paste

Browse Source 
Fixes #204
This commit is contained in:
Zachary Yedidia
2016-08-23 14:48:28 -07:00
parent 78e2445e43
commit 24076e7dff
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/micro/actions.go
View File

@@ -921,11 +921,14 @@ func (v *View) Paste(usePlugin bool) bool {
return false return false
} }
leadingWS := GetLeadingWhitespace(v.Buf.Line(v.Cursor.Y))
if v.Cursor.HasSelection() { if v.Cursor.HasSelection() {
v.Cursor.DeleteSelection() v.Cursor.DeleteSelection()
v.Cursor.ResetSelection() v.Cursor.ResetSelection()
} }
clip, _ := clipboard.ReadAll() clip, _ := clipboard.ReadAll()
clip = strings.Replace(clip, "\n", "\n"+leadingWS, -1)
v.Buf.Insert(v.Cursor.Loc, clip) v.Buf.Insert(v.Cursor.Loc, clip)
v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf) v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
v.freshClip = false v.freshClip = false

9
cmd/micro/view.go
View File

@@ -337,14 +337,7 @@ func (v *View) HandleEvent(event tcell.Event) {
} }
} }
case *tcell.EventPaste: case *tcell.EventPaste:
if v.Cursor.HasSelection() { relocate = v.Paste(true)
v.Cursor.DeleteSelection()
v.Cursor.ResetSelection()
}
clip := e.Text()
v.Buf.Insert(v.Cursor.Loc, clip)
v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
v.freshClip = false
case *tcell.EventMouse: case *tcell.EventMouse:
x, y := e.Position() x, y := e.Position()
x -= v.lineNumOffset - v.leftCol + v.x x -= v.lineNumOffset - v.leftCol + v.x