Fix replace cursor relocation

[micro.git] / cmd / micro / search.go

diff --git a/cmd/micro/search.go b/cmd/micro/search.go
index 227e3af9e370141dd09722803680436208eb5e1a..ddf77aef660244b529816a18ce2ffc7200b6de63 100644 (file)
--- a/cmd/micro/search.go
+++ b/cmd/micro/search.go
@@ -15,10 +15,15 @@ var (
 
        // Is there currently a search in progress
        searching bool
+
+       // Stores the history for searching
+       searchHistory []string
 )
 
 // BeginSearch starts a search
 func BeginSearch() {
+       searchHistory = append(searchHistory, "")
+       messenger.historyNum = len(searchHistory) - 1
        searching = true
        messenger.hasPrompt = true
        messenger.Message("Find: ")
@@ -26,6 +31,7 @@ func BeginSearch() {
 
 // EndSearch stops the current search
 func EndSearch() {
+       searchHistory[len(searchHistory)-1] = messenger.response
        searching = false
        messenger.hasPrompt = false
        messenger.Clear()
@@ -48,7 +54,7 @@ func HandleSearchEvent(event tcell.Event, v *View) {
                }
        }
 
-       messenger.HandleEvent(event)
+       messenger.HandleEvent(event, searchHistory)
 
        if messenger.cursorx < 0 {
                // Done
@@ -106,6 +112,7 @@ func Search(searchStr string, v *View, down bool) {
                } else {
                        match = matches[0]
                }
+               str = text
        }
 
        if !down {
@@ -118,9 +125,9 @@ func Search(searchStr string, v *View, down bool) {
                return
        }
 
-       v.Cursor.curSelection[0] = charPos + match[0]
-       v.Cursor.curSelection[1] = charPos + match[1]
-       v.Cursor.x, v.Cursor.y = FromCharPos(charPos+match[1]-1, v.Buf)
+       v.Cursor.CurSelection[0] = FromCharPos(charPos+runePos(match[0], str), v.Buf)
+       v.Cursor.CurSelection[1] = FromCharPos(charPos+runePos(match[1], str), v.Buf)
+       v.Cursor.Loc = FromCharPos(charPos+match[1]-1, v.Buf)
        if v.Relocate() {
                v.matches = Match(v)
        }