8b91ecd · helix · git.iko.soy

git.iko.soy/helix

Rename _para to _paragraph

commit8b91ecde40e95a8ba956881c95da60adbf98abb6 authorIvan Tham <pickfire@riseup.net> dateMon 7 Mar 2022, 21:25 (5 years ago) parent64c2490

4 files changed+36−26

compare with master

unifiedsplit

helix-core/src/movement.rs+20−10 helix-core/src/textobject.rs+7−7 helix-term/src/commands.rs+7−7 helix-term/src/keymap/default.rs+2−2

helix-core/src/movement.rs+20−10

@@ -150,7 +150,12 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar

150150 })

151151}

152152

153−pub fn move_prev_para(slice: RopeSlice, range: Range, count: usize, behavior: Movement) -> Range {

153+pub fn move_prev_paragraph(

154+ slice: RopeSlice,

155+ range: Range,

156+ count: usize,

157+ behavior: Movement,

158+) -> Range {

154159 let mut line = range.cursor_line(slice);

155160 let first_char = slice.line_to_char(line) == range.cursor(slice);

156161 let prev_line_empty = rope_is_line_ending(slice.line(line.saturating_sub(1)));

@@ -187,7 +192,12 @@ pub fn move_prev_para(slice: RopeSlice, range: Range, count: usize, behavior: Mo

187192 Range::new(anchor, head)

188193}

189194

190−pub fn move_next_para(slice: RopeSlice, range: Range, count: usize, behavior: Movement) -> Range {

195+pub fn move_next_paragraph(

196+ slice: RopeSlice,

197+ range: Range,

198+ count: usize,

199+ behavior: Movement,

200+) -> Range {

191201 let mut line = range.cursor_line(slice);

192202 let last_char =

193203 prev_grapheme_boundary(slice, slice.line_to_char(line + 1)) == range.cursor(slice);

@@ -1280,7 +1290,7 @@ mod test {

12801290 let (s, selection) = crate::test::print(before);

12811291 let text = Rope::from(s.as_str());

12821292 let selection =

1283− selection.transform(|r| move_prev_para(text.slice(..), r, 1, Movement::Move));

1293+ selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move));

12841294 let actual = crate::test::plain(&s, selection);

12851295 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

12861296 }

@@ -1303,7 +1313,7 @@ mod test {

13031313 let (s, selection) = crate::test::print(before);

13041314 let text = Rope::from(s.as_str());

13051315 let selection =

1306− selection.transform(|r| move_prev_para(text.slice(..), r, 2, Movement::Move));

1316+ selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move));

13071317 let actual = crate::test::plain(&s, selection);

13081318 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

13091319 }

@@ -1325,8 +1335,8 @@ mod test {

13251335 for (before, expected) in tests {

13261336 let (s, selection) = crate::test::print(before);

13271337 let text = Rope::from(s.as_str());

1328− let selection =

1329− selection.transform(|r| move_prev_para(text.slice(..), r, 1, Movement::Extend));

1338+ let selection = selection

1339+ .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend));

13301340 let actual = crate::test::plain(&s, selection);

13311341 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

13321342 }

@@ -1360,7 +1370,7 @@ mod test {

13601370 let (s, selection) = crate::test::print(before);

13611371 let text = Rope::from(s.as_str());

13621372 let selection =

1363− selection.transform(|r| move_next_para(text.slice(..), r, 1, Movement::Move));

1373+ selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move));

13641374 let actual = crate::test::plain(&s, selection);

13651375 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

13661376 }

@@ -1383,7 +1393,7 @@ mod test {

13831393 let (s, selection) = crate::test::print(before);

13841394 let text = Rope::from(s.as_str());

13851395 let selection =

1386− selection.transform(|r| move_next_para(text.slice(..), r, 2, Movement::Move));

1396+ selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move));

13871397 let actual = crate::test::plain(&s, selection);

13881398 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

13891399 }

@@ -1405,8 +1415,8 @@ mod test {

14051415 for (before, expected) in tests {

14061416 let (s, selection) = crate::test::print(before);

14071417 let text = Rope::from(s.as_str());

1408− let selection =

1409− selection.transform(|r| move_next_para(text.slice(..), r, 1, Movement::Extend));

1418+ let selection = selection

1419+ .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend));

14101420 let actual = crate::test::plain(&s, selection);

14111421 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

14121422 }

