hjkl-buffer 0.0.18

Rope-backed text buffer with cursor and edits. Pre-1.0 churn.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
//! Vim-shaped cursor motions on top of [`crate::Buffer`].
//!
//! All motions clamp to the buffer's content; none of them wrap to
//! the previous / next line. `move_right_in_line` stops at the last
//! character; the operator-context variant `move_right_to_end`
//! allows one position past it so `dl` deletes the final char.
//! Vertical motions (`move_up` / `move_down`) honour `sticky_col`
//! so bouncing through a shorter row doesn't drag the cursor back
//! to col 0.

use crate::{Buffer, Position};

/// Returns the char count of `line` — the column you'd see when the
/// cursor is parked one past the end.
fn line_chars(line: &str) -> usize {
    line.chars().count()
}

/// Last valid column for normal-mode motions (`hjkl`, etc.).
/// Empty rows clamp at 0; otherwise it's `chars - 1`.
fn last_col(line: &str) -> usize {
    line_chars(line).saturating_sub(1)
}

/// Pick a target column inside the screen segment `[start, end)` for
/// a `gj` / `gk` step that wants `visual_col` cells from the segment
/// start. Clamps to the segment's last position and to the line's
/// last char so the cursor never lands past the line end.
fn clamp_to_segment(start: usize, end: usize, visual_col: usize, line: &str) -> usize {
    let line_max = last_col(line);
    let seg_max = if end > start { end - 1 } else { start };
    let want = start.saturating_add(visual_col);
    want.min(seg_max).min(line_max).max(start.min(line_max))
}

impl Buffer {
    // ── Horizontal motions ──────────────────────────────────────

    /// `h` — clamps at column 0; never wraps to the previous line.
    pub fn move_left(&mut self, count: usize) {
        let cursor = self.cursor();
        let new_col = cursor.col.saturating_sub(count.max(1));
        self.set_cursor(Position::new(cursor.row, new_col));
        self.refresh_sticky_col_from_cursor();
    }

    /// `l` — clamps at the last char on the line. Operator
    /// callers wanting "one past end" use [`Buffer::move_right_to_end`].
    pub fn move_right_in_line(&mut self, count: usize) {
        let cursor = self.cursor();
        let line = self.line(cursor.row).unwrap_or("");
        let limit = last_col(line);
        let new_col = (cursor.col + count.max(1)).min(limit);
        self.set_cursor(Position::new(cursor.row, new_col));
        self.refresh_sticky_col_from_cursor();
    }

    /// Operator-context `l`: allowed past the last char so a range
    /// motion includes it. Clamps at `chars()` (one past end).
    pub fn move_right_to_end(&mut self, count: usize) {
        let cursor = self.cursor();
        let line = self.line(cursor.row).unwrap_or("");
        let limit = line_chars(line);
        let new_col = (cursor.col + count.max(1)).min(limit);
        self.set_cursor(Position::new(cursor.row, new_col));
        self.refresh_sticky_col_from_cursor();
    }

    /// `0` — first column of the current row.
    pub fn move_line_start(&mut self) {
        let row = self.cursor().row;
        self.set_cursor(Position::new(row, 0));
        self.refresh_sticky_col_from_cursor();
    }

    /// `^` — first non-blank column. On a blank line it lands on 0.
    pub fn move_first_non_blank(&mut self) {
        let row = self.cursor().row;
        let col = self
            .line(row)
            .unwrap_or("")
            .chars()
            .position(|c| !c.is_whitespace())
            .unwrap_or(0);
        self.set_cursor(Position::new(row, col));
        self.refresh_sticky_col_from_cursor();
    }

    /// `$` — last char on the row. Empty rows stay at column 0.
    pub fn move_line_end(&mut self) {
        let row = self.cursor().row;
        let col = last_col(self.line(row).unwrap_or(""));
        self.set_cursor(Position::new(row, col));
        self.refresh_sticky_col_from_cursor();
    }

    /// `g_` — last non-blank char on the row. Empty / all-blank rows
    /// stay at column 0.
    pub fn move_last_non_blank(&mut self) {
        let row = self.cursor().row;
        let line = self.line(row).unwrap_or("");
        let col = line
            .char_indices()
            .rev()
            .find(|(_, c)| !c.is_whitespace())
            .map(|(byte, _)| line[..byte].chars().count())
            .unwrap_or(0);
        self.set_cursor(Position::new(row, col));
        self.refresh_sticky_col_from_cursor();
    }

