@ -1091,27 +1091,18 @@ fn extend_next_long_word_end(cx: &mut Context) {
extend_word_impl ( cx , movement ::move_next_long_word_end )
}
fn will_find_char < F > (
cx : & mut Context ,
search_fn : F ,
inclusive : bool ,
extend : bool ,
pseudo_pending : & str ,
) where
fn will_find_char < F > ( cx : & mut Context , search_fn : F , inclusive : bool , extend : bool )
where
F : Fn ( RopeSlice , char , usize , usize , bool ) -> Option < usize > + ' static ,
{
// TODO: count is reset to 1 before next key so we move it into the closure here.
// Would be nice to carry over.
let count = cx . count ( ) ;
cx . editor . pseudo_pending = Some ( pseudo_pending . to_string ( ) ) ;
// need to wait for next key
// TODO: should this be done by grapheme rather than char? For example,
// we can't properly handle the line-ending CRLF case here in terms of char.
cx . on_next_key ( move | cx , event | {
cx . editor . pseudo_pending = None ;
let ch = match event {
KeyEvent {
code : KeyCode ::Enter ,
@ -1214,35 +1205,35 @@ fn find_prev_char_impl(
}
fn find_till_char ( cx : & mut Context ) {
will_find_char ( cx , find_next_char_impl , false , false , "t" )
will_find_char ( cx , find_next_char_impl , false , false )
}
fn find_next_char ( cx : & mut Context ) {
will_find_char ( cx , find_next_char_impl , true , false , "f" )
will_find_char ( cx , find_next_char_impl , true , false )
}
fn extend_till_char ( cx : & mut Context ) {
will_find_char ( cx , find_next_char_impl , false , true , "t" )
will_find_char ( cx , find_next_char_impl , false , true )
}
fn extend_next_char ( cx : & mut Context ) {
will_find_char ( cx , find_next_char_impl , true , true , "f" )
will_find_char ( cx , find_next_char_impl , true , true )
}
fn till_prev_char ( cx : & mut Context ) {
will_find_char ( cx , find_prev_char_impl , false , false , "T" )
will_find_char ( cx , find_prev_char_impl , false , false )
}
fn find_prev_char ( cx : & mut Context ) {
will_find_char ( cx , find_prev_char_impl , true , false , "F" )
will_find_char ( cx , find_prev_char_impl , true , false )
}
fn extend_till_prev_char ( cx : & mut Context ) {
will_find_char ( cx , find_prev_char_impl , false , true , "T" )
will_find_char ( cx , find_prev_char_impl , false , true )
}
fn extend_prev_char ( cx : & mut Context ) {
will_find_char ( cx , find_prev_char_impl , true , true , "F" )
will_find_char ( cx , find_prev_char_impl , true , true )
}
fn repeat_last_motion ( cx : & mut Context ) {
@ -4392,7 +4383,6 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
cx . on_next_key ( move | cx , event | {
cx . editor . autoinfo = None ;
cx . editor . pseudo_pending = None ;
if let Some ( ch ) = event . char ( ) {
let textobject = move | editor : & mut Editor | {
let ( view , doc ) = current ! ( editor ) ;
@ -4441,33 +4431,31 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
}
} ) ;
if let Some ( ( title , abbrev ) ) = match objtype {
textobject ::TextObject ::Inside = > Some ( ( "Match inside" , "mi" ) ) ,
textobject ::TextObject ::Around = > Some ( ( "Match around" , "ma" ) ) ,
let title = match objtype {
textobject ::TextObject ::Inside = > "Match inside" ,
textobject ::TextObject ::Around = > "Match around" ,
_ = > return ,
} {
let help_text = [
( "w" , "Word" ) ,
( "W" , "WORD" ) ,
( "p" , "Paragraph" ) ,
( "c" , "Class (tree-sitter)" ) ,
( "f" , "Function (tree-sitter)" ) ,
( "a" , "Argument/parameter (tree-sitter)" ) ,
( "o" , "Comment (tree-sitter)" ) ,
( "t" , "Test (tree-sitter)" ) ,
( "m" , "Closest surrounding pair to cursor" ) ,
( " " , "... or any character acting as a pair" ) ,
] ;
cx . editor . autoinfo = Some ( Info ::new (
title ,
help_text
. into_iter ( )
. map ( | ( col1 , col2 ) | ( col1 . to_string ( ) , col2 . to_string ( ) ) )
. collect ( ) ,
) ) ;
cx . editor . pseudo_pending = Some ( abbrev . to_string ( ) ) ;
} ;
let help_text = [
( "w" , "Word" ) ,
( "W" , "WORD" ) ,
( "p" , "Paragraph" ) ,
( "c" , "Class (tree-sitter)" ) ,
( "f" , "Function (tree-sitter)" ) ,
( "a" , "Argument/parameter (tree-sitter)" ) ,
( "o" , "Comment (tree-sitter)" ) ,
( "t" , "Test (tree-sitter)" ) ,
( "m" , "Closest surrounding pair to cursor" ) ,
( " " , "... or any character acting as a pair" ) ,
] ;
cx . editor . autoinfo = Some ( Info ::new (
title ,
help_text
. into_iter ( )
. map ( | ( col1 , col2 ) | ( col1 . to_string ( ) , col2 . to_string ( ) ) )
. collect ( ) ,
) ) ;
}
fn surround_add ( cx : & mut Context ) {