mirror of
https://github.com/lotabout/skim.git
synced 2026-09-14 01:06:25 -04:00
* feat: initial work on skim v3 wip * wip: SW * chore: refactor SkimV3 to make it more maintainable * chore: remove SIMD batch scores * fix: fix Skim V3 tests * feat: small optimizations * feat: bigger optimizations * chore: generate completions & manpage * chore: remove unused wide dependency * chore: update deps * chore: generate completions & manpage * fix: make sure all subsequences pass in non-typos mode * chore: trade some performance against more precision with typos * feat: gain the performance back using unchecked accesses * chore: remove failing tests * feat: use banding across whole upper triangle * chore: remove useless DEAD_COL checks * feat: make sure we match everything `frizbee` does while enforcing first char * feat: minor optimizations * feat: more minor optimizations * chore: tweak parameters to find a good balance between performance and accuracy * chore: accept snap * chore: penalize consecutive typos * chore: revert consecutive typos penalization as it seems useless in practice * wip: optimizations * feat: multiple optimizations * perf(skim_v3): use 2-row rolling buffer for score-only DP path When compute_indices=false (fuzzy_match), the full (n+1)×mcols matrix was allocated and populated even though traceback was never performed. Introduce score_only_dp() which maintains only two rows at a time, reducing memory from O(n×m) to O(m) and improving cache utilization for long choice strings. * perf(skim_v3): add early termination when DP rows are all-zero Track consecutive rows where no cell has a positive score. After 2 consecutive dead rows, return None immediately: gap penalties can only decrease existing scores, so no downstream row can produce a positive result. Applied to both score_only_dp and full_dp. * perf(skim_v3): add range_dp for fuzzy_match_range, avoiding full index vec fuzzy_match_range previously called fuzzy_indices (full traceback collecting every matched index) just to extract the first and last. Introduce range_dp which performs the same full-matrix DP but during traceback only records the begin and end positions, avoiding the Vec allocation and index collection. Add range_consistent_with_indices test to verify correctness. * perf(skim_v3): remove redundant is_subsequence scan in exact mode In non-typo mode, is_subsequence was called before compute_banding, but compute_banding -> compute_first_match_cols already validates the same subsequence property (returning None if any pattern char is absent). Remove the redundant O(m) scan and delete the now-unused is_subsequence function. Typo mode retains cheap_typo_prefilter as its guard. * perf(skim_v3): avoid clone in traceback by using mem::take on thread-local buffer Previously full_dp returned indices via indices_ref.to_vec() which copies all n index values into a new allocation. Replace with std::mem::take which moves ownership of the populated Vec out of the thread-local without copying, trading the reuse-across-calls benefit for zero-copy return per call. * perf(skim_v3): tighten typo-mode upper band bound in typo_vband_row Previously the upper column bound in typo mode was always m (the full choice length), even for early rows where the diagonal sits far from the right edge. Compute hi = (j + bandwidth).min(m) symmetrically with the existing lower bound, skipping cells that cannot contribute to a valid alignment and reducing work for short patterns on long strings. * perf(skim_v3): use memchr SIMD for first-char search in prefilter and banding Add memchr as a direct dependency and implement Atom::find_first_in with a u8-specialization that calls memchr() for case-sensitive search and a two-call min-of-two approach for case-insensitive. Use this in: - cheap_typo_prefilter: first-character existence check - find_first_char: typo-mode banding anchor computation This replaces scalar byte-by-byte loops with SIMD-vectorized searches for ASCII inputs, the common case. * revert(skim_v3): restore m upper bound in typo_vband_row The tightened hi = (j + bandwidth).min(m) bound incorrectly rejected valid typo-mode alignments where the optimal path takes many LEFT (gap) steps past the bandwidth boundary. The snapshot test confirms 5 fewer matches vs the expected 37. Revert to hi = m; the affine gap penalty alone prevents poor alignments from winning. * perf(skim_v3): add ASCII fast path to char::eq_ignore_case Replace the to_lowercase() iterator comparison with eq_ignore_ascii_case() for the common case where both chars are ASCII. This avoids creating two ToLowercase iterators per comparison in the non-ASCII DP path, using a single bitwise comparison instead. * perf(skim_v3): replace RefCell with UnsafeCell (TLCell) in thread-locals ThreadLocal<RefCell<T>> incurs a runtime borrow-check on every access. Since ThreadLocal already guarantees per-thread isolation and we never re-enter the same thread-local within a single call stack, the RefCell check is redundant. Replace with TLCell<T>, a Send newtype over UnsafeCell<T>, and a tl_get_mut helper that returns &mut T directly. Document the safety invariant at each call site. Also remove the now-unused SWMatrix::zero constructor. * fix(skim_v3): fix precompute_bonuses reserve logic The previous reserve(cho.len().saturating_sub(buf.len())) computed the needed additional capacity relative to the current length, which could be wrong if buf.len() was stale (e.g. after a set_len call on a longer buffer). Replace with clear() + reserve(cho.len()) for a correct and clear-intent O(1) reset followed by a single exact reservation. * guard: return None for pat.len() > MAX_PAT_LEN in exact mode Patterns longer than MAX_PAT_LEN (16) used the stack-allocated [usize; MAX_PAT_LEN] banding arrays with out-of-bounds indices, causing undefined behaviour in the exact (non-typo) DP path. Add an early return of None in compute_first_match_cols and compute_last_match_cols so callers gracefully skip overlong patterns rather than reading past the end of a fixed-size array. Typo mode is unaffected: its dummy arrays are never indexed by the pattern length. * perf: re-encode Dir::None=0 so CELL_ZERO is all-zero bytes Previously Dir::None=3 made Cell::new(0,Dir::None) encode as 0x00030000, preventing bulk-zeroing with write_bytes(0). Re-assign discriminants to None=0, Diag=1, Up=2, Left=3 so that CELL_ZERO is now all-zero. Update: - Dir discriminants in the enum - Cell::is_diag() (checks tag==1 instead of 0) - compute_cell branchless arithmetic (base is Left=3, subtract 2 for Diag wins, 1 for Up wins; None=0 so no OR needed) - score_only_dp: replace init loop with write_bytes(0) - full_dp / range_dp: replace row-0 init loop with write_bytes(0) * perf: 128-bit ASCII bitset for cheap_typo_prefilter tail scan Add Atom::count_tail_present with a u8 specialisation that builds a two-u64 presence bitset from the choice in a single O(m) pass, making each subsequent pattern-char lookup O(1) instead of O(m). The char (non-ASCII) path delegates to count_tail_present_ordered, the same ordered linear scan that was previously inlined in the function. The change is observationally equivalent: the prefilter remains a lenient superset of the old check (unordered vs. ordered presence), and the snapshot test count is unchanged. * perf: early exit in count_tail_present_ordered when match is impossible Add a hopeless-state check at the top of each iteration: if matched plus remaining pattern chars cannot reach min_needed, bail out immediately rather than completing the full scan. This prunes the non-ASCII (char) ordered-scan fallback inside cheap_typo_prefilter when the pattern is long and many chars are missing from the choice. * cleanup: remove unused constants SEPARATOR_MASK_LO/HI and FIRST_CHAR_BONUS_MULTIPLIER All three were suppressed with #[allow(dead_code)] and are not referenced by any live code. SEPARATOR_TABLE is the active lookup; the mask constants were documentation remnants. * refactor: replace unsafe transmute in Cell::dir() and compute_cell with safe match Both usages converted a u8 (guaranteed 0..=3) to Dir via transmute. Replace with an exhaustive match on the 2-bit tag value — no unsafe required, and the compiler generates the same conditional-move sequence. * perf: Atom::is_sep() trait method avoids u8→char→u32 in separator check Add is_sep() to the Atom trait with a u8 specialisation that indexes SEPARATOR_TABLE directly with self as usize, skipping the into::<char> conversion required by the generic default. Remove the now-unnecessary is_separator free function; callers use prev.is_sep() instead. * refactor: precompute_bonuses rewritten as safe iterator chain Replace the unsafe raw-pointer write loop with a safe iterator that starts with START_OF_STRING_BONUS and maps windows-of-2 to the separator/camelCase bonus formula. buf.extend() dispatches through ExactSizeIterator, so no extra allocation occurs. The safe form exposes the element-independent structure to the compiler, enabling auto-vectorisation on release builds. * refactor: extract match_slices_range; simplify run_range Add match_slices_range<C: Atom> that mirrors match_slices but calls range_dp instead of dispatch_dp. run_range now delegates the ASCII path to match_slices_range and keeps only the non-ASCII char-buf setup inline, eliminating the duplicated prefilter + bonus + range_dp block. * mem: SWMatrix::resize shrinks when buffer is 4× over-allocated After a one-off large input, the full-DP matrix buffer could hold significantly more memory than typical inputs require. Add a shrink-or-cap heuristic: if the current capacity exceeds 4× the needed size, truncate and shrink_to(2×needed) to release excess memory without thrashing on stable-sized inputs. * Revert "mem: SWMatrix::resize shrinks when buffer is 4× over-allocated" This reverts commit9c8571ebe8. * Revert "refactor: replace unsafe transmute in Cell::dir() and compute_cell with safe match" This reverts commit8805fa14ce. * Revert "perf: Atom::is_sep() trait method avoids u8→char→u32 in separator check" This reverts commit175f26af81. * Revert "perf: early exit in count_tail_present_ordered when match is impossible" This reverts commit29721558f0. * Revert "perf: 128-bit ASCII bitset for cheap_typo_prefilter tail scan" This reverts commitd79947fcb5. * Revert "refactor: extract match_slices_range; simplify run_range" This reverts commit0fb7f05513. * Revert "perf(skim_v3): replace RefCell with UnsafeCell (TLCell) in thread-locals" This reverts commit0806683251. * Revert "perf(skim_v3): add ASCII fast path to char::eq_ignore_case" This reverts commit069710ad7c. * Revert "revert(skim_v3): restore m upper bound in typo_vband_row" This reverts commit90ffc46633. * Revert "perf(skim_v3): tighten typo-mode upper band bound in typo_vband_row" This reverts commitf38ca3a10d. * Revert "perf(skim_v3): avoid clone in traceback by using mem::take on thread-local buffer" This reverts commitffa9a21167. * Revert "perf(skim_v3): add early termination when DP rows are all-zero" This reverts commit073195be58. * Revert "perf(skim_v3): use 2-row rolling buffer for score-only DP path" This reverts commit3acacaad74. * fix: reverse only order of frizbee indices * chore: rename & refactor into multiple files * chore: optimizations to the main flow * fix: correct banding in non-typo path * chore: generate completions & manpage * docs: add algorithms section to the README [skip ci] * fix(ari): correctly bound vband low * chore(ari): specific pre-separator bonuses * fix(ari): boost consec a bit more to beat start/sep * chore: generate completions & manpage * feat: run matcher over chunks * chore: adjust penalties to keep typos under subsequences * chore: accept snapshot * fix: replace greedy ordered prefilter with looser unordered * chore: finish up rename * chore: review --------- Co-authored-by: Skim bot <skim-bot@skim-rs.github.io>
176 lines
9.1 KiB
Fish
176 lines
9.1 KiB
Fish
complete -c sk -l min-query-length -d 'Minimum query length to start showing results' -r
|
|
complete -c sk -s t -l tiebreak -d 'Comma-separated list of sort criteria to apply when the scores are tied.' -r -f -a "score\t''
|
|
-score\t''
|
|
begin\t''
|
|
-begin\t''
|
|
end\t''
|
|
-end\t''
|
|
length\t''
|
|
-length\t''
|
|
index\t''
|
|
-index\t''"
|
|
complete -c sk -s n -l nth -d 'Fields to be matched' -r
|
|
complete -c sk -l with-nth -d 'Fields to be transformed' -r
|
|
complete -c sk -s d -l delimiter -d 'Delimiter between fields' -r
|
|
complete -c sk -l algo -d 'Fuzzy matching algorithm' -r -f -a "skim_v1\t'Original skim fuzzy matching algorithm (v1)'
|
|
skim_v2\t'Improved skim fuzzy matching algorithm (v2, default)'
|
|
clangd\t'Clangd fuzzy matching algorithm'
|
|
fzy\t'Fzy matching algorithm (https://github.com/jhawthorn/fzy)'
|
|
frizbee\t'Frizbee matching algorithm, typo resistant'
|
|
arinae\t'Arinae: typo-resistant & natural algorithm'"
|
|
complete -c sk -l case -d 'Case sensitivity' -r -f -a "respect\t'Case-sensitive matching'
|
|
ignore\t'Case-insensitive matching'
|
|
smart\t'Smart case: case-insensitive unless query contains uppercase'"
|
|
complete -c sk -l typos -d 'Enable typo-tolerant matching' -r
|
|
complete -c sk -l split-match -d 'Enable split matching and set delimiter' -r
|
|
complete -c sk -s b -l bind -d 'Comma separated list of bindings' -r
|
|
complete -c sk -s c -l cmd -d 'Command to invoke dynamically in interactive mode' -r
|
|
complete -c sk -s I -d 'Replace replstr with the selected item in commands' -r
|
|
complete -c sk -l color -d 'Set color theme' -r
|
|
complete -c sk -l skip-to-pattern -d 'Show the matched pattern at the line start' -r
|
|
complete -c sk -l layout -d 'Set layout' -r -f -a "default\t'Display from the bottom of the screen'
|
|
reverse\t'Display from the top of the screen'
|
|
reverse-list\t'Display from the top of the screen, prompt at the bottom'"
|
|
complete -c sk -l height -d 'Height of skim\'s window' -r
|
|
complete -c sk -l min-height -d 'Minimum height of skim\'s window' -r
|
|
complete -c sk -l margin -d 'Screen margin' -r
|
|
complete -c sk -s p -l prompt -d 'Set prompt' -r
|
|
complete -c sk -l cmd-prompt -d 'Set prompt in command mode' -r
|
|
complete -c sk -l selector -d 'Set selected item icon' -r
|
|
complete -c sk -l multi-selector -d 'Set selected item icon' -r
|
|
complete -c sk -l tabstop -d 'Number of spaces that make up a tab' -r
|
|
complete -c sk -l ellipsis -d 'The characters used to display truncated lines' -r
|
|
complete -c sk -l info -d 'Set matching result count display position' -r -f -a "default\t''
|
|
inline\t''
|
|
hidden\t''"
|
|
complete -c sk -l header -d 'Set header, displayed next to the info' -r
|
|
complete -c sk -l header-lines -d 'Number of lines of the input treated as header' -r
|
|
complete -c sk -l border -d 'Draw borders around the UI components' -r -f -a "plain\t''
|
|
rounded\t''
|
|
double\t''
|
|
thick\t''
|
|
light-double-dashed\t''
|
|
heavy-double-dashed\t''
|
|
light-triple-dashed\t''
|
|
heavy-triple-dashed\t''
|
|
light-quadruple-dashed\t''
|
|
heavy-quadruple-dashed\t''
|
|
quadrant-inside\t''
|
|
quadrant-outside\t''"
|
|
complete -c sk -l history -d 'History file' -r
|
|
complete -c sk -l history-size -d 'Maximum number of query history entries to keep' -r
|
|
complete -c sk -l cmd-history -d 'Command history file' -r
|
|
complete -c sk -l cmd-history-size -d 'Maximum number of query history entries to keep' -r
|
|
complete -c sk -l preview -d 'Preview command' -r
|
|
complete -c sk -l preview-window -d 'Preview window layout' -r
|
|
complete -c sk -s q -l query -d 'Initial query' -r
|
|
complete -c sk -l cmd-query -d 'Initial query in interactive mode' -r
|
|
complete -c sk -l output-format -d 'Set the output format If set, overrides all print_ options Will be expanded the same way as preview or commands' -r
|
|
complete -c sk -l pre-select-n -d 'Pre-select the first n items in multi-selection mode' -r
|
|
complete -c sk -l pre-select-pat -d 'Pre-select the matched items in multi-selection mode' -r
|
|
complete -c sk -l pre-select-items -d 'Pre-select the items separated by newline character' -r
|
|
complete -c sk -l pre-select-file -d 'Pre-select the items read from this file' -r
|
|
complete -c sk -s f -l filter -d 'Query for filter mode' -r
|
|
complete -c sk -l shell -d 'Generate shell completion script' -r -f -a "bash\t'Bourne Again SHell'
|
|
elvish\t'Elvish shell'
|
|
fish\t'Friendly Interactive SHell'
|
|
nushell\t'Nushell (nu)'
|
|
power-shell\t'PowerShell'
|
|
zsh\t'Zsh'"
|
|
complete -c sk -l listen -d 'Run an IPC socket with optional name (defaults to sk)' -r
|
|
complete -c sk -l remote -d 'Send commands to an IPC socket with optional name (defaults to sk)' -r
|
|
complete -c sk -l tmux -d 'Run in a tmux popup' -r
|
|
complete -c sk -l log-file -d 'Pipe log output to a file' -r
|
|
complete -c sk -l flags -d 'Feature flags' -r -f -a "no-preview-pty\t'Disable preview PTY on linux'
|
|
show-score\t'Display the item\'s match score before its value in the item list (for matcher debugging)'"
|
|
complete -c sk -l hscroll-off -r
|
|
complete -c sk -l jump-labels -r
|
|
complete -c sk -l scheme -r
|
|
complete -c sk -l tail -r
|
|
complete -c sk -l style -r
|
|
complete -c sk -l padding -r
|
|
complete -c sk -l border-label -r
|
|
complete -c sk -l border-label-pos -r
|
|
complete -c sk -l wrap-sign -r
|
|
complete -c sk -l gap -r
|
|
complete -c sk -l gap-line -r
|
|
complete -c sk -l freeze-left -r
|
|
complete -c sk -l freeze-right -r
|
|
complete -c sk -l scroll-off -r
|
|
complete -c sk -l gutter -r
|
|
complete -c sk -l gutter-raw -r
|
|
complete -c sk -l marker-multi-line -r
|
|
complete -c sk -l scrollbar -r
|
|
complete -c sk -l list-border -r
|
|
complete -c sk -l list-label -r
|
|
complete -c sk -l list-label-pos -r
|
|
complete -c sk -l info-command -r
|
|
complete -c sk -l separator -r
|
|
complete -c sk -l ghost -r
|
|
complete -c sk -l input-border -r
|
|
complete -c sk -l input-label -r
|
|
complete -c sk -l input-label-pos -r
|
|
complete -c sk -l preview-label -r
|
|
complete -c sk -l preview-label-pos -r
|
|
complete -c sk -l header-border -r
|
|
complete -c sk -l header-lines-border -r
|
|
complete -c sk -l footer -r
|
|
complete -c sk -l footer-border -r
|
|
complete -c sk -l footer-label -r
|
|
complete -c sk -l footer-label-pos -r
|
|
complete -c sk -l with-shell -r
|
|
complete -c sk -l expect -d 'Deprecated, kept for compatibility purposes. See accept() bind instead' -r
|
|
complete -c sk -l tac -d 'Show results in reverse order'
|
|
complete -c sk -l no-sort -d 'Do not sort the results'
|
|
complete -c sk -s e -l exact -d 'Run in exact mode'
|
|
complete -c sk -l regex -d 'Start in regex mode instead of fuzzy-match'
|
|
complete -c sk -l no-typos -d 'Disable typo-resistant matching'
|
|
complete -c sk -l normalize -d 'Normalize unicode characters'
|
|
complete -c sk -s m -l multi -d 'Enable multiple selection'
|
|
complete -c sk -l no-multi -d 'Disable multiple selection'
|
|
complete -c sk -l no-mouse -d 'Disable mouse'
|
|
complete -c sk -s i -l interactive -d 'Start skim in interactive mode'
|
|
complete -c sk -l no-hscroll -d 'Disable horizontal scroll'
|
|
complete -c sk -l keep-right -d 'Keep the right end of the line visible on overflow'
|
|
complete -c sk -l no-clear-if-empty -d 'Do not clear previous line if the command returns an empty result'
|
|
complete -c sk -l no-clear-start -d 'Do not clear items on start'
|
|
complete -c sk -l no-clear -d 'Do not clear screen on exit'
|
|
complete -c sk -l show-cmd-error -d 'Show error message if command fails'
|
|
complete -c sk -l cycle -d 'Cycle the results by wrapping around when scrolling'
|
|
complete -c sk -l disabled -d 'Disable matching entirely'
|
|
complete -c sk -l reverse -d 'Shorthand for reverse layout'
|
|
complete -c sk -l no-height -d 'Disable height (force full screen)'
|
|
complete -c sk -l ansi -d 'Parse ANSI color codes in input strings'
|
|
complete -c sk -l no-info -d 'Alias for --info=hidden'
|
|
complete -c sk -l inline-info -d 'Alias for --info=inline'
|
|
complete -c sk -l wrap -d 'Wrap items in the item list'
|
|
complete -c sk -l read0 -d 'Read input delimited by ASCII NUL(\\0) characters'
|
|
complete -c sk -l print0 -d 'Print output delimited by ASCII NUL(\\0) characters'
|
|
complete -c sk -l print-query -d 'Print the query as the first line'
|
|
complete -c sk -l print-cmd -d 'Print the command as the first line (after print-query)'
|
|
complete -c sk -l print-score -d 'Print the score after each item'
|
|
complete -c sk -l print-header -d 'Print the header as the first line (after print-score)'
|
|
complete -c sk -l print-current -d 'Print the current (highlighted) item as the first line (after print-header)'
|
|
complete -c sk -l no-strip-ansi -d 'Print the ANSI codes, making the output exactly match the input even when --ansi is on'
|
|
complete -c sk -s 1 -l select-1 -d 'Do not enter the TUI if the query passed in -q matches only one item and return it'
|
|
complete -c sk -s 0 -l exit-0 -d 'Do not enter the TUI if the query passed in -q does not match any item'
|
|
complete -c sk -l sync -d 'Synchronous search for multi-staged filtering'
|
|
complete -c sk -l shell-bindings -d 'Generate shell key bindings - only for bash, zsh and fish'
|
|
complete -c sk -l man -d 'Generate man page and output it to stdout'
|
|
complete -c sk -s x -l extended
|
|
complete -c sk -l literal
|
|
complete -c sk -l filepath-word
|
|
complete -c sk -l no-bold
|
|
complete -c sk -l phony
|
|
complete -c sk -l no-color
|
|
complete -c sk -l highlight-line
|
|
complete -c sk -l no-multi-line
|
|
complete -c sk -l raw
|
|
complete -c sk -l track
|
|
complete -c sk -l no-scrollbar
|
|
complete -c sk -l no-input
|
|
complete -c sk -l no-separator
|
|
complete -c sk -l header-first
|
|
complete -c sk -s h -l help -d 'Print help (see more with \'--help\')'
|
|
complete -c sk -s V -l version -d 'Print version'
|