    /// `{` — previous blank line above the cursor, or row 0.
    pub fn move_paragraph_prev(&mut self, count: usize) {
        let mut row = self.cursor().row;
        for _ in 0..count.max(1) {
            if row == 0 {
                break;
            }
            // Step over any contiguous blank rows the cursor sits on
            // so a single press doesn't stick.
            let mut r = row.saturating_sub(1);
            while r > 0 && self.line(r).is_some_and(|l| l.is_empty()) {
                r -= 1;
            }
            while r > 0 && self.line(r).is_some_and(|l| !l.is_empty()) {
                r -= 1;
            }
            row = r;
        }
        self.set_cursor(Position::new(row, 0));
        self.refresh_sticky_col_from_cursor();
    }

    /// `}` — next blank line below the cursor, or last row.
    pub fn move_paragraph_next(&mut self, count: usize) {
        let last = self.row_count().saturating_sub(1);
        let mut row = self.cursor().row;
        for _ in 0..count.max(1) {
            if row >= last {
                break;
            }
            let mut r = row.saturating_add(1);
            while r < last && self.line(r).is_some_and(|l| l.is_empty()) {
                r += 1;
            }
            while r < last && self.line(r).is_some_and(|l| !l.is_empty()) {
                r += 1;
            }
            row = r;
        }
        self.set_cursor(Position::new(row, 0));
        self.refresh_sticky_col_from_cursor();
    }

    // ── Vertical motions ────────────────────────────────────────

    /// `k` — `count` rows up; sticky col preserved across short rows.
    pub fn move_up(&mut self, count: usize) {
        self.move_vertical(-(count.max(1) as isize));
    }

    /// `j` — `count` rows down; sticky col preserved across short rows.
    pub fn move_down(&mut self, count: usize) {
        self.move_vertical(count.max(1) as isize);
    }

    /// `gk` — `count` visual rows up. With `Wrap::None` (or before
    /// the host has published `text_width`), falls back to `move_up`
    /// so existing tests + non-wrap callers behave unchanged. Under
    /// wrap, walks one screen segment at a time, crossing into the
    /// previous doc row only after exhausting the current row's
    /// segments.
    pub fn move_screen_up(&mut self, count: usize) {
        self.move_screen_vertical(-(count.max(1) as isize));
    }

    /// `gj` — `count` visual rows down. See [`Buffer::move_screen_up`].
    pub fn move_screen_down(&mut self, count: usize) {
        self.move_screen_vertical(count.max(1) as isize);
    }

    /// `gg` — first row, first non-blank.
    pub fn move_top(&mut self) {
        self.set_cursor(Position::new(0, 0));
        self.move_first_non_blank();
    }

    /// `G` — last row (or `count - 1` when `count > 0`), first non-blank.
    /// `count = 0` (the unprefixed form) jumps to the buffer's bottom.
    pub fn move_bottom(&mut self, count: usize) {
        let last = self.row_count().saturating_sub(1);
        let target = if count == 0 {
            last
        } else {
            (count - 1).min(last)
        };
        self.set_cursor(Position::new(target, 0));
        self.move_first_non_blank();
    }

    // ── Word motions ────────────────────────────────────────────

    /// `w` / `W` — start of next word. `big = true` treats every
    /// non-whitespace run as one word (vim's WORD).
    pub fn move_word_fwd(&mut self, big: bool, count: usize) {
        for _ in 0..count.max(1) {
            let from = self.cursor();
            if let Some(next) = next_word_start(self, from, big) {
                self.set_cursor(next);
            } else {
                break;
            }
        }
        self.refresh_sticky_col_from_cursor();
    }

    /// `b` / `B` — start of previous word.
    pub fn move_word_back(&mut self, big: bool, count: usize) {
        for _ in 0..count.max(1) {
            let from = self.cursor();
            if let Some(prev) = prev_word_start(self, from, big) {
                self.set_cursor(prev);
            } else {
                break;
            }
        }
        self.refresh_sticky_col_from_cursor();
    }

    /// `%` — jump to the matching bracket. Walks the buffer
    /// counting nesting depth so nested pairs resolve correctly.
    /// Returns `true` when the cursor moved.
    pub fn match_bracket(&mut self) -> bool {
        let cursor = self.cursor();
        let line = match self.line(cursor.row) {
            Some(l) => l,
            None => return false,
        };
        let ch = match line.chars().nth(cursor.col) {
            Some(c) => c,
            None => return false,
        };
        let (open, close, forward) = match ch {
            '(' => ('(', ')', true),
            ')' => ('(', ')', false),
            '[' => ('[', ']', true),
            ']' => ('[', ']', false),
            '{' => ('{', '}', true),
            '}' => ('{', '}', false),
            '<' => ('<', '>', true),
            '>' => ('<', '>', false),
            _ => return false,
        };
        let mut depth: i32 = 0;
        if forward {
            let mut r = cursor.row;
            let mut c = cursor.col;
            loop {
                let chars: Vec<char> = self.line(r).unwrap_or("").chars().collect();
                while c < chars.len() {
                    let here = chars[c];
                    if here == open {
                        depth += 1;
                    } else if here == close {
                        depth -= 1;
                        if depth == 0 {
                            self.set_cursor(Position::new(r, c));
                            self.refresh_sticky_col_from_cursor();
                            return true;
                        }
                    }
                    c += 1;
                }
                if r + 1 >= self.row_count() {
                    return false;
                }
                r += 1;
                c = 0;
            }
        } else {
            let mut r = cursor.row;
            let mut c = cursor.col as isize;
            loop {
                let chars: Vec<char> = self.line(r).unwrap_or("").chars().collect();
                while c >= 0 {
                    let here = chars[c as usize];
                    if here == close {
                        depth += 1;
                    } else if here == open {
                        depth -= 1;
                        if depth == 0 {
                            self.set_cursor(Position::new(r, c as usize));
                            self.refresh_sticky_col_from_cursor();
                            return true;
                        }
                    }
                    c -= 1;
                }
                if r == 0 {
                    return false;
                }
                r -= 1;
                c = self.line(r).unwrap_or("").chars().count() as isize - 1;
            }
        }
    }

