removed padRegexp

Author: matthias314

internal/buffer/search.go

@@ -7,24 +7,17 @@ import (
 	"github.com/zyedidia/micro/v2/internal/util"
 )
 
-const (
-	padStart = 1 << iota
-	padEnd
-)
-
 // We want "^" and "$" to match only the beginning/end of a line, not the
 // beginning/end of the search region if it is in the middle of a line.
 // In that case we use padded regexps to require a rune before or after
 // the match. (This also affects other empty-string patters like "\\b".)
-// The function padRegexp creates these padded regexps.
-func padRegexp(r *regexp.Regexp) [4]*regexp.Regexp {
-	rPadStart := regexp.MustCompile(".(?:" + r.String() + ")")
-	rPadEnd := regexp.MustCompile("(?:" + r.String() + ").")
-	rPadBoth := regexp.MustCompile(".(?:" + r.String() + ").")
-	return [4]*regexp.Regexp{r, rPadStart, rPadEnd, rPadBoth}
-}
+// The following two flags indicate the padding used.
+const (
+	padStart = 1 << iota
+	padEnd
+)
 
-func findLineParams(b *Buffer, start, end Loc, i int) ([]byte, int, int) {
+func findLineParams(b *Buffer, start, end Loc, i int, r *regexp.Regexp) ([]byte, int, int, *regexp.Regexp) {
 	l := b.LineBytes(i)
 	charpos := 0
 	padMode := 0
@@ -48,7 +41,15 @@ func findLineParams(b *Buffer, start, end Loc, i int) ([]byte, int, int) {
 		}
 	}
 
-	return l, charpos, padMode
+	if padMode == padStart {
+		r = regexp.MustCompile(".(?:" + r.String() + ")")
+	} else if padMode == padEnd {
+		r = regexp.MustCompile("(?:" + r.String() + ").")
+	} else if padMode == padStart|padEnd {
+		r = regexp.MustCompile(".(?:" + r.String() + ").")
+	}
+
+	return l, charpos, padMode, r
 }
 
 func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
@@ -66,12 +67,10 @@ func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 		start, end = end, start
 	}
 
-	rPadded := padRegexp(r)
-
 	for i := start.Y; i <= end.Y; i++ {
-		l, charpos, padMode := findLineParams(b, start, end, i)
+		l, charpos, padMode, rPadded := findLineParams(b, start, end, i, r)
 
-		match := rPadded[padMode].FindIndex(l)
+		match := rPadded.FindIndex(l)
 
 		if match != nil {
 			if padMode&padStart != 0 {
@@ -105,12 +104,10 @@ func (b *Buffer) findUp(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 		start, end = end, start
 	}
 
-	rPadded := padRegexp(r)
-
 	for i := end.Y; i >= start.Y; i-- {
-		l, charpos, padMode := findLineParams(b, start, end, i)
+		l, charpos, padMode, rPadded := findLineParams(b, start, end, i, r)
 
-		allMatches := rPadded[padMode].FindAllIndex(l, -1)
+		allMatches := rPadded.FindAllIndex(l, -1)
 
 		if allMatches != nil {
 			match := allMatches[len(allMatches)-1]