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

Optimize search

Browse Source 
Fixes #722
This commit is contained in:
Zachary Yedidia
2017-07-08 15:03:35 -04:00
parent 252def5b95
commit e4751fd84c
3 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/micro/actions.go
View File

@@ -933,11 +933,11 @@ func (v *View) Find(usePlugin bool) bool {
searchStr := ""
if v.Cursor.HasSelection() {
searchStart = ToCharPos(v.Cursor.CurSelection[1], v.Buf)
searchStart = ToCharPos(v.Cursor.CurSelection[1], v.Buf)
searchStart = v.Cursor.CurSelection[1]
searchStart = v.Cursor.CurSelection[1]
searchStr = v.Cursor.GetSelection()
} else {
searchStart = ToCharPos(v.Cursor.Loc, v.Buf)
searchStart = v.Cursor.Loc
}
BeginSearch(searchStr)
@@ -955,10 +955,10 @@ func (v *View) FindNext(usePlugin bool) bool {
}
if v.Cursor.HasSelection() {
searchStart = ToCharPos(v.Cursor.CurSelection[1], v.Buf)
searchStart = v.Cursor.CurSelection[1]
// lastSearch = v.Cursor.GetSelection()
} else {
searchStart = ToCharPos(v.Cursor.Loc, v.Buf)
searchStart = v.Cursor.Loc
}
if lastSearch == "" {
return true
@@ -979,9 +979,9 @@ func (v *View) FindPrevious(usePlugin bool) bool {
}
if v.Cursor.HasSelection() {
searchStart = ToCharPos(v.Cursor.CurSelection[0], v.Buf)
searchStart = v.Cursor.CurSelection[0]
} else {
searchStart = ToCharPos(v.Cursor.Loc, v.Buf)
searchStart = v.Cursor.Loc
}
messenger.Message("Finding: " + lastSearch)
Search(lastSearch, v, false)
@@ -1915,7 +1915,7 @@ func (v *View) SpawnMultiCursor(usePlugin bool) bool {
sel := spawner.GetSelection()
searchStart = ToCharPos(spawner.CurSelection[1], v.Buf)
searchStart = spawner.CurSelection[1]
v.Cursor = c
Search(sel, v, true)
@@ -1976,7 +1976,7 @@ func (v *View) SkipMultiCursor(usePlugin bool) bool {
}
sel := cursor.GetSelection()
searchStart = ToCharPos(cursor.CurSelection[1], v.Buf)
searchStart = cursor.CurSelection[1]
v.Cursor = cursor
Search(sel, v, true)
v.Relocate()