    /// `f` / `F` / `t` / `T` — find `ch` on the current row.
    /// `forward = true` searches right of the cursor; `till = true`
    /// stops one cell short of the match (the `t`/`T` semantic).
    /// Returns `true` when the cursor moved.
    pub fn find_char_on_line(&mut self, ch: char, forward: bool, till: bool) -> bool {
        let cursor = self.cursor();
        let line = match self.line(cursor.row) {
            Some(l) => l,
            None => return false,
        };
        let chars: Vec<char> = line.chars().collect();
        if chars.is_empty() {
            return false;
        }
        let target_col = if forward {
            chars
                .iter()
                .enumerate()
                .skip(cursor.col + 1)
                .find(|(_, c)| **c == ch)
                .map(|(i, _)| if till { i.saturating_sub(1) } else { i })
        } else {
            (0..cursor.col)
                .rev()
                .find(|&i| chars[i] == ch)
                .map(|i| if till { i + 1 } else { i })
        };
        match target_col {
            Some(col) => {
                self.set_cursor(Position::new(cursor.row, col));
                self.refresh_sticky_col_from_cursor();
                true
            }
            None => false,
        }
    }

    /// `e` / `E` — end of current/next word.
    pub fn move_word_end(&mut self, big: bool, count: usize) {
        for _ in 0..count.max(1) {
            let from = self.cursor();
            if let Some(end) = next_word_end(self, from, big) {
                self.set_cursor(end);
            } else {
                break;
            }
        }
        self.refresh_sticky_col_from_cursor();
    }

    /// `H` — top of the visible viewport plus `offset` rows
    /// (0-based; vim uses 1-based count where bare `H` = 0). Lands
    /// on the first non-blank of the resolved row.
    pub fn move_viewport_top(&mut self, offset: usize) {
        let v = self.viewport();
        let last = self.row_count().saturating_sub(1);
        let target = v.top_row.saturating_add(offset).min(last);
        self.set_cursor(Position::new(target, 0));
        self.move_first_non_blank();
    }

    /// `M` — middle row of the visible viewport.
    pub fn move_viewport_middle(&mut self) {
        let v = self.viewport();
        let last = self.row_count().saturating_sub(1);
        let height = v.height as usize;
        let visible_bot = v.top_row.saturating_add(height.saturating_sub(1)).min(last);
        let mid = v.top_row + (visible_bot - v.top_row) / 2;
        self.set_cursor(Position::new(mid, 0));
        self.move_first_non_blank();
    }

    /// `L` — bottom of the visible viewport, minus `offset` rows.
    pub fn move_viewport_bottom(&mut self, offset: usize) {
        let v = self.viewport();
        let last = self.row_count().saturating_sub(1);
        let height = v.height as usize;
        let visible_bot = v.top_row.saturating_add(height.saturating_sub(1)).min(last);
        let target = visible_bot.saturating_sub(offset).max(v.top_row);
        self.set_cursor(Position::new(target, 0));
        self.move_first_non_blank();
    }

    /// `ge` / `gE` — end of previous word. Walks backward until
    /// the cursor sits on the last char of a word (the next char
    /// is a different kind, or end-of-line).
    pub fn move_word_end_back(&mut self, big: bool, count: usize) {
        for _ in 0..count.max(1) {
            let from = self.cursor();
            match prev_word_end(self, from, big) {
                Some(p) => self.set_cursor(p),
                None => break,
            }
        }
        self.refresh_sticky_col_from_cursor();
    }

    // ── Internals ──────────────────────────────────────────────