helix-core/src/textobject.rs+7−7

@@ -112,7 +112,7 @@ pub fn textobject_word(

112112 }

113113}

114114

115−pub fn textobject_para(

115+pub fn textobject_paragraph(

116116 slice: RopeSlice,

117117 range: Range,

118118 textobject: TextObject,

@@ -378,8 +378,8 @@ mod test {

378378 for (before, expected) in tests {

379379 let (s, selection) = crate::test::print(before);

380380 let text = Rope::from(s.as_str());

381− let selection =

382− selection.transform(|r| textobject_para(text.slice(..), r, TextObject::Inside, 1));

381+ let selection = selection

382+ .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 1));

383383 let actual = crate::test::plain(&s, selection);

384384 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

385385 }

@@ -401,8 +401,8 @@ mod test {

401401 for (before, expected) in tests {

402402 let (s, selection) = crate::test::print(before);

403403 let text = Rope::from(s.as_str());

404− let selection =

405− selection.transform(|r| textobject_para(text.slice(..), r, TextObject::Inside, 2));

404+ let selection = selection

405+ .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 2));

406406 let actual = crate::test::plain(&s, selection);

407407 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

408408 }

@@ -432,8 +432,8 @@ mod test {

432432 for (before, expected) in tests {

433433 let (s, selection) = crate::test::print(before);

434434 let text = Rope::from(s.as_str());

435− let selection =

436− selection.transform(|r| textobject_para(text.slice(..), r, TextObject::Around, 1));

435+ let selection = selection

436+ .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Around, 1));

437437 let actual = crate::test::plain(&s, selection);

438438 assert_eq!(actual, expected, "\nbefore: `{before:?}`");

439439 }

helix-term/src/commands.rs+7−7

@@ -209,8 +209,8 @@ impl MappableCommand {

209209 move_next_long_word_start, "Move to beginning of next long word",

210210 move_prev_long_word_start, "Move to beginning of previous long word",

211211 move_next_long_word_end, "Move to end of next long word",

212− move_prev_para, "Move to previous paragraph",

213− move_next_para, "Move to next paragraph",

212+ move_prev_paragraph, "Move to previous paragraph",

213+ move_next_paragraph, "Move to next paragraph",

214214 extend_next_word_start, "Extend to beginning of next word",

215215 extend_prev_word_start, "Extend to beginning of previous word",

216216 extend_next_long_word_start, "Extend to beginning of next long word",

@@ -924,12 +924,12 @@ where

924924 doc.set_selection(view.id, selection);

925925}

926926

927−fn move_prev_para(cx: &mut Context) {

928− move_para_impl(cx, movement::move_prev_para)

927+fn move_prev_paragraph(cx: &mut Context) {

928+ move_para_impl(cx, movement::move_prev_paragraph)

929929}

930930

931−fn move_next_para(cx: &mut Context) {

932− move_para_impl(cx, movement::move_next_para)

931+fn move_next_paragraph(cx: &mut Context) {

932+ move_para_impl(cx, movement::move_next_paragraph)

933933}

934934

935935fn goto_file_start(cx: &mut Context) {

@@ -3991,7 +3991,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {

39913991 'f' => textobject_treesitter("function", range),

39923992 'a' => textobject_treesitter("parameter", range),

39933993 'o' => textobject_treesitter("comment", range),

3994− 'p' => textobject::textobject_para(text, range, objtype, count),

3994+ 'p' => textobject::textobject_paragraph(text, range, objtype, count),

39953995 'm' => {

39963996 let ch = text.char(range.cursor(text));

39973997 if !ch.is_ascii_alphanumeric() {

helix-term/src/keymap/default.rs+2−2

@@ -104,7 +104,7 @@ pub fn default() -> HashMap<Mode, Keymap> {

104104 "c" => goto_prev_class,

105105 "a" => goto_prev_parameter,

106106 "o" => goto_prev_comment,

107− "p" => move_prev_para,

107+ "p" => move_prev_paragraph,

108108 "space" => add_newline_above,

109109 },

110110 "]" => { "Right bracket"

@@ -114,7 +114,7 @@ pub fn default() -> HashMap<Mode, Keymap> {

114114 "c" => goto_next_class,

115115 "a" => goto_next_parameter,

116116 "o" => goto_next_comment,

117− "p" => move_next_para,

117+ "p" => move_next_paragraph,

118118 "space" => add_newline_below,

119119 },

120120