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
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
//! `escriba-runtime` — editor state machine.
//!
//! Wraps everything: `BufferSet`, `ModalState`, `Keymap`, `CommandRegistry`,
//! `Layout`. Exposes `tick(input)` which advances one frame's worth of
//! state given one input event. Pure — no rendering, no I/O beyond file
//! save/load through `BufferSet`.
extern crate self as escriba_runtime;
mod plugin_host;
pub use plugin_host::{LazyTrigger, PluginHost};
mod operator_pending;
pub use operator_pending::{OpState, OperatorPending};
use std::collections::HashMap;
use escriba_buffer::BufferSet;
use escriba_command::{CommandRegistry, EditContext};
use escriba_search::{Direction as SearchDirection, SearchState};
use escriba_core::{
Action, BufferId, Cursors, Damage, Edit, EditGen, Mode, Motion, Operator, Position, Range,
WindowId,
};
use escriba_input::{InputOutcome, translate_app_event};
use escriba_keymap::{Key, Keymap};
use escriba_mode::ModalState;
use escriba_ui::{Layout, Rect, Viewport, Window};
use escriba_vm::{EditorSnapshot, EscribaHost, EscribaVm, HostEffect, VmError};
use awase::KeyRepeatGate;
use madori::AppEvent;
use std::time::Instant;
/// Full editor state — the single Rust value the binary hands to the
/// renderer each frame.
pub struct EditorState {
pub buffers: BufferSet,
pub modal: ModalState,
/// Search session — the committed pattern, its matches, the live `/`
/// prompt and history. Owns no buffer or cursor; it answers questions
/// about text and this runtime applies the answers.
pub search: SearchState,
pub keymap: Keymap,
pub commands: CommandRegistry,
pub layout: Layout,
pub active: BufferId,
/// The single typed home for cursor state. Phase-1 holds one primary
/// [`Position`]; reads go through [`Self::cursor`], writes through
/// [`Self::set_cursor`] → [`Cursors::set_primary`]. There is no loose
/// `Position` field beside an unused multi-caret type to desync.
cursors: Cursors,
pub quit_requested: bool,
/// Messages surfaced to the user (status line / `:messages`) — the
/// sink for the tatara-lisp `(message …)` effect and other feedback.
pub messages: Vec<String>,
/// Generic editor option store (name → value). Written by the
/// tatara-lisp `(set-option …)` effect and the declarative
/// `defoption` apply path; typed accessors layer on top later.
pub options: HashMap<String, String>,
/// Cached embedded tatara-lisp runtime, built lazily on first
/// `run_lisp`. Caching avoids re-installing the ~175-definition full
/// stdlib on every call; the interpreter's top-level env also
/// persists across calls, giving REPL-like session semantics (an
/// earlier `(define …)` is visible to a later `run_lisp`).
lisp_vm: Option<EscribaVm>,
/// Keys accumulated for an in-progress multi-key sequence — e.g.
/// holding `[,, f]` while waiting for the final key of
/// `<leader>ff`. Empty when not mid-sequence. Lives on
/// `EditorState` (not `ModalState`) so `escriba-mode` needn't
/// depend on `escriba-keymap`'s `Key`.
pub pending_keys: Vec<Key>,
/// Per-key debouncer for OS key-repeat storms. Holding `j`/`l` makes
/// the windowing system deliver one `KeyDown` per repeat tick
/// (~30-50ms); without a gate those flood the motion path and thrash
/// the viewport. The gate lets ONE event per `min_interval` (80ms
/// default — ~12 intentional taps/sec still pass) reach the editor in
/// the navigation modes. The fleet primitive (`awase::KeyRepeatGate`,
/// the same one mado uses) is reused — not reinvented.
repeat_gate: KeyRepeatGate<Key>,
/// Runtime lazy-activation host for USER plugin caixas (the bundled
/// default catalog is applied eagerly at boot, not through here).
/// A command / filetype-open / event fires the matching plugins'
/// entries through the escriba-lisp apply paths. See [`PluginHost`].
pub plugin_host: PluginHost,
/// The unnamed register — the home for text an operator yanks or
/// deletes (`Operator::leaves_register`). `None` until the first
/// register-leaving operator runs. Phase-1 holds the single unnamed
/// register; named registers (`"ay`) layer on later.
register: Option<String>,
/// The operator-pending FSM (`d`/`c`/`y` then a motion → `dw`/`c$`/`y0`),
/// standing on the fleet `zenmai` Mealy-machine primitive. Every dispatched
/// action passes through it; only an operator-then-motion pair is rewritten
/// into an [`Action::ApplyOperator`].
op_pending: zenmai::Stateful<OperatorPending>,
/// Monotonic refresh-generation stamp — the root of the sealed refresh
/// tree (`theory/ESCRIBA.md` §Refresh-Seal). Bumped on every applied
/// action + resize; the renderer gates on it so an idle frame does zero
/// re-highlight / re-shape, and a stale frame is unreachable.
edit_gen: EditGen,
/// The accumulated dirty region since the renderer last drained it (M1).
/// Only ever widened via [`Damage::join`] at the mutation funnel, so it
/// always covers the changed region (`Damage ⊇ changed`); the renderer
/// drains it with [`take_damage`](Self::take_damage) to scope its work.
damage: Damage,
}
/// Outcome of feeding one key to the multi-key pending-stroke loop.
enum SeqStep {
/// Key consumed into an in-progress sequence; wait for the next.
Pending,
/// A full bound sequence resolved — run this action.
Resolved(Action),
/// Key is not part of any sequence; hand it to single-key dispatch.
Passthrough,
}
impl EditorState {
/// Build a fresh editor with one buffer (scratch or file-backed).
pub fn new_with_buffer(initial: BufferSet, active: BufferId) -> Self {
let window = Window {
id: WindowId(1),
buffer_id: active,
viewport: Viewport {
top_line: 0,
left_column: 0,
visible_lines: 40,
visible_columns: 160,
},
rect: Rect {
x: 0,
y: 0,
width: 1200,
height: 800,
},
};
Self {
buffers: initial,
modal: ModalState::new(),
search: SearchState::new(escriba_search::CaseMode::Smart),
keymap: Keymap::default_vim(),
commands: CommandRegistry::default_set(),
layout: Layout::single(window),
active,
cursors: Cursors::single(Position::ZERO),
quit_requested: false,
register: None,
op_pending: zenmai::Stateful::new(OpState::Resting),
messages: Vec::new(),
options: HashMap::new(),
lisp_vm: None,
pending_keys: Vec::new(),
repeat_gate: KeyRepeatGate::new(),
plugin_host: PluginHost::default(),
edit_gen: EditGen::default(),
damage: Damage::None,
}
}
/// The current refresh generation. A renderer caches its products against
/// this; equality is the freshness test (an unchanged generation ⇒ the
/// last frame is still valid, so skip the re-highlight + re-shape).
#[must_use]
pub fn edit_gen(&self) -> EditGen {
self.edit_gen
}
/// Advance the refresh generation (a mutation happened).
fn bump_gen(&mut self) {
self.edit_gen = self.edit_gen.next();
}
/// The accumulated dirty region (read-only). See [`take_damage`](Self::take_damage).
#[must_use]
pub fn damage(&self) -> Damage {
self.damage
}
/// Drain the accumulated dirty region, resetting to [`Damage::None`]. The
/// renderer calls this once per frame to learn what to repaint, then the
/// accumulator restarts — so damage never double-counts across frames.
pub fn take_damage(&mut self) -> Damage {
std::mem::replace(&mut self.damage, Damage::None)
}
/// The line count of the active buffer (0 if none) — used to compute the
/// [`Damage`] scope of a mutation.
fn active_line_count(&self) -> u32 {
self.buffers
.get(self.active)
.map_or(0, escriba_buffer::Buffer::line_count)
}
/// Register a lazy USER plugin: its escriba entry is deferred until
/// one of its `triggers` fires. Bundled defaults do NOT go through
/// here — they are applied eagerly at boot. Empty `triggers` means
/// the plugin never lazily activates (the binary applies eager
/// plugins directly).
pub fn register_lazy_plugin(
&mut self,
name: impl Into<String>,
triggers: Vec<LazyTrigger>,
entry_src: impl Into<String>,
) {
self.plugin_host.register(name, triggers, entry_src);
}
/// Apply a plugin entry's escriba-lisp to live state — the same
/// keymap / command / option apply paths a user rc uses. Options are
/// applied before keybinds so a plugin that sets `mapleader` resolves
/// `<leader>` correctly. Returns the count of commands + keybinds it
/// registered (best-effort; a malformed entry is skipped, not fatal).
fn apply_plugin_entry(&mut self, entry_src: &str) -> usize {
let Ok(plan) = escriba_lisp::apply_source(entry_src) else {
return 0;
};
let cmd = escriba_lisp::apply_plan_to_commands(&plan, &mut self.commands);
escriba_lisp::apply_plan_to_options(&plan, &mut self.options);
if let Some(value) = self.options.get("mapleader") {
if let Some(key) = escriba_lisp::parse_leader_key(value) {
self.keymap.set_leader(key);
}
}
let km = escriba_lisp::apply_plan_to_keymap(&plan, &mut self.keymap);
(cmd.registered + km.keybinds_applied) as usize
}
/// Fire any lazy plugin gated on a `FileType` trigger for `filetype`.
/// Returns the number of plugins activated. Call when a buffer of a
/// known filetype is opened.
pub fn activate_filetype_plugins(&mut self, filetype: &str) -> usize {
let pending = self.plugin_host.pending_for_filetype(filetype);
let n = pending.len();
for src in pending {
self.apply_plugin_entry(&src);
}
n
}
/// Fire any lazy plugin gated on an `Event` trigger for `event`.
/// Returns the number of plugins activated.
pub fn activate_event_plugins(&mut self, event: &str) -> usize {
let pending = self.plugin_host.pending_for_event(event);
let n = pending.len();
for src in pending {
self.apply_plugin_entry(&src);
}
n
}
/// Advance one frame's worth of state given a raw madori event.
///
/// Key events pass through the [`KeyRepeatGate`] first (see
/// [`Self::tick_at`]); everything else is handled directly.
pub fn tick(&mut self, event: &AppEvent) {
self.tick_at(event, Instant::now());
}
/// [`Self::tick`] with an explicit timestamp for the key-repeat gate —
/// lets tests drive the debounce window without depending on the
/// wall clock.
pub fn tick_at(&mut self, event: &AppEvent, now: Instant) {
match translate_app_event(event) {
InputOutcome::Key(k) => {
if self.gate_key(&k, now) {
self.on_key(&k);
}
}
InputOutcome::Resized { width, height } => {
if let Some(w) = self
.layout
.windows
.iter_mut()
.find(|w| w.id == self.layout.active)
{
w.rect.width = width;
w.rect.height = height;
}
self.damage = self.damage.join(Damage::Viewport);
self.bump_gen();
}
InputOutcome::Quit => self.quit_requested = true,
InputOutcome::Focus(_) | InputOutcome::None => {}
}
}
/// Decide whether `key` survives the key-repeat gate at time `now`.
///
/// Returns `true` when the key should be processed, `false` when it is
/// an OS key-repeat storm tick that should be dropped. Gating applies
/// ONLY in the navigation modes (Normal / Visual / VisualLine) — those
/// are where a held `j`/`l` floods the motion path and thrashes the
/// viewport. Insert and Command modes pass every key through ungated,
/// because there "hold a key to repeat the character" is the intended
/// behavior, not a storm to suppress.
fn gate_key(&mut self, key: &Key, now: Instant) -> bool {
match self.modal.mode() {
Mode::Normal | Mode::Visual | Mode::VisualLine => {
self.repeat_gate.try_pass_at(*key, now)
}
Mode::Insert | Mode::Command => true,
}
}
/// Dispatch a single key through the keymap + apply the resulting action.
pub fn on_key(&mut self, key: &Key) {
// Multi-key sequence resolution runs first: a key that begins or
// continues a bound sequence (`<leader>ff`, `gg`) is held or
// resolved here before the single-key path sees it.
match self.step_sequence(key) {
SeqStep::Pending => return,
SeqStep::Resolved(action) => {
let count = self.modal.pending_count().unwrap_or(1);
self.modal.clear_count();
for _ in 0..count {
self.apply(&action);
if self.quit_requested {
return;
}
}
return;
}
SeqStep::Passthrough => {}
}
let counted = self.keymap.dispatch(&self.modal, key);
// Count prefixes accumulate into modal state.
if matches!(counted.action, Action::Pending) {
if let Key::Char(c) = key {
if c.is_ascii_digit() {
let d = u32::from(*c as u8 - b'0');
self.modal.append_count(d);
}
}
return;
}
// The count flows through the operator-pending FSM (apply_counted), which
// owns repetition: a bare motion runs count× , an operator captures its
// count, and an operated motion multiplies the two. No naive outer loop.
self.apply_counted(&counted.action, counted.count);
// After applying, reset pending count.
self.modal.clear_count();
}
/// Advance the multi-key pending-stroke state machine for `key`.
///
/// Sequences only apply in normal / visual modes — insert and
/// command modes treat keys as literal text. Rules:
/// - Mid-sequence: extend the pending prefix. Exact match →
/// [`SeqStep::Resolved`]; still a live prefix → [`SeqStep::Pending`];
/// otherwise abort the sequence and re-process this key fresh.
/// - Not mid-sequence: if `key` begins a bound sequence AND is not
/// itself a complete single binding (single bindings win, so no
/// chord timeout is needed) → start pending. Otherwise
/// [`SeqStep::Passthrough`] to the single-key dispatcher.
fn step_sequence(&mut self, key: &Key) -> SeqStep {
let mode = self.modal.mode();
if !matches!(mode, Mode::Normal | Mode::Visual | Mode::VisualLine) {
return SeqStep::Passthrough;
}
if !self.pending_keys.is_empty() {
let mut seq = self.pending_keys.clone();
seq.push(key.clone());
if let Some(b) = self.keymap.lookup_sequence(mode, &seq) {
let action = b.action.clone();
self.pending_keys.clear();
return SeqStep::Resolved(action);
}
if self.keymap.is_sequence_prefix(mode, &seq) {
self.pending_keys = seq;
return SeqStep::Pending;
}
// The key broke the in-progress sequence — abort it and let
// the key be re-processed as a fresh stroke below.
self.pending_keys.clear();
}
let start = [key.clone()];
if self.keymap.is_sequence_prefix(mode, &start)
&& self.keymap.lookup(mode, key).is_none()
{
self.pending_keys = start.to_vec();
return SeqStep::Pending;
}
SeqStep::Passthrough
}
/// The primary cursor position. The single read accessor — every
/// renderer + motion path goes through it, so the underlying
/// representation (today a single-cursor [`Cursors`]) can grow to
/// multi-caret without changing read sites.
#[must_use]
pub fn cursor(&self) -> Position {
self.cursors.primary()
}
/// The **single** cursor-mutation path. Clamp the requested position to
/// the active buffer's bounds, then scroll the active window's viewport
/// to contain it on BOTH axes. Routing every cursor change through this
/// (and through [`Cursors::set_primary`]) makes "cursor outside its
/// viewport" an unrepresentable state, AND keeps cursor state in ONE
/// typed home — there is no code path that advances the cursor without
/// re-deriving the viewport from it, and no second `Position` field to
/// fall out of sync.
fn set_cursor(&mut self, pos: Position) {
let clamped = if let Some(buf) = self.buffers.get(self.active) {
buf.clamp(pos)
} else {
pos
};
self.cursors.set_primary(clamped);
if let Some(w) = self
.layout
.windows
.iter_mut()
.find(|w| w.id == self.layout.active)
{
w.viewport = w.viewport.scroll_to_contain(self.cursors.primary(), 2);
}
}
/// Dispatch one resolved action at count 1. See [`apply_counted`](Self::apply_counted).
fn apply(&mut self, action: &Action) {
self.apply_counted(action, 1);
}
/// Dispatch one resolved action with its count. Routes `(action, count)`
/// through the operator-pending FSM ([`OperatorPending`], on `zenmai`): most
/// actions pass straight to [`apply_resolved`](Self::apply_resolved) carrying
/// their count (so `5j` runs the motion 5×), an operator key is held, and an
/// operator-then-motion pair is rewritten into a counted
/// [`Action::ApplyOperator`] (so `3dw` deletes 3 words). The FSM owns count
/// composition — there is no naive outer repeat loop.
fn apply_counted(&mut self, action: &Action, count: u32) {
for (resolved, times) in self.op_pending.dispatch((action.clone(), count)) {
for _ in 0..times {
self.apply_resolved(&resolved);
if self.quit_requested {
return;
}
}
}
}
/// The active buffer's text. Search is a pure function of it.
fn active_text(&self) -> String {
self.buffers.get(self.active).map(escriba_buffer::Buffer::to_string).unwrap_or_default()
}
/// The cursor as a char offset — the coordinate search speaks.
fn cursor_char(&self) -> usize {
self.buffers
.get(self.active)
.and_then(|b| b.position_to_char(self.cursor()).ok())
.unwrap_or(0)
}
/// Move the cursor onto a match and report a wrap the way vim does.
fn land_on(&mut self, step: escriba_search::Step) {
if let Some(buf) = self.buffers.get(self.active) {
let pos = buf.char_to_position(step.target.start);
self.set_cursor(pos);
}
if let Some(msg) = step.wrapped.message() {
self.messages.push(msg.to_string());
}
}
/// `n` / `N`. Reports vim's E486 when the pattern matches nothing, rather
/// than failing silently — a search that appears to do nothing is
/// indistinguishable from a dropped keystroke.
fn jump_search(&mut self, reverse: bool) {
let at = self.cursor_char();
match self.search.repeat(at, reverse) {
Some(step) => self.land_on(step),
None => {
let msg = self.search.pattern().map_or_else(
|| "E35: No previous regular expression".to_string(),
|p| {
let mut m = String::from("E486: Pattern not found: ");
m.push_str(p.raw());
m
},
);
self.messages.push(msg);
}
}
}
/// Move the cursor to where the in-progress pattern would land, without
/// committing anything. vim's `incsearch`.
///
/// A pattern that does not compile yet (`/a[`, mid-typing) previews
/// nothing and reports nothing — an error toast on every keystroke of a
/// character class would be unusable.
fn preview_search(&mut self) {
let text = self.active_text();
if let Some(step) = self.search.preview(&text) {
if let Some(buf) = self.buffers.get(self.active) {
let pos = buf.char_to_position(step.target.start);
self.set_cursor(pos);
}
}
}
/// Commit the `/` prompt: compile, search, jump, and report like vim.
fn submit_search(&mut self) {
let text = self.active_text();
let at = self.cursor_char();
let outcome = self.search.accept(&text);
match outcome {
escriba_search::Accepted::Committed | escriba_search::Accepted::ReusedPrevious => {
self.modal.clear_minibuffer();
self.modal.enter(Mode::Normal);
match self.search.repeat(at.saturating_sub(1), false) {
Some(step) => self.land_on(step),
None => {
let mut m = String::from("E486: Pattern not found");
if let Some(p) = self.search.pattern() {
m.push_str(": ");
m.push_str(p.raw());
}
self.messages.push(m);
}
}
}
escriba_search::Accepted::NothingToRepeat => {
self.modal.clear_minibuffer();
self.modal.enter(Mode::Normal);
self.messages.push("E35: No previous regular expression".to_string());
}
// The prompt stays OPEN so the typed pattern is not lost; the user
// fixes the regex instead of retyping it.
escriba_search::Accepted::Invalid(e) => {
let mut m = String::from("E383: Invalid search string: ");
m.push_str(&e.to_string());
self.messages.push(m);
}
}
}
fn apply_resolved(&mut self, action: &Action) {
// Snapshot the scope inputs before the mutation so the resulting
// Damage covers the changed region (the S3 seal — conservative widen).
let lines_before = self.active_line_count();
let cline_before = self.cursor().line;
match action {
Action::Move(m) => self.apply_motion(*m),
Action::SearchOpen(dir) => {
// vim's `/` is the command-line with a different prompt char,
// so we reuse Command mode; `search.prompt` is what tells a
// later <CR> this is a search and not an ex-command.
let origin = self.cursor_char();
self.search.open(*dir, origin);
self.modal.enter(Mode::Command);
}
Action::SearchRepeat { reverse } => self.jump_search(*reverse),
Action::SearchWord { reverse } => {
let dir =
if *reverse { SearchDirection::Backward } else { SearchDirection::Forward };
let (text, at) = (self.active_text(), self.cursor_char());
match self.search.search_word(&text, at, dir) {
Some(step) => self.land_on(step),
// vim beeps and stays put when there is no word under the
// cursor; a silent no-op would look like a broken key.
None => self.messages.push("E348: No string under cursor".to_string()),
}
}
Action::ClearSearchHighlight => self.search.clear_highlight(),
Action::ChangeMode(m) => {
// Leaving the cmdline abandons any open search prompt and
// returns the cursor home. The COMMITTED pattern survives —
// cancelling a new search must not erase the old highlights.
if *m == Mode::Normal && self.search.is_prompting() {
if let Some(origin) = self.search.cancel() {
if let Some(buf) = self.buffers.get(self.active) {
let pos = buf.char_to_position(origin);
self.set_cursor(pos);
}
}
}
self.modal.enter(*m);
}
Action::InsertChar(c) => self.insert_char(*c),
Action::Edit(edit) => self.apply_edit(edit),
Action::Undo => {
if let Some(buf) = self.buffers.get_mut(self.active) {
let _ = buf.undo();
}
// The buffer may have shrunk — re-follow so the viewport
// re-contains a now-out-of-bounds cursor.
self.set_cursor(self.cursor());
}
Action::Redo => {
if let Some(buf) = self.buffers.get_mut(self.active) {
let _ = buf.redo();
}
self.set_cursor(self.cursor());
}
Action::Save => {
if let Some(buf) = self.buffers.get_mut(self.active) {
let _ = buf.save();
}
self.set_cursor(self.cursor());
}
Action::Quit => self.quit_requested = true,
Action::SubmitCommand => {
if self.search.is_prompting() {
self.submit_search();
} else {
self.submit_command();
}
}
Action::Command { name, args } => self.run_command(name, args),
Action::ApplyOperator { op, motion } => self.apply_operator(*op, *motion),
// The operator-pending FSM consumes Operator keys (begins pending);
// they never reach the executor. Defensive no-op for exhaustiveness.
Action::Operator(_) => {}
Action::PromptBackspace => {
self.prompt_backspace();
// Shortening the pattern changes which matches exist, so the
// preview must re-run — otherwise the cursor sits on a match
// of a pattern that is no longer typed.
if self.search.is_prompting() {
self.preview_search();
}
}
Action::PromptHistory { back } => {
if self.search.is_prompting() {
self.search.history_step(*back);
// The minibuffer is a separate display buffer, so it must
// be rewritten from the prompt rather than left showing the
// pattern history just replaced.
self.modal.clear_minibuffer();
if let Some(text) = self.search.prompt().map(|p| p.text.clone()) {
self.modal.push_minibuffer_str(&text);
}
self.preview_search();
}
}
Action::Pending => {}
}
// Widen the dirty region by what this action touched (M1). Content
// mutations that changed the line count run to end-of-document (every
// line below shifted); an in-place edit or a cursor move is local;
// arbitrary commands are conservatively Full. Never narrows.
let lines_after = self.active_line_count();
let cline_after = self.cursor().line;
let d = match action {
// A search repaints every highlight in the viewport, not just the
// line the cursor left — so it must widen to Full. Treating it as a
// cursor move would leave stale highlights on untouched lines.
Action::SearchOpen(_)
| Action::PromptHistory { .. }
| Action::PromptBackspace
| Action::SearchRepeat { .. }
| Action::SearchWord { .. }
| Action::ClearSearchHighlight => Damage::Full,
Action::InsertChar(_)
| Action::Edit(_)
| Action::Undo
| Action::Redo
| Action::ApplyOperator { .. } => {
if lines_after == lines_before {
Damage::span(cline_before, cline_after)
} else {
Damage::Lines {
from: cline_before.min(cline_after),
to: u32::MAX,
}
}
}
Action::Move(_) | Action::ChangeMode(_) => Damage::span(cline_before, cline_after),
Action::Save => Damage::Viewport,
Action::Command { .. } | Action::SubmitCommand => Damage::Full,
Action::Quit | Action::Operator(_) | Action::Pending => Damage::None,
};
self.damage = self.damage.join(d);
// An action reached the executor ⇒ visible state may have changed.
// Advance the refresh generation so the renderer repaints (and
// re-highlights) exactly once. A gated-out key never reaches here, so
// a key-repeat storm does not spin the renderer.
self.bump_gen();
}
/// Resolve a [`Motion`] from `from` to its target [`Position`] against the
/// active buffer — **pure**: no cursor mutation, no side effects. This is
/// the single motion-resolution source of truth that both [`apply_motion`]
/// (move the cursor *to* the target) and [`apply_operator`] (use the target
/// as the *other end* of an operated range) stand on. `None` only if there
/// is no active buffer.
///
/// [`apply_motion`]: Self::apply_motion
/// [`apply_operator`]: Self::apply_operator
fn resolve_motion(&self, from: Position, motion: Motion) -> Option<Position> {
let buf = self.buffers.get(self.active)?;
let pos = from;
Some(match motion {
// Search-as-motion: what makes `dn` / `d/foo<CR>` work. Resolved
// against the committed match list, so it is `None` (motion fails,
// operator aborts, buffer untouched) when nothing is committed —
// never a silent move to 0, which would delete to the file start.
Motion::SearchNext | Motion::SearchPrev => {
let at = buf.position_to_char(pos).ok()?;
let step = self.search.repeat(at, matches!(motion, Motion::SearchPrev))?;
buf.char_to_position(step.target.start)
}
Motion::Left => Position::new(pos.line, pos.column.saturating_sub(1)),
Motion::Right => Position::new(pos.line, pos.column.saturating_add(1)),
Motion::Up => Position::new(pos.line.saturating_sub(1), pos.column),
Motion::Down => Position::new(pos.line.saturating_add(1), pos.column),
Motion::LineStart => Position::new(pos.line, 0),
Motion::LineEnd => Position::new(pos.line, buf.line_len_chars(pos.line)),
Motion::LineFirstNonBlank => first_non_blank(buf, pos.line),
Motion::DocStart => Position::ZERO,
Motion::DocEnd => Position::new(
buf.line_count().saturating_sub(1),
buf.line_len_chars(buf.line_count().saturating_sub(1)),
),
Motion::WordStartNext | Motion::WordEndNext => word_next(buf, pos),
Motion::WordStartPrev => word_prev(buf, pos),
Motion::PageDown | Motion::HalfPageDown => {
Position::new(pos.line.saturating_add(10), pos.column)
}
Motion::PageUp | Motion::HalfPageUp => {
Position::new(pos.line.saturating_sub(10), pos.column)
}
Motion::GotoLine(n) => Position::new(n.saturating_sub(1), 0),
// Structural Lisp motions — stubs for phase 1.B; full paredit
// semantics land when caixa-ast is wired to the active buffer.
Motion::ForwardSexp
| Motion::BackwardSexp
| Motion::UpList
| Motion::DownList
| Motion::BeginningOfDefun
| Motion::EndOfDefun
| Motion::BeginningOfSexp
| Motion::EndOfSexp => pos,
})
}
fn apply_motion(&mut self, motion: Motion) {
let Some(pos) = self.resolve_motion(self.cursor(), motion) else {
return;
};
// The single cursor-mutation path clamps to the buffer and scrolls
// the viewport to contain the cursor on both axes.
self.set_cursor(pos);
}
/// Apply an operator over a motion — the vim `{operator}{motion}` verbs
/// (`dw` delete-word, `c$` change-to-line-end, `y0` yank-to-line-start).
/// Composition is explicit: the motion resolves a target via
/// [`resolve_motion`](Self::resolve_motion); the operator acts over the
/// `[cursor, target)` range. Register-leaving operators
/// ([`Operator::leaves_register`]) capture the text first.
fn apply_operator(&mut self, op: Operator, motion: Motion) {
let from = self.cursor();
let Some(to) = self.resolve_motion(from, motion) else {
return;
};
let range = Range { start: from, end: to }.normalized();
if range.is_empty() {
return;
}
// Capture the operated text (for the register) before mutating.
let text = self
.buffers
.get(self.active)
.and_then(|buf| buf.slice(range).ok());
if op.leaves_register() {
if let Some(t) = &text {
self.register = Some(t.clone());
}
}
match op {
// Delete + Change remove the range; Change then enters Insert so
// the operator pairs with immediate typing (`ciw`, `c$`).
Operator::Delete | Operator::Change => {
if let Some(buf) = self.buffers.get_mut(self.active) {
let _ = buf.apply(&Edit::delete(range));
}
self.set_cursor(range.start);
if op == Operator::Change {
self.modal.enter(Mode::Insert);
}
}
// Yank copies to the register without mutating the buffer; vim
// leaves the cursor at the range start.
Operator::Yank => {
self.set_cursor(range.start);
}
// Indent/Format/structural operators are not yet wired — named,
// not faked (no buffer mutation, register already captured for the
// register-leaving ones above).
_ => {
self.messages
.push("operator not yet implemented".to_owned());
}
}
}
/// The text last yanked or deleted into the unnamed register, if any.
/// The future `p`/`P` paste reads this.
#[must_use]
pub fn register(&self) -> Option<&str> {
self.register.as_deref()
}
fn insert_char(&mut self, c: char) {
if self.modal.mode() == Mode::Command {
// A search prompt and an ex-command share Command mode (vim's
// cmdline). `search.is_prompting()` is the typed discriminator —
// it can only be true when `/` or `?` actually opened a prompt.
if self.search.is_prompting() {
self.search.push(c);
self.modal.push_minibuffer(c);
self.preview_search();
} else {
self.modal.push_minibuffer(c);
}
return;
}
let cursor = self.cursor();
let Some(buf) = self.buffers.get_mut(self.active) else {
return;
};
let edit = Edit::insert(cursor, c.to_string());
if buf.apply(&edit).is_ok() {
let next = if c == '\n' {
Position::new(cursor.line.saturating_add(1), 0)
} else {
cursor.shift_right(1)
};
// Route through the single cursor-mutation path so the viewport
// follows the cursor (both axes) and the cursor stays clamped.
self.set_cursor(next);
}
}
/// Backspace inside a prompt. Keeps the search buffer and the displayed
/// minibuffer in lockstep — if only one shrank, the pattern submitted
/// would differ from the text on screen.
fn prompt_backspace(&mut self) -> bool {
if self.modal.mode() != Mode::Command {
return false;
}
if self.search.is_prompting() {
// Backspacing past the `/` closes the prompt, as vim does.
if self.search.backspace() {
self.modal.clear_minibuffer();
self.modal.enter(Mode::Normal);
return true;
}
}
self.modal.pop_minibuffer();
true
}
fn apply_edit(&mut self, _edit: &Edit) {
// Phase 2: actually apply arbitrary edits from the keymap. For now
// the only keymap-originated edits are InsertChar (handled above)
// and the Backspace sentinel that escriba-keymap emits.
}
fn submit_command(&mut self) {
// Read the command line BEFORE leaving Command mode — the minibuffer
// exists only in the `Command` variant, so the escape must come
// after the capture.
let line = self.modal.minibuffer().to_string();
self.modal.escape();
let (name, args) = parse_command_line(&line);
if name.is_empty() {
return;
}
self.run_command(&name, &args);
}
fn run_command(&mut self, name: &str, args: &[String]) {
// `:noh` is handled here rather than in the command registry because
// it mutates SearchState, which EditContext does not expose (and
// should not — the registry's contract is buffers + modal state).
// Without it there is no way to turn highlights off, which makes
// hlsearch actively unpleasant rather than useful.
if matches!(name, "noh" | "nohl" | "nohlsearch") {
self.search.clear_highlight();
return;
}
// Lazy-activation seam (lazy.nvim `cmd =` model): a user plugin
// gated on `Command: <name>` has its entry applied the first time
// that command runs, BEFORE dispatch — so the activated plugin
// can register the very command being invoked and it resolves on
// this same call.
if self.plugin_host.pending() > 0 {
let pending = self.plugin_host.pending_for_command(name);
for src in pending {
self.apply_plugin_entry(&src);
}
}
let active = Some(self.active);
let mut quit = false;
{
let mut ctx = EditContext {
buffers: &mut self.buffers,
active,
state: &mut self.modal,
quit_requested: &mut quit,
};
let _ = self.commands.run(name, &mut ctx, args);
}
// The command's typed quit signal — no string sentinel, no
// mode-specific buffer to clear.
if quit {
self.quit_requested = true;
}
}
// ── tatara-lisp runtime bridge (imperative programmability tier) ──
/// Capture a read snapshot of the editor for the tatara-lisp host.
/// Lisp reads (`cursor-line`, `current-line`, …) answer from this.
#[must_use]
pub fn snapshot(&self) -> EditorSnapshot {
let current_line = self
.buffers
.get(self.active)
.and_then(|b| b.line(self.cursor().line))
.map(|s| s.trim_end_matches('\n').to_string())
.unwrap_or_default();
let buffer_name = self
.buffers
.get(self.active)
.and_then(|b| b.path.as_ref())
.map(|p| p.display().to_string())
.unwrap_or_else(|| "[scratch]".to_string());
EditorSnapshot {
cursor_line: i64::from(self.cursor().line),
cursor_column: i64::from(self.cursor().column),
current_line,
mode: self.modal.mode().as_str().to_string(),
buffer_name,
}
}
/// Evaluate tatara-lisp `src` against this editor: capture a
/// snapshot, run it in the embedded VM, then apply the typed effects
/// the program emitted. This is the imperative programmability tier
/// — live Lisp that reads state and drives the editor through the
/// sandboxed effect boundary.
///
/// **Snapshot semantics:** the read snapshot is captured ONCE before
/// eval, and effects are applied AFTER the program returns. So within
/// a single `run_lisp` call a program cannot observe its own writes —
/// `(insert "x") (cursor-column)` reads the pre-insert column. This
/// snapshot-isolation is deliberate (it's what makes the effect
/// boundary a clean sandbox seam); a program that must read its own
/// effects splits the work across calls. The VM is cached
/// ([`Self::lisp_vm`]) so the stdlib is installed once and top-level
/// `define`s persist across calls (REPL-like).
pub fn run_lisp(&mut self, src: &str) -> Result<(), VmError> {
let mut host = EscribaHost::with_snapshot(self.snapshot());
let vm = self.lisp_vm.get_or_insert_with(EscribaVm::new);
vm.eval(src, &mut host)?;
let effects = host.take_effects();
self.apply_host_effects(effects);
Ok(())
}
/// Apply tatara-lisp [`HostEffect`]s to live editor state. The
/// single seam where Lisp-requested mutations land — extend here +
/// in `escriba-vm` to add a capability.
pub fn apply_host_effects(&mut self, effects: Vec<HostEffect>) {
for eff in effects {
match eff {
HostEffect::Message(m) => self.messages.push(m),
HostEffect::RunCommand { name, args } => self.run_command(&name, &args),
HostEffect::SetOption { name, value } => {
self.options.insert(name, value);
}
HostEffect::InsertText(text) => self.insert_text(&text),
}
}
}
/// Insert a (possibly multi-line) string at the cursor and advance
/// the cursor past it. Used by the `(insert …)` effect.
fn insert_text(&mut self, text: &str) {
if text.is_empty() {
return;
}
let cursor = self.cursor();
let Some(buf) = self.buffers.get_mut(self.active) else {
return;
};
let edit = Edit::insert(cursor, text.to_string());
if buf.apply(&edit).is_ok() {
let next = if let Some(nl) = text.rfind('\n') {
let added_lines = u32::try_from(text.matches('\n').count()).unwrap_or(0);
let last_line_len = u32::try_from(text[nl + 1..].chars().count()).unwrap_or(0);
Position::new(cursor.line + added_lines, last_line_len)
} else {
let n = u32::try_from(text.chars().count()).unwrap_or(0);
cursor.shift_right(n)
};
// Route through the single cursor-mutation path so the viewport
// follows the cursor (both axes) and the cursor stays clamped.
self.set_cursor(next);
}
}
}
fn first_non_blank(buf: &escriba_buffer::Buffer, line: u32) -> Position {
let Some(text) = buf.line(line) else {
return Position::new(line, 0);
};
let col = text
.chars()
.take_while(|c| c.is_whitespace() && *c != '\n')
.count();
Position::new(line, u32::try_from(col).unwrap_or(0))
}
fn word_next(buf: &escriba_buffer::Buffer, pos: Position) -> Position {
let Some(text) = buf.line(pos.line) else {
return pos;
};
let chars: Vec<char> = text.chars().collect();
let start = pos.column as usize;
let mut i = start;
while i < chars.len() && !chars[i].is_whitespace() {
i += 1;
}
while i < chars.len() && chars[i].is_whitespace() {
i += 1;
}
if i >= chars.len() {
// No more words on this line — jump to next line.
if pos.line + 1 < buf.line_count() {
return Position::new(pos.line + 1, 0);
}
}
Position::new(pos.line, u32::try_from(i).unwrap_or(pos.column))
}
fn word_prev(buf: &escriba_buffer::Buffer, pos: Position) -> Position {
let Some(text) = buf.line(pos.line) else {
return pos;
};
let chars: Vec<char> = text.chars().collect();
let mut i = (pos.column as usize).min(chars.len());
while i > 0 && chars[i - 1].is_whitespace() {
i -= 1;
}
while i > 0 && !chars[i - 1].is_whitespace() {
i -= 1;
}
Position::new(pos.line, u32::try_from(i).unwrap_or(0))
}
fn parse_command_line(line: &str) -> (String, Vec<String>) {
let mut parts = line.split_whitespace();
let Some(first) = parts.next() else {
return (String::new(), Vec::new());
};
let head = first.strip_prefix(':').unwrap_or(first);
let name = match head {
"w" => "save",
"q" => "quit",
"u" => "undo",
other => other,
};
(name.to_string(), parts.map(str::to_string).collect())
}
#[cfg(test)]
mod tests {
use super::*;
use madori::event::{KeyCode, KeyEvent, Modifiers};
// ── search wiring (escriba-search integration) ────────────────────
//
// The engine is proven in escriba-search's own 61 tests. These prove the
// WIRING: that keys reach it, that the cursor lands where it says, and
// that a search prompt and an ex-command can share Command mode without
// being confused for one another.
fn type_search(st: &mut EditorState, dir: SearchDirection, pat: &str) {
st.apply(&Action::SearchOpen(dir));
for c in pat.chars() {
st.apply(&Action::InsertChar(c));
}
st.apply(&Action::SubmitCommand);
}
#[test]
fn slash_search_moves_the_cursor_to_the_match() {
let mut st = new_state_with("alpha\nbravo\ncharlie\n");
type_search(&mut st, SearchDirection::Forward, "charlie");
assert_eq!(st.cursor().line, 2, "cursor lands on the matching line");
assert_eq!(st.modal.mode(), Mode::Normal, "prompt closes on submit");
assert_eq!(st.search.matches().len(), 1);
}
#[test]
fn n_and_N_walk_matches_in_both_directions() {
let mut st = new_state_with("foo\nbar\nfoo\nbaz\nfoo\n");
type_search(&mut st, SearchDirection::Forward, "foo");
let first = st.cursor().line;
st.apply(&Action::SearchRepeat { reverse: false });
let second = st.cursor().line;
assert!(second > first, "n advances ({first} -> {second})");
st.apply(&Action::SearchRepeat { reverse: true });
assert_eq!(st.cursor().line, first, "N comes back");
}
#[test]
fn star_searches_the_word_under_the_cursor() {
let mut st = new_state_with("needle\nhaystack\nneedle\n");
st.apply(&Action::SearchWord { reverse: false });
assert_eq!(st.search.pattern().unwrap().raw(), r"\bneedle\b");
assert_eq!(st.cursor().line, 2, "jumps to the other occurrence");
}
#[test]
fn escape_abandons_the_prompt_and_keeps_the_previous_search() {
let mut st = new_state_with("foo\nbar\nfoo\n");
type_search(&mut st, SearchDirection::Forward, "foo");
let matches_before = st.search.matches().len();
st.apply(&Action::SearchOpen(SearchDirection::Forward));
st.apply(&Action::InsertChar('z'));
st.apply(&Action::ChangeMode(Mode::Normal));
assert!(!st.search.is_prompting(), "prompt gone");
assert_eq!(st.search.pattern().unwrap().raw(), "foo", "old pattern survives");
assert_eq!(st.search.matches().len(), matches_before, "old highlights survive");
}
#[test]
fn a_search_prompt_and_an_ex_command_are_not_confused() {
let mut st = new_state_with("foo\n");
// No `/` pressed: Command mode belongs to the ex-command line.
st.apply(&Action::ChangeMode(Mode::Command));
assert!(!st.search.is_prompting(), "`:` must not open a search");
st.apply(&Action::InsertChar('w'));
assert!(st.search.prompt().is_none(), "typed char went to the ex line");
}
#[test]
fn a_missing_pattern_reports_instead_of_failing_silently() {
let mut st = new_state_with("alpha\nbravo\n");
type_search(&mut st, SearchDirection::Forward, "zzz");
assert!(
st.messages.iter().any(|m| m.contains("E486")),
"must report not-found, got {:?}",
st.messages
);
}
#[test]
fn n_without_any_search_reports_rather_than_moving() {
let mut st = new_state_with("alpha\nbravo\n");
let before = st.cursor();
st.apply(&Action::SearchRepeat { reverse: false });
assert_eq!(st.cursor(), before, "cursor must not move");
assert!(st.messages.iter().any(|m| m.contains("E35")), "got {:?}", st.messages);
}
#[test]
fn search_as_a_motion_composes_with_an_operator() {
// The point of Motion::SearchNext: `d` + search deletes to the match.
let mut st = new_state_with("alpha bravo charlie\n");
type_search(&mut st, SearchDirection::Forward, "charlie");
st.set_cursor(Position::new(0, 0));
let target = st.resolve_motion(Position::new(0, 0), Motion::SearchNext);
assert!(target.is_some(), "search must resolve as a motion");
assert_eq!(target.unwrap().column, 12, "at `charlie`");
}
#[test]
fn search_motion_without_a_pattern_fails_the_motion_instead_of_moving_to_zero() {
// A silent fallback to offset 0 would make `d` + search delete to the
// start of the file — the worst possible failure for an operator.
let st = new_state_with("alpha bravo\n");
assert!(st.resolve_motion(Position::new(0, 5), Motion::SearchNext).is_none());
}
#[test]
fn clear_highlight_keeps_the_pattern_usable() {
let mut st = new_state_with("foo\nbar\nfoo\n");
type_search(&mut st, SearchDirection::Forward, "foo");
st.apply(&Action::ClearSearchHighlight);
assert!(st.search.highlights().is_empty(), "nothing lit");
st.apply(&Action::SearchRepeat { reverse: false });
assert!(st.search.pattern().is_some(), "but n still works");
}
#[test]
fn typing_previews_incrementally_before_commit() {
let mut st = new_state_with("alpha\nbravo\ncharlie\n");
st.apply(&Action::SearchOpen(SearchDirection::Forward));
for c in "charlie".chars() {
st.apply(&Action::InsertChar(c));
}
// incsearch: the cursor has already moved, with nothing committed.
assert_eq!(st.cursor().line, 2, "preview moved the cursor");
assert!(st.search.pattern().is_none(), "but nothing is committed");
}
#[test]
fn backspace_corrects_the_prompt_and_reruns_the_preview() {
let mut st = new_state_with("alpha\nbravo\n");
st.apply(&Action::SearchOpen(SearchDirection::Forward));
for c in "bravox".chars() {
st.apply(&Action::InsertChar(c));
}
assert_eq!(st.search.prompt().unwrap().text, "bravox");
st.apply(&Action::PromptBackspace);
assert_eq!(st.search.prompt().unwrap().text, "bravo", "typo corrected");
assert_eq!(st.modal.minibuffer(), "bravo", "display stays in lockstep");
assert_eq!(st.cursor().line, 1, "preview re-ran and found it");
}
#[test]
fn backspacing_past_the_slash_closes_the_prompt() {
let mut st = new_state_with("alpha\n");
st.apply(&Action::SearchOpen(SearchDirection::Forward));
st.apply(&Action::InsertChar('a'));
st.apply(&Action::PromptBackspace);
st.apply(&Action::PromptBackspace);
assert!(!st.search.is_prompting(), "prompt closed");
assert_eq!(st.modal.mode(), Mode::Normal);
}
#[test]
fn noh_clears_highlights_and_keeps_the_pattern() {
let mut st = new_state_with("foo\nbar\nfoo\n");
type_search(&mut st, SearchDirection::Forward, "foo");
assert!(!st.search.highlights().is_empty());
st.run_command("noh", &[]);
assert!(st.search.highlights().is_empty(), ":noh turns them off");
assert!(st.search.pattern().is_some(), "but n still works");
}
#[test]
fn noh_accepts_the_vim_aliases() {
for name in ["noh", "nohl", "nohlsearch"] {
let mut st = new_state_with("foo\nfoo\n");
type_search(&mut st, SearchDirection::Forward, "foo");
st.run_command(name, &[]);
assert!(st.search.highlights().is_empty(), "{name} must clear");
}
}
#[test]
fn backspace_on_the_ex_line_does_not_touch_search_state() {
let mut st = new_state_with("foo\n");
st.apply(&Action::ChangeMode(Mode::Command));
st.apply(&Action::InsertChar('w'));
st.apply(&Action::InsertChar('q'));
st.apply(&Action::PromptBackspace);
assert_eq!(st.modal.minibuffer(), "w");
assert!(st.search.prompt().is_none(), "no search was involved");
}
#[test]
fn up_arrow_recalls_the_previous_search() {
let mut st = new_state_with("alpha\nbravo\n");
type_search(&mut st, SearchDirection::Forward, "bravo");
st.apply(&Action::SearchOpen(SearchDirection::Forward));
st.apply(&Action::PromptHistory { back: true });
assert_eq!(st.search.prompt().unwrap().text, "bravo");
assert_eq!(st.modal.minibuffer(), "bravo", "display follows the prompt");
}
#[test]
fn arrowing_back_down_restores_the_half_typed_pattern() {
let mut st = new_state_with("alpha\nbravo\n");
type_search(&mut st, SearchDirection::Forward, "bravo");
st.apply(&Action::SearchOpen(SearchDirection::Forward));
st.apply(&Action::InsertChar('a'));
st.apply(&Action::PromptHistory { back: true });
assert_eq!(st.search.prompt().unwrap().text, "bravo");
st.apply(&Action::PromptHistory { back: false });
assert_eq!(st.search.prompt().unwrap().text, "a", "the draft comes back");
assert_eq!(st.modal.minibuffer(), "a");
}
#[test]
fn history_arrows_do_nothing_on_the_ex_line() {
let mut st = new_state_with("alpha\n");
st.apply(&Action::ChangeMode(Mode::Command));
st.apply(&Action::InsertChar('w'));
st.apply(&Action::PromptHistory { back: true });
assert_eq!(st.modal.minibuffer(), "w", "ex line untouched");
}
fn new_state_with(text: &str) -> EditorState {
let mut bufs = BufferSet::new();
let id = bufs.scratch(text);
EditorState::new_with_buffer(bufs, id)
}
/// The refresh-seal driver (theory/ESCRIBA.md §Refresh-Seal): an applied
/// action advances `edit_gen` (so the renderer repaints), and merely
/// reading the generation does not. This is what lets `gpu.rs` gate the
/// re-highlight/re-shape on a generation change — an idle frame observes an
/// unchanged generation and reuses its cached buffer.
#[test]
fn edit_gen_advances_on_applied_action_not_on_read() {
let mut s = new_state_with("hello\nworld\n");
let g0 = s.edit_gen();
s.apply(&Action::InsertChar('X'));
assert_ne!(
s.edit_gen(),
g0,
"an applied action must advance the refresh generation",
);
// Reading the generation is not a mutation — idle frames stay put.
let g1 = s.edit_gen();
assert_eq!(s.edit_gen(), g1, "reading edit_gen must not advance it");
}
/// The M1 refresh node (theory/ESCRIBA.md §X): a mutation widens the typed
/// `Damage` to cover exactly what changed — local for an in-place edit,
/// to-end-of-document when the line count shifts — and the renderer drains
/// it per frame. `Damage ⊇ changed` by construction; it never narrows.
#[test]
fn damage_tracks_edit_scope_and_drains() {
let mut s = new_state_with("hello\nworld\n");
assert!(s.damage().is_none(), "a fresh state has no damage");
s.apply(&Action::InsertChar('X')); // in-place edit on line 0
assert_eq!(
s.damage(),
Damage::Lines { from: 0, to: 0 },
"a local edit damages just its line",
);
let drained = s.take_damage();
assert_eq!(drained, Damage::Lines { from: 0, to: 0 });
assert!(s.damage().is_none(), "take_damage drains to None");
s.apply(&Action::InsertChar('\n')); // splits line 0 → line count grows
assert_eq!(
s.damage(),
Damage::Lines {
from: 0,
to: u32::MAX,
},
"a line-count change damages to end-of-document",
);
}
/// A state whose active window is a deliberately tiny viewport
/// (`visible_lines` × `visible_columns`) so the scroll-to-contain
/// invariant is exercised on small inputs.
fn new_state_small_viewport(text: &str, vis_lines: u32, vis_cols: u32) -> EditorState {
let mut s = new_state_with(text);
for w in &mut s.layout.windows {
w.viewport.visible_lines = vis_lines;
w.viewport.visible_columns = vis_cols;
}
s
}
/// The core regression invariant: the active window's viewport CONTAINS
/// the cursor on BOTH axes. This is the operator's exact complaint —
/// "typing past the bottom (or right) leaves the cursor off-screen" —
/// made into a checkable property.
fn assert_cursor_in_viewport(s: &EditorState, ctx: &str) {
let w = s.layout.active_window().expect("active window");
let v = w.viewport;
let c = s.cursor();
assert!(
v.top_line <= c.line && c.line < v.top_line + v.visible_lines,
"[{ctx}] cursor line {} not in vertical window [{}, {}); viewport={v:?}",
c.line,
v.top_line,
v.top_line + v.visible_lines,
);
assert!(
v.left_column <= c.column && c.column < v.left_column + v.visible_columns,
"[{ctx}] cursor column {} not in horizontal window [{}, {}); viewport={v:?}",
c.column,
v.left_column,
v.left_column + v.visible_columns,
);
}
fn press(kc: KeyCode) -> AppEvent {
AppEvent::Key(KeyEvent {
key: kc,
pressed: true,
modifiers: Modifiers::default(),
text: None,
})
}
// ── operator-over-motion (the `dw`/`c$`/`y0` verbs) ──────────────
fn line0_len(s: &EditorState) -> u32 {
s.buffers.get(s.active).unwrap().line_len_chars(0)
}
#[test]
fn delete_to_line_end_clears_line_and_fills_register() {
let mut s = new_state_with("hello world");
s.apply(&Action::ApplyOperator { op: Operator::Delete, motion: Motion::LineEnd });
assert_eq!(line0_len(&s), 0, "d$ deletes to end of line");
assert_eq!(s.register(), Some("hello world"), "delete fills the register");
assert_eq!(s.cursor(), Position::ZERO, "cursor lands at the range start");
}
#[test]
fn delete_over_right_motion_removes_one_char() {
let mut s = new_state_with("abc");
s.apply(&Action::ApplyOperator { op: Operator::Delete, motion: Motion::Right });
assert_eq!(s.buffers.get(s.active).unwrap().line(0).as_deref(), Some("bc"));
assert_eq!(s.register(), Some("a"));
}
#[test]
fn change_to_line_end_deletes_and_enters_insert() {
let mut s = new_state_with("hello world");
assert_eq!(s.modal.mode(), Mode::Normal);
s.apply(&Action::ApplyOperator { op: Operator::Change, motion: Motion::LineEnd });
assert_eq!(line0_len(&s), 0, "c$ deletes the range");
assert_eq!(s.modal.mode(), Mode::Insert, "change enters Insert to type the replacement");
assert_eq!(s.register(), Some("hello world"), "change fills the register");
}
#[test]
fn yank_to_line_end_fills_register_without_mutating() {
let mut s = new_state_with("hello world");
s.apply(&Action::ApplyOperator { op: Operator::Yank, motion: Motion::LineEnd });
assert_eq!(line0_len(&s), 11, "yank does not mutate the buffer");
assert_eq!(s.register(), Some("hello world"), "yank fills the register");
assert_eq!(s.modal.mode(), Mode::Normal, "yank stays in Normal");
}
#[test]
fn resolve_motion_is_the_shared_target_for_move_and_operator() {
// The encapsulation proof: apply_motion (cursor move) and
// apply_operator (range end) BOTH stand on resolve_motion — so a move
// to LineEnd lands at exactly the position the operator deletes to.
let mut s = new_state_with("hello world");
let target = s.resolve_motion(Position::ZERO, Motion::LineEnd).unwrap();
assert_eq!(target, Position::new(0, 11));
s.apply_motion(Motion::LineEnd);
assert_eq!(s.cursor(), target, "the move path resolves the same target the operator uses");
}
#[test]
fn empty_motion_range_is_a_no_op() {
// An operator over a zero-width motion (cursor already at line start)
// mutates nothing and leaves the register untouched.
let mut s = new_state_with("abc");
s.apply(&Action::ApplyOperator { op: Operator::Delete, motion: Motion::LineStart });
assert_eq!(s.buffers.get(s.active).unwrap().line(0).as_deref(), Some("abc"));
assert_eq!(s.register(), None);
}
#[test]
fn operator_then_motion_composes_through_the_pending_fsm() {
// The full keymap→FSM→engine path: dispatching the `d` operator action
// then a `$` motion composes `d$` via the zenmai operator-pending FSM —
// the operator key alone does nothing until the motion arrives.
let mut s = new_state_with("hello world");
s.apply(&Action::Operator(Operator::Delete));
assert_eq!(line0_len(&s), 11, "the operator key alone mutates nothing");
s.apply(&Action::Move(Motion::LineEnd));
assert_eq!(line0_len(&s), 0, "d then $ composes d$ and deletes the line");
assert_eq!(s.register(), Some("hello world"));
}
#[test]
fn change_operator_through_fsm_enters_insert() {
let mut s = new_state_with("hello world");
s.apply(&Action::Operator(Operator::Change));
s.apply(&Action::Move(Motion::LineEnd));
assert_eq!(s.modal.mode(), Mode::Insert, "c$ deletes and enters Insert");
}
#[test]
fn lone_motion_after_no_operator_just_moves() {
// Without a preceding operator the motion passes through unchanged.
let mut s = new_state_with("hello world");
s.apply(&Action::Move(Motion::LineEnd));
assert_eq!(s.cursor(), Position::new(0, 11));
assert_eq!(line0_len(&s), 11, "a bare motion never mutates");
}
#[test]
fn counted_operator_deletes_count_times() {
// `3d` + a right-motion = `3dl` = delete 3 chars. The operator's count
// flows through the FSM to the composed motion (the bug fix: previously
// the count repeated the operator key and toggled the FSM).
let mut s = new_state_with("abcdef");
s.apply_counted(&Action::Operator(Operator::Delete), 3);
assert_eq!(line0_len(&s), 6, "the operator key alone mutates nothing");
s.apply(&Action::Move(Motion::Right));
assert_eq!(s.buffers.get(s.active).unwrap().line(0).as_deref(), Some("def"));
}
#[test]
fn operator_and_motion_counts_multiply_end_to_end() {
// `2d3l` = delete 2×3 = 6 chars.
let mut s = new_state_with("abcdefgh");
s.apply_counted(&Action::Operator(Operator::Delete), 2);
s.apply_counted(&Action::Move(Motion::Right), 3);
assert_eq!(s.buffers.get(s.active).unwrap().line(0).as_deref(), Some("gh"));
}
#[test]
fn bare_counted_motion_still_repeats_no_regression() {
// `3j` still moves down 3 lines — the count passes through the FSM
// unchanged when no operator is pending.
let mut s = new_state_with("a\nb\nc\nd\ne");
s.apply_counted(&Action::Move(Motion::Down), 3);
assert_eq!(s.cursor().line, 3, "5j-style counted motion preserved");
}
/// A monotonic clock for the key-repeat gate in tests — each `next()`
/// jumps a full second past the previous, so every press it stamps is
/// well outside the 80ms debounce window and therefore an INTENTIONAL
/// press (never a storm tick). Used by tests that fire the *same*
/// navigation key twice and assert editor logic, not debounce timing.
struct SpacedClock(std::time::Instant);
impl SpacedClock {
fn new() -> Self {
Self(std::time::Instant::now())
}
fn next(&mut self) -> std::time::Instant {
self.0 += std::time::Duration::from_secs(1);
self.0
}
}
#[test]
fn hjkl_moves_cursor() {
let mut s = new_state_with("hello\nworld");
s.tick(&press(KeyCode::Char('l')));
assert_eq!(s.cursor().column, 1);
s.tick(&press(KeyCode::Char('j')));
assert_eq!(s.cursor().line, 1);
s.tick(&press(KeyCode::Char('h')));
assert_eq!(s.cursor().column, 0);
}
#[test]
fn insert_mode_inserts_chars() {
let mut s = new_state_with("");
s.tick(&press(KeyCode::Char('i')));
assert_eq!(s.modal.mode(), Mode::Insert);
s.tick(&press(KeyCode::Char('h')));
s.tick(&press(KeyCode::Char('i')));
assert_eq!(s.buffers.get(s.active).unwrap().to_string(), "hi");
assert_eq!(s.cursor().column, 2);
}
#[test]
fn esc_returns_to_normal() {
let mut s = new_state_with("");
s.tick(&press(KeyCode::Char('i')));
s.tick(&press(KeyCode::Escape));
assert_eq!(s.modal.mode(), Mode::Normal);
}
#[test]
fn count_prefix_repeats_motion() {
let mut s = new_state_with("abcdefghij");
s.tick(&press(KeyCode::Char('5')));
s.tick(&press(KeyCode::Char('l')));
assert_eq!(s.cursor().column, 5);
}
#[test]
fn close_event_requests_quit() {
let mut s = new_state_with("");
s.tick(&AppEvent::CloseRequested);
assert!(s.quit_requested);
}
#[test]
fn word_next_jumps_past_whitespace() {
let mut s = new_state_with("foo bar baz");
// Two INTENTIONAL `w` presses, spaced past the key-repeat window so
// the gate passes both (a real user's two taps are ≥80ms apart).
let mut clk = SpacedClock::new();
s.tick_at(&press(KeyCode::Char('w')), clk.next());
assert_eq!(s.cursor().column, 4);
s.tick_at(&press(KeyCode::Char('w')), clk.next());
assert_eq!(s.cursor().column, 8);
}
// ── Multi-key / leader pending-stroke ───────────────────────────
#[test]
fn leader_sequence_holds_then_resolves() {
let mut s = new_state_with("a\nbb\nccc");
s.keymap.bind_sequence(
Mode::Normal,
vec![Key::Char(','), Key::Char('g')],
Action::Move(Motion::DocEnd),
"doc end",
);
// `,` begins the sequence — held pending, nothing applied yet.
s.on_key(&Key::Char(','));
assert_eq!(s.pending_keys, vec![Key::Char(',')]);
assert_eq!(s.cursor(), Position::ZERO);
// `g` completes `<leader>g` → DocEnd; pending clears.
s.on_key(&Key::Char('g'));
assert!(s.pending_keys.is_empty());
assert_eq!(s.cursor().line, 2);
}
#[test]
fn two_key_gg_jumps_doc_start() {
let mut s = new_state_with("a\nbb\nccc");
s.keymap.bind_sequence(
Mode::Normal,
vec![Key::Char('g'), Key::Char('g')],
Action::Move(Motion::DocStart),
"doc start",
);
let mut clk = SpacedClock::new();
s.tick_at(&press(KeyCode::Char('j')), clk.next());
s.tick_at(&press(KeyCode::Char('j')), clk.next());
assert_eq!(s.cursor().line, 2);
s.on_key(&Key::Char('g')); // pending
assert_eq!(s.pending_keys, vec![Key::Char('g')]);
s.on_key(&Key::Char('g')); // resolve
assert_eq!(s.cursor(), Position::ZERO);
}
#[test]
fn broken_sequence_aborts_and_clears_pending() {
let mut s = new_state_with("hello");
s.keymap.bind_sequence(
Mode::Normal,
vec![Key::Char('g'), Key::Char('g')],
Action::Move(Motion::DocEnd),
"doc end",
);
s.on_key(&Key::Char('g')); // pending [g]
assert_eq!(s.pending_keys, vec![Key::Char('g')]);
s.on_key(&Key::Char('x')); // breaks gg → abort; x is unbound → no-op
assert!(s.pending_keys.is_empty());
assert_eq!(s.cursor(), Position::ZERO);
}
#[test]
fn single_binding_wins_over_sequence_prefix() {
// A key that is BOTH a complete single binding and the start of
// a sequence fires the single binding immediately (no chord
// timeout needed). Here `h` (move-left) also prefixes `hz`.
let mut s = new_state_with("abcde");
let mut clk = SpacedClock::new();
s.tick_at(&press(KeyCode::Char('l')), clk.next());
s.tick_at(&press(KeyCode::Char('l')), clk.next());
assert_eq!(s.cursor().column, 2);
s.keymap.bind_sequence(
Mode::Normal,
vec![Key::Char('h'), Key::Char('z')],
Action::Move(Motion::DocEnd),
"shadowed",
);
s.on_key(&Key::Char('h'));
assert!(s.pending_keys.is_empty(), "single binding should not pend");
assert_eq!(s.cursor().column, 1, "h moved left immediately");
}
// ── tatara-lisp runtime bridge (imperative programmability) ─────
#[test]
fn lisp_set_option_writes_live_options() {
let mut s = new_state_with("");
s.run_lisp(r#"(set-option "number" "true")"#).unwrap();
assert_eq!(s.options.get("number").map(String::as_str), Some("true"));
}
#[test]
fn lisp_insert_modifies_buffer_and_advances_cursor() {
let mut s = new_state_with("");
s.run_lisp(r#"(insert "abc")"#).unwrap();
assert_eq!(s.buffers.get(s.active).unwrap().to_string(), "abc");
assert_eq!(s.cursor(), Position::new(0, 3));
}
#[test]
fn lisp_message_appends_to_messages() {
let mut s = new_state_with("");
s.run_lisp(r#"(message "hello from lisp")"#).unwrap();
assert_eq!(s.messages, vec!["hello from lisp".to_string()]);
}
#[test]
fn lisp_reads_snapshot_and_branches_to_effect() {
// Genuine programmability: Lisp reads the live cursor line and
// an `if` decides which option to set.
let mut s = new_state_with("one\ntwo\nthree");
// cursor at line 0 → "top" branch
s.run_lisp(r#"(if (= (cursor-line) 0) (set-option "pos" "top") (set-option "pos" "mid"))"#)
.unwrap();
assert_eq!(s.options.get("pos").map(String::as_str), Some("top"));
}
#[test]
fn lisp_run_command_effect_drives_registry() {
// `(run-command "undo")` reaches the live command registry and
// reverts a prior Lisp-driven insert — proving the RunCommand
// effect dispatches through real editor commands.
let mut s = new_state_with("");
s.run_lisp(r#"(insert "abc")"#).unwrap();
assert_eq!(s.buffers.get(s.active).unwrap().to_string(), "abc");
s.run_lisp(r#"(run-command "undo")"#).unwrap();
assert_eq!(s.buffers.get(s.active).unwrap().to_string(), "");
}
#[test]
fn lisp_run_command_quit_sets_quit_requested_via_typed_flag() {
// The full imperative-quit path: (run-command "quit") routes
// through the registry's typed `quit_requested` signal — no string
// sentinel, and no minibuffer pollution (the editor stays in a
// clean Normal state, which has no minibuffer at all).
let mut s = new_state_with("");
s.run_lisp(r#"(run-command "quit")"#).unwrap();
assert!(s.quit_requested, "lisp-driven quit must set quit_requested");
assert_eq!(
s.modal.minibuffer(),
"",
"quit must not pollute any command line — Normal mode has no minibuffer",
);
}
// ── Lazy plugin activation (PluginHost) ────────────────────────
#[test]
fn lazy_plugin_activates_on_command_trigger() {
// A user plugin gated on `Command: LazyGo` has its entry applied
// the first time that command runs — proving the lazy.nvim
// `cmd =` model works end-to-end against live editor state.
let mut s = new_state_with("");
s.register_lazy_plugin(
"user-lazy",
vec![LazyTrigger::Command("LazyGo".into())],
r#"(defoption :name "lazy-loaded" :value "yes")
(defcmd :name "LazyGo" :description "noop" :action "editor.noop")"#,
);
assert_eq!(s.plugin_host.pending(), 1);
assert!(s.options.get("lazy-loaded").is_none(), "entry not applied yet");
// Drive the command through the public imperative path.
s.run_lisp(r#"(run-command "LazyGo")"#).unwrap();
assert_eq!(
s.options.get("lazy-loaded").map(String::as_str),
Some("yes"),
"the command trigger applied the plugin's entry",
);
assert_eq!(s.plugin_host.pending(), 0, "plugin activated exactly once");
}
#[test]
fn lazy_plugin_activates_on_filetype() {
let mut s = new_state_with("");
s.register_lazy_plugin(
"user-rust",
vec![LazyTrigger::FileType("rust".into())],
r#"(defoption :name "rust-plugin" :value "on")"#,
);
let n = s.activate_filetype_plugins("rust");
assert_eq!(n, 1);
assert_eq!(s.options.get("rust-plugin").map(String::as_str), Some("on"));
// A second open of the same filetype is a no-op (one-shot).
assert_eq!(s.activate_filetype_plugins("rust"), 0);
}
#[test]
fn cached_vm_serves_multiple_run_lisp_calls() {
let mut s = new_state_with("");
s.run_lisp(r#"(message "one")"#).unwrap();
assert!(s.lisp_vm.is_some(), "VM should be cached after first run_lisp");
s.run_lisp(r#"(message "two")"#).unwrap();
assert_eq!(s.messages, vec!["one".to_string(), "two".to_string()]);
}
#[test]
fn lisp_define_persists_across_run_lisp_calls() {
// The cached VM's top-level env persists across calls (REPL
// semantics): a `define` in one call is visible in the next.
let mut s = new_state_with("");
s.run_lisp(r#"(define greeting "hi")"#).unwrap();
s.run_lisp(r#"(message greeting)"#).unwrap();
assert_eq!(s.messages, vec!["hi".to_string()]);
}
#[test]
fn snapshot_is_isolated_within_one_run_lisp_call_and_refreshes_across() {
// Within ONE call a program cannot observe its own writes — the
// read snapshot is captured before eval, effects apply after. A
// later call sees the refreshed snapshot.
let mut s = new_state_with("");
s.run_lisp(
r#"(insert "ab") (set-option "col" (if (= (cursor-column) 0) "stale-zero" "live"))"#,
)
.unwrap();
assert_eq!(s.buffers.get(s.active).unwrap().to_string(), "ab");
assert_eq!(
s.options.get("col").map(String::as_str),
Some("stale-zero"),
"cursor-column within the same call reads the pre-eval snapshot",
);
// After the first call the cursor advanced to column 2; the next
// call's snapshot reflects it.
s.run_lisp(
r#"(set-option "col2" (if (= (cursor-column) 2) "live-two" "other"))"#,
)
.unwrap();
assert_eq!(
s.options.get("col2").map(String::as_str),
Some("live-two"),
"a later call sees the refreshed snapshot",
);
}
#[test]
fn insert_text_effect_multiline_lands_cursor_on_last_line() {
let mut s = new_state_with("");
s.apply_host_effects(vec![HostEffect::InsertText("foo\nbar".to_string())]);
assert_eq!(s.buffers.get(s.active).unwrap().to_string(), "foo\nbar");
assert_eq!(s.cursor(), Position::new(1, 3));
}
#[test]
fn visual_mode_sequence_resolves() {
let mut s = new_state_with("abc");
s.modal.enter(Mode::Visual);
s.keymap.bind_sequence(
Mode::Visual,
vec![Key::Char('g'), Key::Char('e')],
Action::Move(Motion::DocEnd),
"ge",
);
s.on_key(&Key::Char('g'));
assert_eq!(s.pending_keys, vec![Key::Char('g')]);
s.on_key(&Key::Char('e'));
assert!(s.pending_keys.is_empty());
assert_eq!(s.cursor().column, 3, "ge resolved to doc-end in visual mode");
}
#[test]
fn sequence_abort_with_bound_breaking_key_redispatches() {
// gg is a sequence; `l` (move-right) is a bound single key. After
// `g` pends, `l` breaks gg, aborts, and is re-dispatched fresh.
let mut s = new_state_with("abcde");
s.keymap.bind_sequence(
Mode::Normal,
vec![Key::Char('g'), Key::Char('g')],
Action::Move(Motion::DocEnd),
"gg",
);
s.on_key(&Key::Char('g'));
assert_eq!(s.pending_keys, vec![Key::Char('g')]);
s.on_key(&Key::Char('l'));
assert!(s.pending_keys.is_empty());
assert_eq!(
s.cursor().column, 1,
"the breaking key l should re-dispatch as move-right",
);
}
// ── Viewport-follows-cursor invariant (both axes) ───────────────
#[test]
fn viewport_contains_cursor_after_every_op() {
// Tiny window: 5 visible lines × 10 visible columns. Drive a
// representative scripted sequence and assert the viewport contains
// the cursor after EVERY mutating step.
let mut s = new_state_small_viewport("", 5, 10);
assert_cursor_in_viewport(&s, "initial");
// Enter insert mode and type 30 newline-separated lines — this is
// the exact "type past the bottom" complaint.
s.tick(&press(KeyCode::Char('i')));
assert_eq!(s.modal.mode(), Mode::Insert);
for line in 0..30u32 {
for c in "line".chars() {
s.tick(&press(KeyCode::Char(c)));
assert_cursor_in_viewport(&s, "typing chars");
}
s.tick(&press(KeyCode::Enter));
assert_cursor_in_viewport(&s, &format!("newline after line {line}"));
}
// Type a long (200-char) line — the "type past the right edge"
// complaint. The cursor must stay horizontally visible the whole way.
for i in 0..200u32 {
s.tick(&press(KeyCode::Char('x')));
assert_cursor_in_viewport(&s, &format!("long-line char {i}"));
}
// Multi-line insert_text effect (the `(insert …)` Lisp path).
s.insert_text("alpha\nbeta\ngamma delta epsilon zeta");
assert_cursor_in_viewport(&s, "insert_text multiline");
// Back to normal mode and move in all directions / to extremes.
s.tick(&press(KeyCode::Escape));
assert_eq!(s.modal.mode(), Mode::Normal);
for m in [
Motion::DocStart,
Motion::DocEnd,
Motion::Down,
Motion::Down,
Motion::Up,
Motion::Right,
Motion::Right,
Motion::Left,
Motion::LineEnd,
Motion::LineStart,
Motion::GotoLine(1),
Motion::GotoLine(40),
Motion::PageDown,
Motion::PageUp,
] {
s.apply_motion(m);
assert_cursor_in_viewport(&s, &format!("after motion {m:?}"));
}
// Undo many times — the buffer shrinks; the viewport must re-follow
// the (now clamped) cursor.
for i in 0..50u32 {
s.apply(&Action::Undo);
assert_cursor_in_viewport(&s, &format!("undo {i}"));
}
// Redo back up.
for i in 0..50u32 {
s.apply(&Action::Redo);
assert_cursor_in_viewport(&s, &format!("redo {i}"));
}
}
#[test]
fn insert_at_eof_keeps_cursor_in_bounds() {
// Inserting at the end of the buffer must leave the cursor clamped
// to a valid position (and inside the viewport).
let mut s = new_state_small_viewport("abc", 5, 10);
s.apply_motion(Motion::DocEnd);
s.tick(&press(KeyCode::Char('i')));
s.tick(&press(KeyCode::Char('d')));
let buf = s.buffers.get(s.active).unwrap();
let clamped = buf.clamp(s.cursor());
assert_eq!(s.cursor(), clamped, "cursor must be clamped in-bounds at EOF");
assert_cursor_in_viewport(&s, "insert at eof");
}
#[test]
fn count_prefix_then_sequence_repeats() {
// `2` then `gj` (→ move-down) repeats the resolved action twice.
let mut s = new_state_with("a\nb\nc\nd\ne");
s.keymap.bind_sequence(
Mode::Normal,
vec![Key::Char('g'), Key::Char('j')],
Action::Move(Motion::Down),
"gj",
);
s.on_key(&Key::Char('2'));
s.on_key(&Key::Char('g'));
s.on_key(&Key::Char('j'));
assert_eq!(s.cursor().line, 2, "count 2 should repeat the gj motion");
}
// ── Key-repeat gate (awase::KeyRepeatGate) ──────────────────────────
#[test]
fn held_key_repeat_storm_is_debounced_in_normal_mode() {
// The audit's exact complaint: holding `j` floods motion events
// and thrashes the viewport. Simulate an OS key-repeat storm — 20
// identical `j` KeyDowns at 50ms intervals (typical repeat cadence)
// — and assert only the gated subset (one per 80ms window) actually
// moves the cursor.
let mut s = new_state_with(&"x\n".repeat(40));
let t0 = std::time::Instant::now();
let mut delivered = 0u32;
for i in 0..20u32 {
let before = s.cursor().line;
s.tick_at(
&press(KeyCode::Char('j')),
t0 + std::time::Duration::from_millis(u64::from(i) * 50),
);
if s.cursor().line != before {
delivered += 1;
}
}
// 20 events over ~1s at 50ms spacing, 80ms gate ⇒ ~13 pass — far
// fewer than the 20 the ungated path would have applied.
assert!(
(10..=14).contains(&delivered),
"expected the storm debounced to ~13 moves, got {delivered}",
);
assert!(
delivered < 20,
"the gate must drop SOME storm ticks, not pass all 20",
);
}
#[test]
fn spaced_intentional_taps_all_pass() {
// Intentional taps spaced past the debounce window must ALL reach
// the editor — the gate filters storms, never deliberate input.
let mut s = new_state_with(&"x\n".repeat(10));
let t0 = std::time::Instant::now();
for i in 0..5u32 {
s.tick_at(
&press(KeyCode::Char('j')),
// 100ms apart — comfortably past the 80ms window.
t0 + std::time::Duration::from_millis(u64::from(i) * 100),
);
}
assert_eq!(s.cursor().line, 5, "all 5 spaced `j` taps moved the cursor");
}
#[test]
fn distinct_keys_have_independent_clocks() {
// Holding `j` must not block a simultaneous `l` — the gate keys on
// the Key, so independent keys have independent windows.
let mut s = new_state_with("abc\ndef\nghi");
let t = std::time::Instant::now();
s.tick_at(&press(KeyCode::Char('j')), t);
// `j` again within the window is dropped…
s.tick_at(&press(KeyCode::Char('j')), t + std::time::Duration::from_millis(10));
assert_eq!(s.cursor().line, 1, "second `j` within window dropped");
// …but `l` at the same instant passes (its own clock).
s.tick_at(&press(KeyCode::Char('l')), t + std::time::Duration::from_millis(10));
assert_eq!(s.cursor().column, 1, "`l` is not blocked by `j`'s clock");
}
// ── Cursors newtype is the single cursor home ──────────────────────
#[test]
fn cursor_home_preserves_single_cursor_behavior() {
// The typed `Cursors` wrapper behaves exactly like the old bare
// `Position` field for single-cursor editing: the read accessor
// tracks every mutation routed through `set_cursor`, and there is
// exactly one caret.
let mut s = new_state_with("hello\nworld\nthere");
assert_eq!(s.cursor(), Position::ZERO);
assert_eq!(s.cursors.count(), 1, "phase-1 holds exactly one caret");
s.apply_motion(Motion::Down);
s.apply_motion(Motion::Right);
s.apply_motion(Motion::Right);
assert_eq!(s.cursor(), Position::new(1, 2));
// Still a single caret after a sequence of motions.
assert_eq!(s.cursors.count(), 1);
// The accessor is the SAME value the viewport-follow path read.
let w = s.layout.active_window().unwrap();
assert!(w.viewport.top_line <= s.cursor().line);
}
#[test]
fn insert_mode_is_ungated_so_repeat_typing_works() {
// Holding a key to repeat-type a character is intended in Insert
// mode — the gate must NOT suppress it. 10 rapid identical `x`
// keystrokes at the same instant must all land as text.
let mut s = new_state_with("");
s.tick(&press(KeyCode::Char('i')));
assert_eq!(s.modal.mode(), Mode::Insert);
let t = std::time::Instant::now();
for _ in 0..10 {
s.tick_at(&press(KeyCode::Char('x')), t);
}
assert_eq!(
s.buffers.get(s.active).unwrap().to_string(),
"xxxxxxxxxx",
"insert-mode repeat typing is ungated",
);
}
}