0.15.1

Related #666

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.15.1
+------
+- Fixed panic when the pattern occurs after 2^15-th column
+- Fixed rendering delay when displaying extremely long lines
+
 0.15.0
 ------
 - Improved fuzzy search algorithm

install

@@ -2,8 +2,8 @@
 
 set -u
 
-[[ "$@" =~ --pre ]] && version=0.15.0 pre=1 ||
+[[ "$@" =~ --pre ]] && version=0.15.1 pre=1 ||
-                       version=0.15.0 pre=0
+                       version=0.15.1 pre=0
 
 auto_completion=
 key_bindings=

man/man1/fzf-tmux.1

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf-tmux 1 "Sep 2016" "fzf 0.15.0" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Sep 2016" "fzf 0.15.1" "fzf-tmux - open fzf in tmux split pane"
 
 .SH NAME
 fzf-tmux - open fzf in tmux split pane

man/man1/fzf.1

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Sep 2016" "fzf 0.15.0" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Sep 2016" "fzf 0.15.1" "fzf - a command-line fuzzy finder"
 
 .SH NAME
 fzf - a command-line fuzzy finder

src/algo/algo.go

@@ -257,13 +257,14 @@ func FuzzyMatchV2(caseSensitive bool, forward bool, input util.Chars, pattern []
 	}
 
 	// Reuse pre-allocated integer slice to avoid unnecessary sweeping of garbages
-	offset := 0
+	offset16 := 0
+	offset32 := 0
 	// Bonus point for each position
-	offset, B := alloc16(offset, slab, N, false)
+	offset16, B := alloc16(offset16, slab, N, false)
 	// The first occurrence of each character in the pattern
-	offset, F := alloc16(offset, slab, M, false)
+	offset32, F := alloc32(offset32, slab, M, false)
 	// Rune array
-	_, T := alloc32(0, slab, N, false)
+	offset32, T := alloc32(offset32, slab, N, false)
 
 	// Phase 1. Check if there's a match and calculate bonus for each point
 	pidx, lastIdx, prevClass := 0, 0, charNonWord
@@ -291,7 +292,7 @@ func FuzzyMatchV2(caseSensitive bool, forward bool, input util.Chars, pattern []
 		if pidx < M {
 			if char == pattern[pidx] {
 				lastIdx = idx
-				F[pidx] = int16(idx)
+				F[pidx] = int32(idx)
 				pidx++
 			}
 		} else {
@@ -307,10 +308,10 @@ func FuzzyMatchV2(caseSensitive bool, forward bool, input util.Chars, pattern []
 	// Phase 2. Fill in score matrix (H)
 	// Unlike the original algorithm, we do not allow omission.
 	width := lastIdx - int(F[0]) + 1
-	offset, H := alloc16(offset, slab, width*M, false)
+	offset16, H := alloc16(offset16, slab, width*M, false)
 
 	// Possible length of consecutive chunk at each position.
-	offset, C := alloc16(offset, slab, width*M, false)
+	offset16, C := alloc16(offset16, slab, width*M, false)
 
 	maxScore, maxScorePos := int16(0), 0
 	for i := 0; i < M; i++ {

src/algo/algo_test.go

@@ -1,6 +1,7 @@
 package algo
 
 import (
+	"math"
 	"sort"
 	"strings"
 	"testing"
@@ -154,3 +155,12 @@ func TestEmptyPattern(t *testing.T) {
 		assertMatch(t, SuffixMatch, true, dir, "foobar", "", 6, 6, 0)
 	}
 }
+
+func TestLongString(t *testing.T) {
+	bytes := make([]byte, math.MaxUint16*2)
+	for i := range bytes {
+		bytes[i] = 'x'
+	}
+	bytes[math.MaxUint16] = 'z'
+	assertMatch(t, FuzzyMatchV2, true, true, string(bytes), "zx", math.MaxUint16, math.MaxUint16+2, scoreMatch*2+bonusConsecutive)
+}

src/constants.go

@@ -8,7 +8,7 @@ import (
 
 const (
 	// Current version
-	version = "0.15.0"
+	version = "0.15.1"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond

src/options_test.go

@@ -342,7 +342,7 @@ func TestDefaultCtrlNP(t *testing.T) {
 	check([]string{"--bind=ctrl-n:accept"}, curses.CtrlN, actAccept)
 	check([]string{"--bind=ctrl-p:accept"}, curses.CtrlP, actAccept)
 
-	hist := "--history=/tmp/foo"
+	hist := "--history=/tmp/fzf-history"
 	check([]string{hist}, curses.CtrlN, actNextHistory)
 	check([]string{hist}, curses.CtrlP, actPreviousHistory)
 

src/terminal.go

@@ -401,6 +401,8 @@ func displayWidth(runes []rune) int {
 const (
 	minWidth  = 16
 	minHeight = 4
+
+	maxDisplayWidthCalc = 1024
 )
 
 func calculateSize(base int, size sizeSpec, margin int, minSize int) int {
@@ -651,6 +653,11 @@ func displayWidthWithLimit(runes []rune, prefixWidth int, limit int) int {
 }
 
 func trimLeft(runes []rune, width int) ([]rune, int32) {
+	if len(runes) > maxDisplayWidthCalc && len(runes) > width {
+		trimmed := len(runes) - width
+		return runes[trimmed:], int32(trimmed)
+	}
+
 	currentWidth := displayWidth(runes)
 	var trimmed int32