mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

When scores match tie break with length

Browse Source
This commit is contained in:
Kovid Goyal
2025-06-24 21:17:02 +05:30
parent b8d53208ea
commit 6b07ad7ba4
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gen/go_code.py
View File

@@ -201,7 +201,7 @@ def make_bitfields() -> None:
) )
mb('tools/vt', 'CellColor', 'is_idx 1', 'red 8', 'green 8', 'blue 8') mb('tools/vt', 'CellColor', 'is_idx 1', 'red 8', 'green 8', 'blue 8')
mb('tools/vt', 'LineAttrs', 'prompt_kind 2',) mb('tools/vt', 'LineAttrs', 'prompt_kind 2',)
mb('kittens/choose_files', 'CombinedScore', 'score 32', 'index 32') mb('kittens/choose_files', 'CombinedScore', 'score 16', 'length 16', 'index 32')
# }}} # }}}
# Completions {{{ # Completions {{{

14
kittens/choose_files/scan.go
View File

@@ -21,7 +21,7 @@ import (
var _ = fmt.Print var _ = fmt.Print
func (c CombinedScore) String() string { func (c CombinedScore) String() string {
return fmt.Sprintf("{score: %d index: %d}", c.Score(), c.Index()) return fmt.Sprintf("{score: %d length: %d index: %d}", c.Score(), c.Length(), c.Index())
} }
type ResultItem struct { type ResultItem struct {
@@ -34,7 +34,7 @@ type ResultsType []*ResultItem
func (r *ResultItem) SetScoreResult(x fzf.Result) { func (r *ResultItem) SetScoreResult(x fzf.Result) {
r.positions = x.Positions r.positions = x.Positions
r.score.Set_score(uint32(math.MaxUint32 - x.Score)) r.score.Set_score(uint16(math.MaxUint16 - uint16(x.Score)))
} }
func (r *ResultItem) Set_relpath(root_dir string) { func (r *ResultItem) Set_relpath(root_dir string) {
@@ -46,7 +46,7 @@ func (r *ResultItem) Set_relpath(root_dir string) {
} }
func (r ResultItem) IsMatching() bool { func (r ResultItem) IsMatching() bool {
return r.score.Score() < uint32(math.MaxUint32) return r.score.Score() < uint16(math.MaxUint16)
} }
func (r ResultItem) String() string { func (r ResultItem) String() string {
@@ -310,12 +310,14 @@ func (fss *FileSystemScorer) worker(on_results chan int, worker_wait *sync.WaitG
} }
for i, r := range rp { for i, r := range rp {
r.SetScoreResult(scores[i]) r.SetScoreResult(scores[i])
r.score.Set_length(uint16(len(r.text)))
} }
rp = utils.Filter(rp, func(r *ResultItem) bool { return r.IsMatching() }) rp = utils.Filter(rp, func(r *ResultItem) bool { return r.IsMatching() })
} else { } else {
z := fzf.Result{}
for _, r := range rp { for _, r := range rp {
r.SetScoreResult(z) r.score.Set_length(0)
r.score.Set_score(0)
r.positions = nil
} }
} }
} }
@@ -339,7 +341,7 @@ func (fss *FileSystemScorer) worker(on_results chan int, worker_wait *sync.WaitG
rr = merge_sorted_slices(existing, rp) rr = merge_sorted_slices(existing, rp)
} }
global_min_score = min(global_min_score, min_score) global_min_score = min(global_min_score, min_score)
global_max_score = min(global_max_score, max_score) global_max_score = max(global_max_score, max_score)
fss.mutex.Lock() fss.mutex.Lock()
fss.renderable_results = rr fss.renderable_results = rr
fss.mutex.Unlock() fss.mutex.Unlock()