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.

1 files changed, 10 insertions, 3 deletions

diff --git a/vis.c b/vis.c
index 96ee002..4c5124a 100644
--- a/vis.c
+++ b/vis.c
@@ -503,15 +503,22 @@ void action_do(Vis *vis, Action *a) {
 			else
 				c.range.start = c.range.end = pos;
 			for (int i = 0; i < count; i++) {
-				Filerange r = a->textobj->range(txt, pos);
+				Filerange r;
+				if (a->textobj->txt)
+					r = a->textobj->txt(txt, pos);
+				else
+					r = a->textobj->vis(vis, txt, pos);
 				if (!text_range_valid(&r))
 					break;
-				if (a->textobj->type == OUTER) {
+				if (a->textobj->type & OUTER) {
 					r.start--;
 					r.end++;
 				}
 
-				c.range = text_range_union(&c.range, &r);
+				if (a->textobj->type & SPLIT)
+					c.range = r;
+				else
+					c.range = text_range_union(&c.range, &r);
 
 				if (i < count - 1)
 					pos = c.range.end + 1;