Underscore boundaries should be ranked lower

junegunn · Aug 16, 2024 · 28004c2 · 28004c2
1 parent c27c6dd
commit 28004c2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/algo/algo.go b/src/algo/algo.go
@@ -879,6 +879,15 @@ func exactMatchNaive(caseSensitive bool, normalize bool, forward bool, boundaryC
 			eidx = lenRunes - (bestPos - lenPattern + 1)
 		}
 		score, _ := calculateScore(caseSensitive, normalize, text, pattern, sidx, eidx, false)
+		if boundaryCheck {
+			// Underscore boundaries should be ranked lower than the other types of boundaries
+			if sidx > 0 && text.Get(sidx-1) == '_' {
+				score--
+			}
+			if eidx < lenRunes && text.Get(eidx) == '_' {
+				score--
+			}
+		}
 		return Result{sidx, eidx, score}, nil
 	}
 	return Result{-1, -1, 0}, nil

diff --git a/test/test_go.rb b/test/test_go.rb
@@ -3366,6 +3366,14 @@ def test_start_on_reload
     tmux.send_keys :Space
     tmux.until { |lines| assert_includes lines[-3], 'bar' }
   end
+
+  def test_boundary_match
+    # Underscore boundaries should be ranked lower
+    assert_equal(
+      %w[[x] -x- _x- -x_ _x_],
+      `printf -- 'xxx\n-xx\nxx-\n_x_\n_x-\n-x_\n[x]\n-x-\n' | fzf -f"'x'"`.lines(chomp: true)
+    )
+  end
 end
 
 module TestShell