From 979d51bcb65ccceec95f34a10fdf6446ac97473c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 11 Feb 2016 10:03:14 +0100 Subject: vis: add support for different kind of text objects Up until now text objects would only ever grow/expand if applied multiple times. The new SPLIT type allows text objects which cover a completely different range when applied with a count. --- vis-text-objects.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'vis-text-objects.c') diff --git a/vis-text-objects.c b/vis-text-objects.c index 76c7f1f..a4fe36f 100644 --- a/vis-text-objects.c +++ b/vis-text-objects.c @@ -10,31 +10,31 @@ void vis_textobject(Vis *vis, enum VisTextObject id) { } TextObject vis_textobjects[] = { - [VIS_TEXTOBJECT_INNER_WORD] = { text_object_word }, - [VIS_TEXTOBJECT_OUTER_WORD] = { text_object_word_outer }, - [VIS_TEXTOBJECT_INNER_LONGWORD] = { text_object_longword }, - [VIS_TEXTOBJECT_OUTER_LONGWORD] = { text_object_longword_outer }, - [VIS_TEXTOBJECT_SENTENCE] = { text_object_sentence }, - [VIS_TEXTOBJECT_PARAGRAPH] = { text_object_paragraph }, - [VIS_TEXTOBJECT_OUTER_SQUARE_BRACKET] = { text_object_square_bracket, OUTER }, - [VIS_TEXTOBJECT_INNER_SQUARE_BRACKET] = { text_object_square_bracket, INNER }, - [VIS_TEXTOBJECT_OUTER_CURLY_BRACKET] = { text_object_curly_bracket, OUTER }, - [VIS_TEXTOBJECT_INNER_CURLY_BRACKET] = { text_object_curly_bracket, INNER }, - [VIS_TEXTOBJECT_OUTER_ANGLE_BRACKET] = { text_object_angle_bracket, OUTER }, - [VIS_TEXTOBJECT_INNER_ANGLE_BRACKET] = { text_object_angle_bracket, INNER }, - [VIS_TEXTOBJECT_OUTER_PARANTHESE] = { text_object_paranthese, OUTER }, - [VIS_TEXTOBJECT_INNER_PARANTHESE] = { text_object_paranthese, INNER }, - [VIS_TEXTOBJECT_OUTER_QUOTE] = { text_object_quote, OUTER }, - [VIS_TEXTOBJECT_INNER_QUOTE] = { text_object_quote, INNER }, - [VIS_TEXTOBJECT_OUTER_SINGLE_QUOTE] = { text_object_single_quote, OUTER }, - [VIS_TEXTOBJECT_INNER_SINGLE_QUOTE] = { text_object_single_quote, INNER }, - [VIS_TEXTOBJECT_OUTER_BACKTICK] = { text_object_backtick, OUTER }, - [VIS_TEXTOBJECT_INNER_BACKTICK] = { text_object_backtick, INNER }, - [VIS_TEXTOBJECT_OUTER_ENTIRE] = { text_object_entire, }, - [VIS_TEXTOBJECT_INNER_ENTIRE] = { text_object_entire_inner, }, - [VIS_TEXTOBJECT_OUTER_FUNCTION] = { text_object_function, }, - [VIS_TEXTOBJECT_INNER_FUNCTION] = { text_object_function_inner, }, - [VIS_TEXTOBJECT_OUTER_LINE] = { text_object_line, }, - [VIS_TEXTOBJECT_INNER_LINE] = { text_object_line_inner, }, + [VIS_TEXTOBJECT_INNER_WORD] = { .txt = text_object_word }, + [VIS_TEXTOBJECT_OUTER_WORD] = { .txt = text_object_word_outer }, + [VIS_TEXTOBJECT_INNER_LONGWORD] = { .txt = text_object_longword }, + [VIS_TEXTOBJECT_OUTER_LONGWORD] = { .txt = text_object_longword_outer }, + [VIS_TEXTOBJECT_SENTENCE] = { .txt = text_object_sentence }, + [VIS_TEXTOBJECT_PARAGRAPH] = { .txt = text_object_paragraph }, + [VIS_TEXTOBJECT_OUTER_SQUARE_BRACKET] = { .txt = text_object_square_bracket, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_SQUARE_BRACKET] = { .txt = text_object_square_bracket, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_CURLY_BRACKET] = { .txt = text_object_curly_bracket, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_CURLY_BRACKET] = { .txt = text_object_curly_bracket, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_ANGLE_BRACKET] = { .txt = text_object_angle_bracket, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_ANGLE_BRACKET] = { .txt = text_object_angle_bracket, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_PARANTHESE] = { .txt = text_object_paranthese, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_PARANTHESE] = { .txt = text_object_paranthese, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_QUOTE] = { .txt = text_object_quote, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_QUOTE] = { .txt = text_object_quote, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_SINGLE_QUOTE] = { .txt = text_object_single_quote, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_SINGLE_QUOTE] = { .txt = text_object_single_quote, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_BACKTICK] = { .txt = text_object_backtick, .type = OUTER }, + [VIS_TEXTOBJECT_INNER_BACKTICK] = { .txt = text_object_backtick, .type = INNER }, + [VIS_TEXTOBJECT_OUTER_ENTIRE] = { .txt = text_object_entire, }, + [VIS_TEXTOBJECT_INNER_ENTIRE] = { .txt = text_object_entire_inner, }, + [VIS_TEXTOBJECT_OUTER_FUNCTION] = { .txt = text_object_function, }, + [VIS_TEXTOBJECT_INNER_FUNCTION] = { .txt = text_object_function_inner, }, + [VIS_TEXTOBJECT_OUTER_LINE] = { .txt = text_object_line, }, + [VIS_TEXTOBJECT_INNER_LINE] = { .txt = text_object_line_inner, }, }; -- cgit v1.2.3