    fn move_screen_vertical(&mut self, delta: isize) {
        let v = self.viewport();
        if matches!(v.wrap, crate::Wrap::None) || v.text_width == 0 {
            self.move_vertical(delta);
            return;
        }
        // Snapshot the visual col (offset within the current segment)
        // up front so a chain of `gj` / `gk` presses lands at the
        // same visual column even when crossing short visual lines.
        let cursor = self.cursor();
        let line = self.line(cursor.row).unwrap_or("");
        let segs = crate::wrap::wrap_segments(line, v.text_width, v.wrap);
        let seg_idx = crate::wrap::segment_for_col(&segs, cursor.col);
        let visual_col = cursor.col.saturating_sub(segs[seg_idx].0);
        let down = delta > 0;
        for _ in 0..delta.unsigned_abs() {
            if !self.step_screen(down, visual_col) {
                break;
            }
        }
        self.set_sticky_col(Some(self.cursor().col));
    }

    /// One visual-row step under wrap. Returns false when stepping
    /// would leave the buffer (top of buffer for `down=false`,
    /// bottom for `down=true`).
    fn step_screen(&mut self, down: bool, visual_col: usize) -> bool {
        let v = self.viewport();
        let cursor = self.cursor();
        let line = self.line(cursor.row).unwrap_or("");
        let segs = crate::wrap::wrap_segments(line, v.text_width, v.wrap);
        let seg_idx = crate::wrap::segment_for_col(&segs, cursor.col);
        if down {
            if seg_idx + 1 < segs.len() {
                let (s, e) = segs[seg_idx + 1];
                let target = clamp_to_segment(s, e, visual_col, line);
                self.set_cursor(Position::new(cursor.row, target));
                return true;
            }
            let Some(next_row) = self.next_visible_row(cursor.row) else {
                return false;
            };
            let next_line = self.line(next_row).unwrap_or("");
            let next_segs = crate::wrap::wrap_segments(next_line, v.text_width, v.wrap);
            let (s, e) = next_segs[0];
            let target = clamp_to_segment(s, e, visual_col, next_line);
            self.set_cursor(Position::new(next_row, target));
            true
        } else {
            if seg_idx > 0 {
                let (s, e) = segs[seg_idx - 1];
                let target = clamp_to_segment(s, e, visual_col, line);
                self.set_cursor(Position::new(cursor.row, target));
                return true;
            }
            let Some(prev_row) = self.prev_visible_row(cursor.row) else {
                return false;
            };
            let prev_line = self.line(prev_row).unwrap_or("");
            let prev_segs = crate::wrap::wrap_segments(prev_line, v.text_width, v.wrap);
            let (s, e) = *prev_segs.last().unwrap_or(&(0, 0));
            let target = clamp_to_segment(s, e, visual_col, prev_line);
            self.set_cursor(Position::new(prev_row, target));
            true
        }
    }

    fn move_vertical(&mut self, delta: isize) {
        let cursor = self.cursor();
        let want = self.sticky_col().unwrap_or(cursor.col);
        // Sticky col only bootstraps from the cursor on the first
        // vertical move; subsequent moves read it back so a short
        // row clamping us to col 3 doesn't lose the desired col 12.
        self.set_sticky_col(Some(want));
        // Walk one visible row at a time so closed folds count as one
        // visual line. Stops at top/bottom of buffer.
        let mut target_row = cursor.row;
        if delta < 0 {
            for _ in 0..(-delta) as usize {
                match self.prev_visible_row(target_row) {
                    Some(r) => target_row = r,
                    None => break,
                }
            }
        } else {
            for _ in 0..delta as usize {
                match self.next_visible_row(target_row) {
                    Some(r) => target_row = r,
                    None => break,
                }
            }
        }
        let line = self.line(target_row).unwrap_or("");
        let max_col = last_col(line);
        let target_col = want.min(max_col);
        self.set_cursor(Position::new(target_row, target_col));
    }

    /// Horizontal motions resync the sticky col so the next
    /// `j` / `k` aims at the new char position.
    fn refresh_sticky_col_from_cursor(&mut self) {
        let col = self.cursor().col;
        self.set_sticky_col(Some(col));
    }
}

/// True if `c` qualifies as a word character (vim's small `w`).
fn is_word(c: char) -> bool {
    c.is_alphanumeric() || c == '_'
}

/// Classify a char into vim's three "word kinds" so transitions
/// between them can drive `w` / `b` / `e`. `Big = true` collapses
/// `Word` and `Punct` into one bucket.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum CharKind {
    Word,
    Punct,
    Space,
}

fn char_kind(c: char, big: bool) -> CharKind {
    if c.is_whitespace() {
        CharKind::Space
    } else if big || is_word(c) {
        // `Big` collapses Word + Punct into a single non-space bucket
        // so `W` / `B` / `E` skip across punctuation runs.
        CharKind::Word
    } else {
        CharKind::Punct
    }
}

