From b755631561fd1a9223effcc833e2c8201582f63d Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 19 Jun 2017 11:19:21 -0700 Subject: 3926 Bugfix: when you hit `enter`, the cursor-row does not increment in *one* special situation: when the line wraps and the cursor is right at the start of one of the wrapped lines. --- sandbox/002-typing.mu | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) (limited to 'sandbox') diff --git a/sandbox/002-typing.mu b/sandbox/002-typing.mu index c6c8edd5..041a6421 100644 --- a/sandbox/002-typing.mu +++ b/sandbox/002-typing.mu @@ -874,12 +874,16 @@ def insert-new-line-and-indent editor:&:editor, screen:&:screen -> editor:&:edit left:num <- get *editor, left:offset right:num <- get *editor, right:offset screen-height:num <- screen-height screen + at-start-of-wrapped-line?:bool <- at-start-of-wrapped-line? editor # insert newline insert 10/newline, before-cursor before-cursor <- next before-cursor *editor <- put *editor, before-cursor:offset, before-cursor - cursor-row <- add cursor-row, 1 - *editor <- put *editor, cursor-row:offset, cursor-row + { + break-if at-start-of-wrapped-line? + cursor-row <- add cursor-row, 1 + *editor <- put *editor, cursor-row:offset, cursor-row + } cursor-column <- copy left *editor <- put *editor, cursor-column:offset, cursor-column # maybe scroll @@ -906,6 +910,24 @@ def insert-new-line-and-indent editor:&:editor, screen:&:screen -> editor:&:edit } ] +def at-start-of-wrapped-line? editor:&:editor -> result:bool [ + local-scope + load-ingredients + left:num <- get *editor, left:offset + cursor-column:num <- get *editor, cursor-column:offset + cursor-at-left?:bool <- equal cursor-column, left + return-unless cursor-at-left?, 0/false + before-cursor:&:duplex-list:char <- get *editor, before-cursor:offset + before-before-cursor:&:duplex-list:char <- prev before-cursor + return-unless before-before-cursor, 0/false # cursor is at start of editor + char-before-cursor:char <- get *before-cursor, value:offset + cursor-after-newline?:bool <- equal char-before-cursor, 10/newline + return-if cursor-after-newline?, 0/false + # if cursor is at left margin and not at start, but previous character is not a newline, + # then we're at start of a wrapped line + return 1/true +] + # takes a pointer 'curr' into the doubly-linked list and its sentinel, counts # the number of spaces at the start of the line containing 'curr'. def line-indent curr:&:duplex-list:char, start:&:duplex-list:char -> result:num [ @@ -986,6 +1008,39 @@ scenario editor-clears-previous-line-completely-after-inserting-newline [ ] ] +scenario editor-splits-wrapped-line-after-inserting-newline [ + local-scope + assume-screen 10/width, 5/height + e:&:editor <- new-editor [abcdef], 0/left, 5/right + editor-render screen, e + screen-should-contain [ + . . + .abcd↩ . + .ef . + .┈┈┈┈┈ . + . . + ] + assume-console [ + left-click 2, 0 + press enter + ] + run [ + editor-event-loop screen, console, e + 10:num/raw <- get *e, cursor-row:offset + 11:num/raw <- get *e, cursor-column:offset + ] + screen-should-contain [ + . . + .abcd . + .ef . + .┈┈┈┈┈ . + ] + memory-should-contain [ + 10 <- 2 # cursor-row + 11 <- 0 # cursor-column + ] +] + scenario editor-inserts-indent-after-newline [ local-scope assume-screen 10/width, 10/height -- cgit 1.4.1-2-gfad0 qual.subx.html?h=hlt&id=104e521c04d1a0cad9c68fb11e250e12ad8917ef'>104e521c ^ 
ec73ed12 ^

ce2c1efc ^


104e521c ^


ac07e589 ^

104e521c ^


ac07e589 ^


08a0eed6 ^

14a38052 ^

3350c34a ^

ac07e589 ^

3350c34a ^


ce2c1efc ^

3350c34a ^

d3a9db3a ^

3350c34a ^

ac07e589 ^

104e521c ^
















ce2c1efc ^

104e521c ^
















762107fd ^

104e521c ^

9a777801 ^

104e521c ^


14a38052 ^



d1c9392a ^

3350c34a ^





























































86351aaf ^

3350c34a ^



























































































































































































104e521c ^




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