Refine tree-sitter highlight configs

autoload/clap/layout.vim

@@ -126,12 +126,15 @@ if s:is_nvim
       let opts = {'relative': 'win', 'win': g:clap.start.winid}
       call s:adjust_indicator_width()
     endif
-    return extend(opts, {
-          \ 'width': s:calc(width, layout.width),
-          \ 'height': s:calc(height, layout.height),
-          \ 'row': s:calc(height, layout.row),
-          \ 'col': s:calc(width, layout.col),
-          \ })
+    let width = s:calc(width, layout.width)
+    let height = s:calc(height, layout.height)
+    let row = s:calc(height, layout.row)
+    let col = s:calc(width, layout.col)
+    if opts.relative ==# 'editor' && g:clap.provider.mode()  ==# 'quick_pick'
+      let adjustment = (&columns - col - width) / 2
+      let col += adjustment
+    endif
+    return extend(opts, { 'width': width, 'height': height, 'row': row, 'col': col })
   endfunction
 
   function! s:calc_default() abort
@@ -149,7 +152,8 @@ if s:is_nvim
 else
   function! s:user_layout() abort
     let layout = s:layout()
-    if has_key(layout, 'relative') && layout.relative ==# 'editor'
+    let relative_to_editor = has_key(layout, 'relative') && layout.relative ==# 'editor'
+    if relative_to_editor
       let [row, col] = [0, 0]
       let width = &columns
       let height = &lines
@@ -159,11 +163,19 @@ else
       let height = winheight(g:clap.start.winid)
       call s:adjust_indicator_width()
     endif
+    let width = s:calc(width, layout.width)
+    let col = s:calc(width, layout.col) + col
+
+    if relative_to_editor && g:clap.provider.mode()  ==# 'quick_pick'
+      let adjustment = (&columns - col - width) / 2
+      let col += adjustment
+    endif
+
     return {
-          \ 'width': s:calc(width, layout.width),
+          \ 'width': width,
           \ 'height': s:calc(height, layout.height),
           \ 'row': s:calc(height, layout.row) + row,
-          \ 'col': s:calc(width, layout.col) + col,
+          \ 'col': col
           \ }
   endfunction
 

crates/Cargo.toml

@@ -23,6 +23,8 @@ members = [
     "upgrade",
 ]
 
+exclude = ["config_gen"]
+
 [workspace.dependencies]
 anyhow = "1.0"
 async-trait = "0.1"

crates/cli/benches/benchmark.rs

@@ -8,7 +8,7 @@ use rayon::prelude::*;
 use std::io::BufRead;
 use std::sync::Arc;
 use types::ClapItem;
-use utils::count_lines;
+use utils::line_count;
 
 fn prepare_source_items() -> Vec<SourceItem> {
     let largest_cache = find_largest_cache_digest().expect("Cache is empty");
@@ -145,7 +145,7 @@ fn bench_regex_searcher(c: &mut Criterion) {
 fn bench_bytecount(c: &mut Criterion) {
     let largest_cache = find_largest_cache_digest().expect("Cache is empty");
     c.bench_function("bytecount", |b| {
-        b.iter(|| count_lines(std::fs::File::open(&largest_cache.cached_path).unwrap()))
+        b.iter(|| line_count(&largest_cache.cached_path).unwrap())
     });
 }