/// Step one position forward, wrapping into the next row.
fn step_forward(buf: &Buffer, pos: Position) -> Option<Position> {
    let line = buf.line(pos.row)?;
    let len = line_chars(line);
    if pos.col + 1 < len {
        return Some(Position::new(pos.row, pos.col + 1));
    }
    if pos.row + 1 < buf.row_count() {
        return Some(Position::new(pos.row + 1, 0));
    }
    None
}

/// Step one position back, wrapping into the previous row.
fn step_back(buf: &Buffer, pos: Position) -> Option<Position> {
    if pos.col > 0 {
        return Some(Position::new(pos.row, pos.col - 1));
    }
    if pos.row == 0 {
        return None;
    }
    let prev_row = pos.row - 1;
    let prev_len = line_chars(buf.line(prev_row).unwrap_or(""));
    Some(Position::new(prev_row, prev_len.saturating_sub(1)))
}

fn char_at(buf: &Buffer, pos: Position) -> Option<char> {
    buf.line(pos.row)?.chars().nth(pos.col)
}

fn next_word_start(buf: &Buffer, from: Position, big: bool) -> Option<Position> {
    let start_kind = char_at(buf, from).map(|c| char_kind(c, big));
    let mut cur = from;
    // Skip the rest of the current word kind. Vim treats line
    // breaks as whitespace separators for `w`, so a row crossing
    // implicitly ends the current word — break and let the
    // skip-space pass handle anything beyond.
    if let Some(kind) = start_kind {
        while char_at(buf, cur).map(|c| char_kind(c, big)) == Some(kind) {
            let prev_row = cur.row;
            match step_forward(buf, cur) {
                Some(next) => {
                    cur = next;
                    if next.row != prev_row {
                        break;
                    }
                }
                None => return Some(end_of_buffer(buf)),
            }
        }
    }
    // Skip whitespace runs (within row + across rows) to land on
    // the next non-space char.
    while char_at(buf, cur).map(|c| char_kind(c, big)) == Some(CharKind::Space) {
        match step_forward(buf, cur) {
            Some(next) => cur = next,
            None => return Some(end_of_buffer(buf)),
        }
    }
    Some(cur)
}

/// One past the last char of the last row — vim's "end of buffer"
/// for operator-context word motions, so `yw` at end-of-line yanks
/// up to and including the last char.
fn end_of_buffer(buf: &Buffer) -> Position {
    let last_row = buf.row_count().saturating_sub(1);
    let last_line = buf.line(last_row).unwrap_or("");
    Position::new(last_row, line_chars(last_line))
}

fn prev_word_start(buf: &Buffer, from: Position, big: bool) -> Option<Position> {
    let mut cur = step_back(buf, from)?;
    // Skip whitespace backwards.
    while char_at(buf, cur).map(|c| char_kind(c, big)) == Some(CharKind::Space) {
        cur = step_back(buf, cur)?;
    }
    let target_kind = char_at(buf, cur).map(|c| char_kind(c, big))?;
    // Walk back while the previous char is still the same kind.
    loop {
        let Some(prev) = step_back(buf, cur) else {
            return Some(cur);
        };
        if char_at(buf, prev).map(|c| char_kind(c, big)) == Some(target_kind) {
            cur = prev;
        } else {
            return Some(cur);
        }
    }
}

/// `ge` / `gE` — walk back to the end of the previous word. The
/// stopping rule mirrors `next_word_end`'s definition of "end":
/// non-whitespace position whose next char is a different kind
/// (or end-of-line / end-of-buffer).
fn prev_word_end(buf: &Buffer, from: Position, big: bool) -> Option<Position> {
    let mut cur = step_back(buf, from)?;
    loop {
        // Skip whitespace; if it spans across a row boundary, the
        // step_back walk handles the row crossing for us.
        if char_at(buf, cur).map(|c| char_kind(c, big)) == Some(CharKind::Space) {
            cur = step_back(buf, cur)?;
            continue;
        }
        let here = char_kind_or_space(buf, cur, big);
        let next = next_char_kind_in_row(buf, cur, big);
        let same = if big {
            here != CharKind::Space && next != CharKind::Space
        } else {
            here == next
        };
        if !same {
            return Some(cur);
        }
        cur = step_back(buf, cur)?;
    }
}

/// Returns the kind of the char at `pos`, treating an out-of-line
/// position as `Space`. Used by `prev_word_end` so the stopping
/// rule matches the original sqeel-vim helper that synthesised an
/// implicit whitespace at end-of-line.
fn char_kind_or_space(buf: &Buffer, pos: Position, big: bool) -> CharKind {
    char_at(buf, pos)
        .map(|c| char_kind(c, big))
        .unwrap_or(CharKind::Space)
}

