@ -7,11 +7,12 @@ use crate::{
ui ::{ ui ::{
self , self ,
document ::{ render_document , LineDecoration , LinePos , TextRenderer } , document ::{ render_document , LineDecoration , LinePos , TextRenderer } ,
fuzzy_match ::FuzzyQuery ,
EditorView , EditorView ,
} , } ,
} ; } ;
use futures_util ::{ future ::BoxFuture , FutureExt } ; use futures_util ::{ future ::BoxFuture , FutureExt } ;
use nucleo ::pattern ::CaseMatching ;
use nucleo ::{ Config , Nucleo , Utf32String } ;
use tui ::{ use tui ::{
buffer ::Buffer as Surface , buffer ::Buffer as Surface ,
layout ::Constraint , layout ::Constraint ,
@ -19,16 +20,23 @@ use tui::{
widgets ::{ Block , BorderType , Borders , Cell , Table } , widgets ::{ Block , BorderType , Borders , Cell , Table } ,
} ; } ;
use fuzzy_matcher ::skim ::SkimMatcherV2 as Matcher ;
use tui ::widgets ::Widget ; use tui ::widgets ::Widget ;
use std ::cmp ::{ self , Ordering } ; use std ::{
use std ::{ collections ::HashMap , io ::Read , path ::PathBuf } ; collections ::HashMap ,
io ::Read ,
path ::PathBuf ,
sync ::{
atomic ::{ self , AtomicBool } ,
Arc ,
} ,
} ;
use crate ::ui ::{ Prompt , PromptEvent } ; use crate ::ui ::{ Prompt , PromptEvent } ;
use helix_core ::{ use helix_core ::{
char_idx_at_visual_offset , movement ::Direction , text_annotations ::TextAnnotations , char_idx_at_visual_offset , fuzzy ::MATCHER , movement ::Direction ,
unicode ::segmentation ::UnicodeSegmentation , Position , Syntax , text_annotations ::TextAnnotations , unicode ::segmentation ::UnicodeSegmentation , Position ,
Syntax ,
} ; } ;
use helix_view ::{ use helix_view ::{
editor ::Action , editor ::Action ,
@ -114,20 +122,71 @@ impl Preview<'_, '_> {
} }
} }
fn item_to_nucleo < T : Item > ( item : T , editor_data : & T ::Data ) -> Option < ( T , Utf32String ) > {
let row = item . format ( editor_data ) ;
let mut cells = row . cells . iter ( ) ;
let mut text = String ::with_capacity ( row . cell_text ( ) . map ( | cell | cell . len ( ) ) . sum ( ) ) ;
let cell = cells . next ( ) ? ;
if let Some ( cell ) = cell . content . lines . first ( ) {
for span in & cell . 0 {
text . push_str ( & span . content ) ;
}
}
for cell in cells {
text . push ( ' ' ) ;
if let Some ( cell ) = cell . content . lines . first ( ) {
for span in & cell . 0 {
text . push_str ( & span . content ) ;
}
}
}
Some ( ( item , text . into ( ) ) )
}
pub struct Injector < T : Item > {
dst : nucleo ::Injector < T > ,
editor_data : Arc < T ::Data > ,
shutown : Arc < AtomicBool > ,
}
impl < T : Item > Clone for Injector < T > {
fn clone ( & self ) -> Self {
Injector {
dst : self . dst . clone ( ) ,
editor_data : self . editor_data . clone ( ) ,
shutown : Arc ::new ( AtomicBool ::new ( false ) ) ,
}
}
}
pub struct InjectorShutdown ;
impl < T : Item > Injector < T > {
pub fn push ( & self , item : T ) -> Result < ( ) , InjectorShutdown > {
if self . shutown . load ( atomic ::Ordering ::Relaxed ) {
return Err ( InjectorShutdown ) ;
}
if let Some ( ( item , matcher_text ) ) = item_to_nucleo ( item , & self . editor_data ) {
self . dst . push ( item , | dst | dst [ 0 ] = matcher_text ) ;
}
Ok ( ( ) )
}
}
pub struct Picker < T : Item > { pub struct Picker < T : Item > {
options : Vec < T > , editor_data : Arc < T ::Data > ,
editor_data : T ::Data , shutdown : Arc < AtomicBool > ,
// filter: String,
matcher : Nucleo < T > ,
matcher : Box < Matcher > ,
matches : Vec < PickerMatch > ,
/// Current height of the completions box
/// Current height of the completions box
completion_height : u16 , completion_height : u16 ,
cursor : usize , cursor : u32 ,
// pattern: String,
prompt : Prompt , prompt : Prompt ,
previous_pattern : ( String , FuzzyQuery ) , previous_pattern : String ,
/// Whether to show the preview panel (default true)
/// Whether to show the preview panel (default true)
show_preview : bool , show_preview : bool ,
/// Constraints for tabular formatting
/// Constraints for tabular formatting
@ -144,10 +203,59 @@ pub struct Picker<T: Item> {
} }
impl < T : Item + ' static > Picker < T > { impl < T : Item + ' static > Picker < T > {
pub fn stream ( editor_data : T ::Data ) -> ( Nucleo < T > , Injector < T > ) {
let matcher = Nucleo ::new (
Config ::DEFAULT ,
Arc ::new ( helix_event ::request_redraw ) ,
None ,
1 ,
) ;
let streamer = Injector {
dst : matcher . injector ( ) ,
editor_data : Arc ::new ( editor_data ) ,
shutown : Arc ::new ( AtomicBool ::new ( false ) ) ,
} ;
( matcher , streamer )
}
pub fn new ( pub fn new (
options : Vec < T > , options : Vec < T > ,
editor_data : T ::Data , editor_data : T ::Data ,
callback_fn : impl Fn ( & mut Context , & T , Action ) + ' static , callback_fn : impl Fn ( & mut Context , & T , Action ) + ' static ,
) -> Self {
let matcher = Nucleo ::new (
Config ::DEFAULT ,
Arc ::new ( helix_event ::request_redraw ) ,
None ,
1 ,
) ;
let injector = matcher . injector ( ) ;
for item in options {
if let Some ( ( item , matcher_text ) ) = item_to_nucleo ( item , & editor_data ) {
injector . push ( item , | dst | dst [ 0 ] = matcher_text ) ;
}
}
Self ::with (
matcher ,
Arc ::new ( editor_data ) ,
Arc ::new ( AtomicBool ::new ( false ) ) ,
callback_fn ,
)
}
pub fn with_stream (
matcher : Nucleo < T > ,
injector : Injector < T > ,
callback_fn : impl Fn ( & mut Context , & T , Action ) + ' static ,
) -> Self {
Self ::with ( matcher , injector . editor_data , injector . shutown , callback_fn )
}
fn with (
matcher : Nucleo < T > ,
editor_data : Arc < T ::Data > ,
shutdown : Arc < AtomicBool > ,
callback_fn : impl Fn ( & mut Context , & T , Action ) + ' static ,
) -> Self { ) -> Self {
let prompt = Prompt ::new ( let prompt = Prompt ::new (
"" . into ( ) , "" . into ( ) ,
@ -156,14 +264,13 @@ impl<T: Item + 'static> Picker<T> {
| _editor : & mut Context , _pattern : & str , _event : PromptEvent | { } , | _editor : & mut Context , _pattern : & str , _event : PromptEvent | { } ,
) ; ) ;
let mut picker = Self { Self {
options , matcher ,
editor_data , editor_data ,
matcher : Box ::default ( ) , shutdown ,
matches : Vec ::new ( ) ,
cursor : 0 , cursor : 0 ,
prompt , prompt ,
previous_pattern : ( String ::new ( ) , FuzzyQuery ::default ( ) ) , previous_pattern : String ::new ( ) ,
truncate_start : true , truncate_start : true ,
show_preview : true , show_preview : true ,
callback_fn : Box ::new ( callback_fn ) , callback_fn : Box ::new ( callback_fn ) ,
@ -172,24 +279,15 @@ impl<T: Item + 'static> Picker<T> {
preview_cache : HashMap ::new ( ) , preview_cache : HashMap ::new ( ) ,
read_buffer : Vec ::with_capacity ( 1024 ) , read_buffer : Vec ::with_capacity ( 1024 ) ,
file_fn : None , file_fn : None ,
} ; }
}
picker . calculate_column_widths ( ) ;
// scoring on empty input
// TODO: just reuse score()
picker
. matches
. extend ( picker . options . iter ( ) . enumerate ( ) . map ( | ( index , option ) | {
let text = option . filter_text ( & picker . editor_data ) ;
PickerMatch {
index ,
score : 0 ,
len : text . chars ( ) . count ( ) ,
}
} ) ) ;
picker pub fn injector ( & self ) -> Injector < T > {
Injector {
dst : self . matcher . injector ( ) ,
editor_data : self . editor_data . clone ( ) ,
shutown : self . shutdown . clone ( ) ,
}
} }
pub fn truncate_start ( mut self , truncate_start : bool ) -> Self { pub fn truncate_start ( mut self , truncate_start : bool ) -> Self {
@ -202,122 +300,25 @@ impl<T: Item + 'static> Picker<T> {
preview_fn : impl Fn ( & Editor , & T ) -> Option < FileLocation > + ' static , preview_fn : impl Fn ( & Editor , & T ) -> Option < FileLocation > + ' static ,
) -> Self { ) -> Self {
self . file_fn = Some ( Box ::new ( preview_fn ) ) ; self . file_fn = Some ( Box ::new ( preview_fn ) ) ;
// assumption: if we have a preview we are matching paths... If this is ever
// not true this could be a separate builder function
self . matcher . update_config ( Config ::DEFAULT . match_paths ( ) ) ;
self self
} }
pub fn set_options ( & mut self , new_options : Vec < T > ) { pub fn set_options ( & mut self , new_options : Vec < T > ) {
self . options = new_options ; self . matcher . restart ( false ) ;
self . cursor = 0 ; let injector = self . matcher . injector ( ) ;
self . force_score ( ) ; for item in new_options {
self . calculate_column_widths ( ) ; if let Some ( ( item , matcher_text ) ) = item_to_nucleo ( item , & self . editor_data ) {
} injector . push ( item , | dst | dst [ 0 ] = matcher_text ) ;
/// Calculate the width constraints using the maximum widths of each column
/// for the current options.
fn calculate_column_widths ( & mut self ) {
let n = self
. options
. first ( )
. map ( | option | option . format ( & self . editor_data ) . cells . len ( ) )
. unwrap_or_default ( ) ;
let max_lens = self . options . iter ( ) . fold ( vec! [ 0 ; n ] , | mut acc , option | {
let row = option . format ( & self . editor_data ) ;
// maintain max for each column
for ( acc , cell ) in acc . iter_mut ( ) . zip ( row . cells . iter ( ) ) {
let width = cell . content . width ( ) ;
if width > * acc {
* acc = width ;
}
} }
acc
} ) ;
self . widths = max_lens
. into_iter ( )
. map ( | len | Constraint ::Length ( len as u16 ) )
. collect ( ) ;
}
pub fn score ( & mut self ) {
let pattern = self . prompt . line ( ) ;
if pattern = = & self . previous_pattern . 0 {
return ;
} }
let ( query , is_refined ) = self
. previous_pattern
. 1
. refine ( pattern , & self . previous_pattern . 0 ) ;
if pattern . is_empty ( ) {
// Fast path for no pattern.
self . matches . clear ( ) ;
self . matches
. extend ( self . options . iter ( ) . enumerate ( ) . map ( | ( index , option ) | {
let text = option . filter_text ( & self . editor_data ) ;
PickerMatch {
index ,
score : 0 ,
len : text . chars ( ) . count ( ) ,
}
} ) ) ;
} else if is_refined {
// optimization: if the pattern is a more specific version of the previous one
// then we can score the filtered set.
self . matches . retain_mut ( | pmatch | {
let option = & self . options [ pmatch . index ] ;
let text = option . sort_text ( & self . editor_data ) ;
match query . fuzzy_match ( & text , & self . matcher ) {
Some ( s ) = > {
// Update the score
pmatch . score = s ;
true
}
None = > false ,
}
} ) ;
self . matches . sort_unstable ( ) ;
} else {
self . force_score ( ) ;
}
// reset cursor position
self . cursor = 0 ;
let pattern = self . prompt . line ( ) ;
self . previous_pattern . 0. clone_from ( pattern ) ;
self . previous_pattern . 1 = query ;
}
pub fn force_score ( & mut self ) {
let pattern = self . prompt . line ( ) ;
let query = FuzzyQuery ::new ( pattern ) ;
self . matches . clear ( ) ;
self . matches . extend (
self . options
. iter ( )
. enumerate ( )
. filter_map ( | ( index , option ) | {
let text = option . filter_text ( & self . editor_data ) ;
query
. fuzzy_match ( & text , & self . matcher )
. map ( | score | PickerMatch {
index ,
score ,
len : text . chars ( ) . count ( ) ,
} )
} ) ,
) ;
self . matches . sort_unstable ( ) ;
} }
/// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
/// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
pub fn move_by ( & mut self , amount : u size , direction : Direction ) { pub fn move_by ( & mut self , amount : u32 , direction : Direction ) {
let len = self . matche s. len ( ) ; let len = self . matcher . snapshot ( ) . matched_item_count ( ) ;
if len = = 0 { if len = = 0 {
// No results, can't move.
// No results, can't move.
@ -336,12 +337,12 @@ impl<T: Item + 'static> Picker<T> {
/// Move the cursor down by exactly one page. After the last page comes the first page.
/// Move the cursor down by exactly one page. After the last page comes the first page.
pub fn page_up ( & mut self ) { pub fn page_up ( & mut self ) {
self . move_by ( self . completion_height as u size , Direction ::Backward ) ; self . move_by ( self . completion_height as u 32 , Direction ::Backward ) ;
} }
/// Move the cursor up by exactly one page. After the first page comes the last page.
/// Move the cursor up by exactly one page. After the first page comes the last page.
pub fn page_down ( & mut self ) { pub fn page_down ( & mut self ) {
self . move_by ( self . completion_height as u size , Direction ::Forward ) ; self . move_by ( self . completion_height as u 32 , Direction ::Forward ) ;
} }
/// Move the cursor to the first entry
/// Move the cursor to the first entry
@ -351,13 +352,18 @@ impl<T: Item + 'static> Picker<T> {
/// Move the cursor to the last entry
/// Move the cursor to the last entry
pub fn to_end ( & mut self ) { pub fn to_end ( & mut self ) {
self . cursor = self . matches . len ( ) . saturating_sub ( 1 ) ; self . cursor = self
. matcher
. snapshot ( )
. matched_item_count ( )
. saturating_sub ( 1 ) ;
} }
pub fn selection ( & self ) -> Option < & T > { pub fn selection ( & self ) -> Option < & T > {
self . matches self . matcher
. get ( self . cursor ) . snapshot ( )
. map ( | pmatch | & self . options [ pmatch . index ] ) . get_matched_item ( self . cursor )
. map ( | item | item . data )
} }
pub fn toggle_preview ( & mut self ) { pub fn toggle_preview ( & mut self ) {
@ -366,8 +372,17 @@ impl<T: Item + 'static> Picker<T> {
fn prompt_handle_event ( & mut self , event : & Event , cx : & mut Context ) -> EventResult { fn prompt_handle_event ( & mut self , event : & Event , cx : & mut Context ) -> EventResult {
if let EventResult ::Consumed ( _ ) = self . prompt . handle_event ( event , cx ) { if let EventResult ::Consumed ( _ ) = self . prompt . handle_event ( event , cx ) {
// TODO: recalculate only if pattern changed
let pattern = self . prompt . line ( ) ;
self . score ( ) ; // TODO: better track how the pattern has changed
if pattern ! = & self . previous_pattern {
self . matcher . pattern . reparse (
0 ,
pattern ,
CaseMatching ::Smart ,
pattern . starts_with ( & self . previous_pattern ) ,
) ;
self . previous_pattern = pattern . clone ( ) ;
}
} }
EventResult ::Consumed ( None ) EventResult ::Consumed ( None )
} }
@ -411,12 +426,9 @@ impl<T: Item + 'static> Picker<T> {
( size , _ ) if size > MAX_FILE_SIZE_FOR_PREVIEW = > { ( size , _ ) if size > MAX_FILE_SIZE_FOR_PREVIEW = > {
CachedPreview ::LargeFile CachedPreview ::LargeFile
} }
_ = > { _ = > Document ::open ( path , None , None , editor . config . clone ( ) )
// TODO: enable syntax highlighting; blocked by async rendering
. map ( | doc | CachedPreview ::Document ( Box ::new ( doc ) ) )
Document ::open ( path , None , None , editor . config . clone ( ) ) . unwrap_or ( CachedPreview ::NotFound ) ,
. map ( | doc | CachedPreview ::Document ( Box ::new ( doc ) ) )
. unwrap_or ( CachedPreview ::NotFound )
}
} , } ,
) )
. unwrap_or ( CachedPreview ::NotFound ) ; . unwrap_or ( CachedPreview ::NotFound ) ;
@ -495,6 +507,14 @@ impl<T: Item + 'static> Picker<T> {
} }
fn render_picker ( & mut self , area : Rect , surface : & mut Surface , cx : & mut Context ) { fn render_picker ( & mut self , area : Rect , surface : & mut Surface , cx : & mut Context ) {
let status = self . matcher . tick ( 10 ) ;
let snapshot = self . matcher . snapshot ( ) ;
if status . changed {
self . cursor = self
. cursor
. min ( snapshot . matched_item_count ( ) . saturating_sub ( 1 ) )
}
let text_style = cx . editor . theme . get ( "ui.text" ) ; let text_style = cx . editor . theme . get ( "ui.text" ) ;
let selected = cx . editor . theme . get ( "ui.text.focus" ) ; let selected = cx . editor . theme . get ( "ui.text.focus" ) ;
let highlight_style = cx . editor . theme . get ( "special" ) . add_modifier ( Modifier ::BOLD ) ; let highlight_style = cx . editor . theme . get ( "special" ) . add_modifier ( Modifier ::BOLD ) ;
@ -515,8 +535,15 @@ impl<T: Item + 'static> Picker<T> {
// -- Render the input bar:
// -- Render the input bar:
let area = inner . clip_left ( 1 ) . with_height ( 1 ) ; let area = inner . clip_left ( 1 ) . with_height ( 1 ) ;
// render the prompt first since it will clear its background
self . prompt . render ( area , surface , cx ) ;
let count = format! ( "{}/{}" , self . matches . len ( ) , self . options . len ( ) ) ; let count = format! (
"{}{}/{}" ,
if status . running { "(running) " } else { "" } ,
snapshot . matched_item_count ( ) ,
snapshot . item_count ( ) ,
) ;
surface . set_stringn ( surface . set_stringn (
( area . x + area . width ) . saturating_sub ( count . len ( ) as u16 + 1 ) , ( area . x + area . width ) . saturating_sub ( count . len ( ) as u16 + 1 ) ,
area . y , area . y ,
@ -525,8 +552,6 @@ impl<T: Item + 'static> Picker<T> {
text_style , text_style ,
) ; ) ;
self . prompt . render ( area , surface , cx ) ;
// -- Separator
// -- Separator
let sep_style = cx . editor . theme . get ( "ui.background.separator" ) ; let sep_style = cx . editor . theme . get ( "ui.background.separator" ) ;
let borders = BorderType ::line_symbols ( BorderType ::Plain ) ; let borders = BorderType ::line_symbols ( BorderType ::Plain ) ;
@ -539,106 +564,89 @@ impl<T: Item + 'static> Picker<T> {
// -- Render the contents:
// -- Render the contents:
// subtract area of prompt from top
// subtract area of prompt from top
let inner = inner . clip_top ( 2 ) ; let inner = inner . clip_top ( 2 ) ;
let rows = inner . height as u32 ;
let rows = inner . height ; let offset = self . cursor - ( self . cursor % std ::cmp ::max ( 1 , rows ) ) ;
let offset = self . cursor - ( self . cursor % std ::cmp ::max ( 1 , rows as usize ) ) ;
let cursor = self . cursor . saturating_sub ( offset ) ; let cursor = self . cursor . saturating_sub ( offset ) ;
let end = offset
. saturating_add ( rows )
. min ( snapshot . matched_item_count ( ) ) ;
let mut indices = Vec ::new ( ) ;
let mut matcher = MATCHER . lock ( ) ;
matcher . config = Config ::DEFAULT ;
if self . file_fn . is_some ( ) {
matcher . config . set_match_paths ( )
}
let options = self let options = snapshot . matched_items ( offset .. end ) . map ( | item | {
. matches snapshot . pattern ( ) . column_pattern ( 0 ) . indices (
. iter ( ) item . matcher_columns [ 0 ] . slice ( .. ) ,
. skip ( offset ) & mut matcher ,
. take ( rows as usize ) & mut indices ,
. map ( | pmatch | & self . options [ pmatch . index ] ) ) ;
. map ( | option | option . format ( & self . editor_data ) ) indices . sort_unstable ( ) ;
. map ( | mut row | { indices . dedup ( ) ;
const TEMP_CELL_SEP : & str = " " ; let mut row = item . data . format ( & self . editor_data ) ;
let line = row . cell_text ( ) . fold ( String ::new ( ) , | mut s , frag | { let mut grapheme_idx = 0 u32 ;
s . push_str ( & frag ) ; let mut indices = indices . drain ( .. ) ;
s . push_str ( TEMP_CELL_SEP ) ; let mut next_highlight_idx = indices . next ( ) . unwrap_or ( u32 ::MAX ) ;
s if self . widths . len ( ) < row . cells . len ( ) {
} ) ; self . widths . resize ( row . cells . len ( ) , Constraint ::Length ( 0 ) ) ;
}
// Items are filtered by using the text returned by menu::Item::filter_text
let mut widths = self . widths . iter_mut ( ) ;
// but we do highlighting here using the text in Row and therefore there
for cell in & mut row . cells {
// might be inconsistencies. This is the best we can do since only the
let Some ( Constraint ::Length ( max_width ) ) = widths . next ( ) else {
// text in Row is displayed to the end user.
unreachable! ( ) ;
let ( _score , highlights ) = FuzzyQuery ::new ( self . prompt . line ( ) ) } ;
. fuzzy_indices ( & line , & self . matcher )
. unwrap_or_default ( ) ;
let highlight_byte_ranges : Vec < _ > = line
. char_indices ( )
. enumerate ( )
. filter_map ( | ( char_idx , ( byte_offset , ch ) ) | {
highlights
. contains ( & char_idx )
. then ( | | byte_offset .. byte_offset + ch . len_utf8 ( ) )
} )
. collect ( ) ;
// The starting byte index of the current (iterating) cell
let mut cell_start_byte_offset = 0 ;
for cell in row . cells . iter_mut ( ) {
let spans = match cell . content . lines . get ( 0 ) {
Some ( s ) = > s ,
None = > {
cell_start_byte_offset + = TEMP_CELL_SEP . len ( ) ;
continue ;
}
} ;
let mut cell_len = 0 ; // merge index highlights on top of existing hightlights
let mut span_list = Vec ::new ( ) ;
let graphemes_with_style : Vec < _ > = spans let mut current_span = String ::new ( ) ;
. 0 let mut current_style = Style ::default ( ) ;
. iter ( ) let mut width = 0 ;
. flat_map ( | span | {
span . content let spans : & [ Span ] = cell . content . lines . first ( ) . map_or ( & [ ] , | it | it . 0. as_slice ( ) ) ;
. grapheme_indices ( true ) for span in spans {
. zip ( std ::iter ::repeat ( span . style ) ) // this looks like a bug on first glance, we are iterating
} ) // graphemes but treating them as char indices. The reason that
. map ( | ( ( grapheme_byte_offset , grapheme ) , style ) | { // this is correct is that nucleo will only ever consider the first char
cell_len + = grapheme . len ( ) ; // of a grapheme (and discard the rest of the grapheme) so the indices
let start = cell_start_byte_offset ; // returned by nucleo are essentially grapheme indecies
for grapheme in span . content . graphemes ( true ) {
let grapheme_byte_range = let style = if grapheme_idx = = next_highlight_idx {
grapheme_byte_offset .. grapheme_byte_offset + grapheme . len ( ) ; next_highlight_idx = indices . next ( ) . unwrap_or ( u32 ::MAX ) ;
span . style . patch ( highlight_style )
if highlight_byte_ranges . iter ( ) . any ( | hl_rng | {
hl_rng . start > = start + grapheme_byte_range . start
& & hl_rng . end < = start + grapheme_byte_range . end
} ) {
( grapheme , style . patch ( highlight_style ) )
} else {
( grapheme , style )
}
} )
. collect ( ) ;
let mut span_list : Vec < ( String , Style ) > = Vec ::new ( ) ;
for ( grapheme , style ) in graphemes_with_style {
if span_list . last ( ) . map ( | ( _ , sty ) | sty ) = = Some ( & style ) {
let ( string , _ ) = span_list . last_mut ( ) . unwrap ( ) ;
string . push_str ( grapheme ) ;
} else { } else {
span_list . push ( ( String ::from ( grapheme ) , style ) ) span . style
} ;
if style ! = current_style {
if ! current_span . is_empty ( ) {
span_list . push ( Span ::styled ( current_span , current_style ) )
}
current_span = String ::new ( ) ;
current_style = style ;
} }
current_span . push_str ( grapheme ) ;
grapheme_idx + = 1 ;
} }
width + = span . width ( ) ;
}
let spans : Vec < Span > = span_list span_list . push ( Span ::styled ( current_span , current_style ) ) ;
. into_iter ( ) if width as u16 > * max_width {
. map ( | ( string , style ) | Span ::styled ( string , style ) ) * max_width = width as u16 ;
. collect ( ) ; }
let spans : Spans = spans . into ( ) ; * cell = Cell ::from ( Spans ::from ( span_list ) ) ;
* cell = Cell ::from ( spans ) ;
cell_start_byte_offset + = cell_len + TEMP_CELL_SEP . len ( ) ; // spacer
if grapheme_idx = = next_highlight_idx {
next_highlight_idx = indices . next ( ) . unwrap_or ( u32 ::MAX ) ;
} }
grapheme_idx + = 1 ;
}
row row
} ) ; } ) ;
let table = Table ::new ( options ) let table = Table ::new ( options )
. style ( text_style ) . style ( text_style )
@ -654,7 +662,7 @@ impl<T: Item + 'static> Picker<T> {
surface , surface ,
& mut TableState { & mut TableState {
offset : 0 , offset : 0 ,
selected : Some ( cursor ) , selected : Some ( cursor as usize ) ,
} , } ,
self . truncate_start , self . truncate_start ,
) ; ) ;
@ -755,7 +763,7 @@ impl<T: Item + 'static> Picker<T> {
} }
} }
impl < T : Item + ' static > Component for Picker < T > { impl < T : Item + ' static + Send + Sync > Component for Picker < T > {
fn render ( & mut self , area : Rect , surface : & mut Surface , cx : & mut Context ) { fn render ( & mut self , area : Rect , surface : & mut Surface , cx : & mut Context ) {
// +---------+ +---------+
// +---------+ +---------+
// |prompt | |preview |
// |prompt | |preview |
@ -875,29 +883,10 @@ impl<T: Item + 'static> Component for Picker<T> {
Some ( ( width , height ) ) Some ( ( width , height ) )
} }
} }
impl < T : Item > Drop for Picker < T > {
#[ derive(PartialEq, Eq, Debug) ] fn drop ( & mut self ) {
struct PickerMatch { // ensure we cancel any ongoing background threads streaming into the picker
score : i64 , self . shutdown . store ( true , atomic ::Ordering ::Relaxed )
index : usize ,
len : usize ,
}
impl PickerMatch {
fn key ( & self ) -> impl Ord {
( cmp ::Reverse ( self . score ) , self . len , self . index )
}
}
impl PartialOrd for PickerMatch {
fn partial_cmp ( & self , other : & Self ) -> Option < Ordering > {
Some ( self . cmp ( other ) )
}
}
impl Ord for PickerMatch {
fn cmp ( & self , other : & Self ) -> Ordering {
self . key ( ) . cmp ( & other . key ( ) )
} }
} }
@ -910,13 +899,13 @@ pub type DynQueryCallback<T> =
/// A picker that updates its contents via a callback whenever the
/// A picker that updates its contents via a callback whenever the
/// query string changes. Useful for live grep, workspace symbols, etc.
/// query string changes. Useful for live grep, workspace symbols, etc.
pub struct DynamicPicker < T : ui ::menu ::Item + Send > { pub struct DynamicPicker < T : ui ::menu ::Item + Send + Sync > {
file_picker : Picker < T > , file_picker : Picker < T > ,
query_callback : DynQueryCallback < T > , query_callback : DynQueryCallback < T > ,
query : String , query : String ,
} }
impl < T : ui ::menu ::Item + Send > DynamicPicker < T > { impl < T : ui ::menu ::Item + Send + Sync > DynamicPicker < T > {
pub const ID : & ' static str = "dynamic-picker" ; pub const ID : & ' static str = "dynamic-picker" ;
pub fn new ( file_picker : Picker < T > , query_callback : DynQueryCallback < T > ) -> Self { pub fn new ( file_picker : Picker < T > , query_callback : DynQueryCallback < T > ) -> Self {
@ -928,7 +917,7 @@ impl<T: ui::menu::Item + Send> DynamicPicker<T> {
} }
} }
impl < T : Item + Send + ' static > Component for DynamicPicker < T > { impl < T : Item + Send + Sync + ' static > Component for DynamicPicker < T > {
fn render ( & mut self , area : Rect , surface : & mut Surface , cx : & mut Context ) { fn render ( & mut self , area : Rect , surface : & mut Surface , cx : & mut Context ) {
self . file_picker . render ( area , surface , cx ) ; self . file_picker . render ( area , surface , cx ) ;
} }
Pascal Kuthe
1 year ago
committed by
GitHub