/// Kind of the next char on the same row as `pos`. End-of-line
/// counts as `Space` — vim treats line breaks as separators for
/// `e` / `ge` end-of-word detection.
fn next_char_kind_in_row(buf: &Buffer, pos: Position, big: bool) -> CharKind {
    let line = buf.line(pos.row).unwrap_or("");
    let len = line_chars(line);
    if pos.col + 1 < len {
        char_kind_or_space(buf, Position::new(pos.row, pos.col + 1), big)
    } else {
        CharKind::Space
    }
}

fn next_word_end(buf: &Buffer, from: Position, big: bool) -> Option<Position> {
    // Vim's `e` advances at least one cell, then walks forward
    // until the *next* char is a different kind (or eof).
    let mut cur = step_forward(buf, from)?;
    while char_at(buf, cur).map(|c| char_kind(c, big)) == Some(CharKind::Space) {
        cur = step_forward(buf, cur)?;
    }
    let kind = char_at(buf, cur).map(|c| char_kind(c, big))?;
    loop {
        let Some(next) = step_forward(buf, cur) else {
            return Some(cur);
        };
        if char_at(buf, next).map(|c| char_kind(c, big)) == Some(kind) {
            cur = next;
        } else {
            return Some(cur);
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    fn at(b: &Buffer) -> Position {
        b.cursor()
    }

    #[test]
    fn move_left_clamps_at_zero() {
        let mut b = Buffer::from_str("abcd");
        b.move_right_in_line(3);
        assert_eq!(at(&b), Position::new(0, 3));
        b.move_left(10);
        assert_eq!(at(&b), Position::new(0, 0));
    }

    #[test]
    fn move_left_does_not_wrap_to_prev_row() {
        let mut b = Buffer::from_str("abc\ndef");
        b.move_down(1);
        assert_eq!(at(&b).row, 1);
        b.move_left(99);
        assert_eq!(at(&b), Position::new(1, 0));
    }

    #[test]
    fn move_right_in_line_stops_at_last_char() {
        let mut b = Buffer::from_str("abcd");
        b.move_right_in_line(99);
        assert_eq!(at(&b), Position::new(0, 3));
    }

    #[test]
    fn move_right_to_end_allows_one_past() {
        let mut b = Buffer::from_str("abcd");
        b.move_right_to_end(99);
        assert_eq!(at(&b), Position::new(0, 4));
    }

    #[test]
    fn move_line_start_end() {
        let mut b = Buffer::from_str("  hello");
        b.move_line_end();
        assert_eq!(at(&b), Position::new(0, 6));
        b.move_line_start();
        assert_eq!(at(&b), Position::new(0, 0));
        b.move_first_non_blank();
        assert_eq!(at(&b), Position::new(0, 2));
    }

    #[test]
    fn move_line_end_on_empty_row_stays_at_zero() {
        let mut b = Buffer::from_str("");
        b.move_line_end();
        assert_eq!(at(&b), Position::new(0, 0));
    }

    #[test]
    fn move_down_preserves_sticky_col_across_short_row() {
        let mut b = Buffer::from_str("hello world\nhi\nlong line again");
        b.move_right_in_line(7);
        assert_eq!(at(&b), Position::new(0, 7));
        b.move_down(1);
        assert_eq!(at(&b).row, 1);
        // Short row clamps to col 1 (last char of "hi").
        assert_eq!(at(&b).col, 1);
        b.move_down(1);
        // Sticky col 7 restored on the longer row.
        assert_eq!(at(&b), Position::new(2, 7));
    }

    #[test]
    fn move_down_skips_closed_fold() {
        let mut b = Buffer::from_str("a\nb\nc\nd\ne");
        b.add_fold(1, 3, true);
        // From row 0, `j` should land on row 4 — the fold collapses
        // rows 1..=3 into a single visual line at row 1.
        b.move_down(1);
        assert_eq!(at(&b).row, 1);
        b.move_down(1);
        assert_eq!(at(&b).row, 4);
    }

    #[test]
    fn move_up_skips_closed_fold() {
        let mut b = Buffer::from_str("a\nb\nc\nd\ne");
        b.add_fold(1, 3, true);
        b.set_cursor(Position::new(4, 0));
        b.move_up(1);
        assert_eq!(at(&b).row, 1);
        b.move_up(1);
        assert_eq!(at(&b).row, 0);
    }

    #[test]
    fn open_fold_is_walked_normally() {
        let mut b = Buffer::from_str("a\nb\nc\nd\ne");
        b.add_fold(1, 3, false);
        // Open fold: every row is visible, plain row-by-row stepping.
        b.move_down(2);
        assert_eq!(at(&b).row, 2);
    }

    #[test]
    fn move_top_lands_on_first_non_blank() {
        let mut b = Buffer::from_str("    indented\nrow2");
        b.move_down(1);
        b.move_top();
        assert_eq!(at(&b), Position::new(0, 4));
    }

    #[test]
    fn move_bottom_with_count_jumps_to_line() {
        let mut b = Buffer::from_str("a\n  b\nc\nd");
        b.move_bottom(2);
        assert_eq!(at(&b), Position::new(1, 2));
    }

    #[test]
    fn move_bottom_zero_jumps_to_last_row() {
        let mut b = Buffer::from_str("a\nb\nc");
        b.move_bottom(0);
        assert_eq!(at(&b), Position::new(2, 0));
    }

    #[test]
    fn move_word_fwd_skips_whitespace_runs() {
        let mut b = Buffer::from_str("foo bar  baz");
        b.move_word_fwd(false, 1);
        assert_eq!(at(&b), Position::new(0, 4));
        b.move_word_fwd(false, 1);
        assert_eq!(at(&b), Position::new(0, 9));
    }

    #[test]
    fn move_word_fwd_separates_word_from_punct_in_small_w() {
        let mut b = Buffer::from_str("foo.bar");
        b.move_word_fwd(false, 1);
        assert_eq!(at(&b), Position::new(0, 3));
        b.move_word_fwd(false, 1);
        assert_eq!(at(&b), Position::new(0, 4));
    }

    #[test]
    fn move_word_fwd_big_collapses_word_and_punct() {
        let mut b = Buffer::from_str("foo.bar baz");
        b.move_word_fwd(true, 1);
        assert_eq!(at(&b), Position::new(0, 8));
    }

    #[test]
    fn move_word_back_lands_on_word_start() {
        let mut b = Buffer::from_str("foo bar baz");
        b.move_line_end();
        assert_eq!(at(&b), Position::new(0, 10));
        b.move_word_back(false, 1);
        assert_eq!(at(&b), Position::new(0, 8));
        b.move_word_back(false, 2);
        assert_eq!(at(&b), Position::new(0, 0));
    }

    #[test]
    fn move_word_end_lands_on_last_char() {
        let mut b = Buffer::from_str("foo bar");
        b.move_word_end(false, 1);
        assert_eq!(at(&b), Position::new(0, 2));
        b.move_word_end(false, 1);
        assert_eq!(at(&b), Position::new(0, 6));
    }

    #[test]
    fn find_char_forward_lands_on_match() {
        let mut b = Buffer::from_str("foo,bar,baz");
        assert!(b.find_char_on_line(',', true, false));
        assert_eq!(at(&b), Position::new(0, 3));
        assert!(b.find_char_on_line(',', true, false));
        assert_eq!(at(&b), Position::new(0, 7));
    }

    #[test]
    fn find_char_till_stops_one_short() {
        let mut b = Buffer::from_str("foo,bar");
        assert!(b.find_char_on_line(',', true, true));
        assert_eq!(at(&b), Position::new(0, 2));
    }

    #[test]
    fn find_char_backward_lands_on_match() {
        let mut b = Buffer::from_str("foo,bar,baz");
        b.set_cursor(Position::new(0, 10));
        assert!(b.find_char_on_line(',', false, false));
        assert_eq!(at(&b), Position::new(0, 7));
    }

    #[test]
    fn find_char_no_match_returns_false() {
        let mut b = Buffer::from_str("hello");
        assert!(!b.find_char_on_line('z', true, false));
        assert_eq!(at(&b), Position::new(0, 0));
    }

    #[test]
    fn move_viewport_top_with_offset() {
        let mut b = Buffer::from_str("a\nb\nc\nd\ne\nf");
        b.viewport_mut().top_row = 1;
        b.viewport_mut().height = 4;
        b.move_viewport_top(2);
        assert_eq!(at(&b), Position::new(3, 0));
    }

    #[test]
    fn move_viewport_middle_picks_center_of_visible() {
        let mut b = Buffer::from_str("a\nb\nc\nd\ne");
        b.viewport_mut().top_row = 0;
        b.viewport_mut().height = 5;
        b.move_viewport_middle();
        assert_eq!(at(&b), Position::new(2, 0));
    }

    #[test]
    fn move_viewport_bottom_with_offset() {
        let mut b = Buffer::from_str("a\nb\nc\nd\ne");
        b.viewport_mut().top_row = 0;
        b.viewport_mut().height = 5;
        b.move_viewport_bottom(1);
        assert_eq!(at(&b), Position::new(3, 0));
    }

    #[test]
    fn move_word_end_back_lands_on_prev_word_end() {
        let mut b = Buffer::from_str("foo bar baz");
        b.set_cursor(Position::new(0, 9));
        b.move_word_end_back(false, 1);
        assert_eq!(at(&b), Position::new(0, 6));
        b.move_word_end_back(false, 1);
        assert_eq!(at(&b), Position::new(0, 2));
    }

    #[test]
    fn move_word_end_back_big_skips_punct() {
        let mut b = Buffer::from_str("foo-bar qux");
        b.set_cursor(Position::new(0, 10));
        b.move_word_end_back(true, 1);
        assert_eq!(at(&b), Position::new(0, 6));
    }

    #[test]
    fn move_word_end_back_crosses_lines() {
        let mut b = Buffer::from_str("abc\ndef");
        b.set_cursor(Position::new(1, 2));
        b.move_word_end_back(false, 1);
        assert_eq!(at(&b), Position::new(0, 2));
    }

    #[test]
    fn match_bracket_pairs_within_line() {
        let mut b = Buffer::from_str("if (x + y) {");
        b.set_cursor(Position::new(0, 3));
        assert!(b.match_bracket());
        assert_eq!(at(&b), Position::new(0, 9));
        assert!(b.match_bracket());
        assert_eq!(at(&b), Position::new(0, 3));
    }

    #[test]
    fn match_bracket_handles_nesting() {
        let mut b = Buffer::from_str("((x))");
        b.set_cursor(Position::new(0, 0));
        assert!(b.match_bracket());
        assert_eq!(at(&b), Position::new(0, 4));
    }

    #[test]
    fn match_bracket_crosses_lines() {
        let mut b = Buffer::from_str("{\n  x\n}");
        b.set_cursor(Position::new(0, 0));
        assert!(b.match_bracket());
        assert_eq!(at(&b), Position::new(2, 0));
    }

    #[test]
    fn match_bracket_returns_false_off_bracket() {
        let mut b = Buffer::from_str("hello");
        assert!(!b.match_bracket());
    }

    #[test]
    fn motion_count_zero_treated_as_one() {
        let mut b = Buffer::from_str("abcd");
        b.move_right_in_line(0);
        assert_eq!(at(&b), Position::new(0, 1));
    }

    fn enable_wrap(b: &mut Buffer, mode: crate::Wrap, text_width: u16) {
        let v = b.viewport_mut();
        v.wrap = mode;
        v.text_width = text_width;
        v.height = 10;
    }

    #[test]
    fn screen_down_falls_back_to_move_down_when_wrap_off() {
        let mut b = Buffer::from_str("a\nb\nc");
        b.move_screen_down(1);
        assert_eq!(at(&b), Position::new(1, 0));
        b.move_screen_down(1);
        assert_eq!(at(&b), Position::new(2, 0));
    }

    #[test]
    fn screen_down_walks_within_wrapped_row() {
        // 12-char line, width 4 → segments (0,4), (4,8), (8,12).
        let mut b = Buffer::from_str("aaaabbbbcccc\nx");
        enable_wrap(&mut b, crate::Wrap::Char, 4);
        b.set_cursor(Position::new(0, 1));
        b.move_screen_down(1);
        // visual_col = 1 → next segment starts at 4 → land col 5.
        assert_eq!(at(&b), Position::new(0, 5));
        b.move_screen_down(1);
        assert_eq!(at(&b), Position::new(0, 9));
        // Past the last segment crosses to the next doc row.
        b.move_screen_down(1);
        assert_eq!(at(&b), Position::new(1, 0));
    }

    #[test]
    fn screen_up_walks_within_wrapped_row() {
        let mut b = Buffer::from_str("aaaabbbbcccc");
        enable_wrap(&mut b, crate::Wrap::Char, 4);
        b.set_cursor(Position::new(0, 9));
        b.move_screen_up(1);
        // visual_col = 9 - 8 = 1 → previous segment col = 4 + 1 = 5.
        assert_eq!(at(&b), Position::new(0, 5));
        b.move_screen_up(1);
        assert_eq!(at(&b), Position::new(0, 1));
        // Already on first segment of first row — no further move.
        b.move_screen_up(1);
        assert_eq!(at(&b), Position::new(0, 1));
    }

    #[test]
    fn screen_down_clamps_to_short_segment() {
        // First row wraps into a 6-char then a 2-char segment; second
        // row is only 1 char. Visual col 4 should clamp to row 1's
        // last col (0) when crossing into the short row.
        let mut b = Buffer::from_str("aaaaaabb\nx");
        enable_wrap(&mut b, crate::Wrap::Char, 6);
        b.set_cursor(Position::new(0, 4));
        b.move_screen_down(1);
        // visual_col = 4 → segment 1 is (6, 8); want=10 clamps to 7.
        assert_eq!(at(&b), Position::new(0, 7));
        b.move_screen_down(1);
        // crosses into row 1, segment (0, 1) — clamps to col 0.
        assert_eq!(at(&b), Position::new(1, 0));
    }

    #[test]
    fn screen_down_count_compounds() {
        let mut b = Buffer::from_str("aaaabbbbcccc");
        enable_wrap(&mut b, crate::Wrap::Char, 4);
        b.set_cursor(Position::new(0, 0));
        b.move_screen_down(2);
        assert_eq!(at(&b), Position::new(0, 8));
    }
}