Merge text0

[?]

Sep 16, 2023, 7:13 AM

OV6FE23R76E357CRUDGHKSXYF5N3KO5NE62QL6OECX5SV3V4JCYQC

Dependencies

[2] UFOVVX3Z Merge text0
[3] 2VWG2Z47 Merge text0
[4] 4L3UAM75 experiment: knob for readonly editor
[5] TWVSI3F2 Merge text0
[6] M5JXTW56 Merge text.love
[7] X3F7ECSL add state arg to some functions
[8] SW7BSBMJ several bugfixes in saving/loading cursor position
[9] APYPFFS3 call edit rather than App callbacks in tests
[10] 2CK5QI7W make love event names consistent
[11] QCPXQ2E3 add state arg to a few functions
[12] OGD5RAQK bugfix: naming points in drawings
[13] 3PSFWAIL Merge lines.love
[14] 4KC7I3E2 make colors easier to edit
[15] WJBZZQE4 fold together two largely similar cases
[16] PV2YA7KS subsection headings in a long switch
[17] LF7BWEG4 group all editor globals
[18] PP2IIHL6 stop putting button state in a global
[19] ELJNEPW2 simplify cursor-on-screen check
[20] KYNGDE2C consistent names in a few more places
[21] 5UKUADTW distinguish consistently between mouse buttons and other buttons
[22] 4NUCYNB4 Merge text0
[23] TGHAJBES use line cache for drawings as well
[24] AF253GHL bugfix
[25] SPSW74Y5 add state arg to Text.keychord_pressed
[26] FPY4LO2W make a few names consistent with snake_case
[27] U3MJNFUY Merge lines.love
[28] GZ2OYPSH configurable colors and cursor in editor widget
[29] 3IQ2RK7B Merge text0
[30] 6ECYOEHY bugfix: obsolete location for attribute
[31] 36Z442IV back to commit 8123959e52f without code editing
[32] VZJHGWSP Merge lines.love
[33] 4EGQRXDA bugfix: naming points
[34] 5ZA3BRNY add state arg to a few functions
[35] 34BZ5ZKN Merge lines.love
[36] R2ASHK5C fix a bad merge
[37] 6XCJX4DZ bugfix: inscript's bug
[38] PTDO2SOT add state arg to schedule_save
[39] 32V6ZHQB Merge lines.love
[40] 3XNFQDDN Merge lines.love
[41] WS436426 Merge text0
[42] MUJTM6RE bring back a level of wrapping
[43] 7VGDIPLC more robust state validation
[44] MD3W5IRA new fork: rip out drawing support
[45] LDFXFRUO bring a few things in sync between run and source
[46] MU2HIRR6 Merge lines.love
[47] 2L5MEZV3 experiment: new edit namespace
[48] ONHKBLLC Merge lines.love
[49] NVSC4N4K change a helper slightly
[50] 5BMR5HRT click to the left of a line
[51] IFTYOERM line.y -> line_cache.starty in a few more places
[52] LNUHQOGH start passing in Editor_state explicitly

Change contents

edit in edit.lua at line 103

[7.4219]→[7.4378:4423](∅→∅),[7.4219]→[7.4378:4423](∅→∅),[7.1400]→[4.935:983](∅→∅),[7.1400]→[4.935:983](∅→∅),[7.551]→[4.888:934](∅→∅),[7.551]→[4.888:934](∅→∅),[7.13403]→[4.841:887](∅→∅),[7.13403]→[4.841:887](∅→∅),[7.12717]→[4.794:840](∅→∅),[7.12717]→[4.794:840](∅→∅),[7.36]→[4.747:793](∅→∅),[7.36]→[4.747:793](∅→∅),[7.10343]→[4.640:746](∅→∅),[7.10343]→[4.640:746](∅→∅),[7.2117]→[4.612:639](∅→∅),[7.2117]→[4.612:639](∅→∅),[7.9696]→[4.566:611](∅→∅),[7.9696]→[4.566:611](∅→∅),[7.5853]→[2.257:344](∅→∅),[7.5853]→[2.257:344](∅→∅),[7.7264]→[7.234:258](∅→∅),[7.7264]→[7.234:258](∅→∅),[7.6627]→[7.159:183](∅→∅),[7.6627]→[7.159:183](∅→∅),[7.157]→[5.15:15](∅→∅),[7.157]→[5.15:15](∅→∅),[7.258]→[7.126:157](∅→∅),[7.258]→[7.126:157](∅→∅),[7.4618]→[7.125:125](∅→∅),[7.4618]→[7.125:125](∅→∅),[7.123]→[7.4587:4618](∅→∅),[7.7075]→[7.4587:4618](∅→∅),[7.123]→[7.4587:4618](∅→∅),[7.7075]→[7.4587:4618](∅→∅),[7.7075]→[7.99:123](∅→∅),[7.7075]→[7.99:123](∅→∅),[7.4586]→[7.98:98](∅→∅),[7.4586]→[7.98:98](∅→∅),[7.96]→[7.4555:4586](∅→∅),[7.6891]→[7.4555:4586](∅→∅),[7.96]→[7.4555:4586](∅→∅),[7.6891]→[7.4555:4586](∅→∅),[7.6891]→[7.72:96](∅→∅),[7.6891]→[7.72:96](∅→∅),[7.183]→[7.40:71](∅→∅),[7.183]→[7.40:71](∅→∅),[7.17]→[7.642:816](∅→∅),[3.40]→[7.642:816](∅→∅),[7.1023]→[7.642:816](∅→∅),[7.1023]→[7.642:816](∅→∅),[7.63]→[3.40:40](∅→∅),[7.63]→[3.40:40](∅→∅),[3.38]→[7.20:63](∅→∅),[7.795]→[7.20:63](∅→∅),[7.795]→[7.20:63](∅→∅),[7.795]→[7.20:63](∅→∅),[7.795]→[3.14:38](∅→∅),[7.795]→[3.14:38](∅→∅),[7.795]→[3.14:38](∅→∅),[7.4522]→[7.39:39](∅→∅),[7.4522]→[7.39:39](∅→∅),[7.37]→[7.4491:4522](∅→∅),[7.6430]→[7.4491:4522](∅→∅),[7.37]→[7.4491:4522](∅→∅),[7.6430]→[7.4491:4522](∅→∅),[7.6430]→[7.13:37](∅→∅),[7.6430]→[7.13:37](∅→∅)

Text.draw_search_bar(State, hide_cursor)
Text.keychord_press(State, chord, readonly)
elseif not readonly and chord == 'C-v' then
elseif not readonly and chord == 'C-x' then
elseif not readonly and chord == 'C-y' then
elseif not readonly and chord == 'C-z' then
function edit.keychord_press(State, chord, key, readonly)
if not readonly and State.selection1.line and
elseif not readonly then
function edit.text_input(State, t, readonly)
y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor)
edit.update(State, 0)
edit.update(State, 0)

edit.draw(State, Text_color)

edit.draw(State, Text_color)
edit.update(State, 0)

edit.draw(State, Text_color)
edit.update(State, 0)
edit.draw(State, Text_color)
if #State.lines ~= #State.line_cache then
print(('line_cache is out of date; %d when it should be %d'):format(#State.line_cache, #State.lines))
assert(false)
end

function edit.draw(State, fg, hide_cursor)
-- return y drawn until

edit.draw(State, Text_color)
edit.update(State, 0)
replacement in edit.lua at line 106

[7.58]→[7.58:108](∅→∅)

function edit.draw(State)
App.color(Text_color)

[7.58]

[7.108]

function edit.draw(State, fg, hide_cursor)
replacement in edit.lua at line 130

[7.1000]→[7.1000:1070](∅→∅)

y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos)

[7.1000]

[7.1070]

y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor)
replacement in edit.lua at line 135

[7.1169]→[7.1169:1201](∅→∅)

Text.draw_search_bar(State)

[7.1169]

[7.1201]

Text.draw_search_bar(State, hide_cursor)
replacement in edit.lua at line 251

[7.5117]→[7.5117:5152](∅→∅)

function edit.text_input(State, t)

[7.5117]

[7.5152]

function edit.text_input(State, t, readonly)
replacement in edit.lua at line 256

[7.5282]→[7.5282:5289](∅→∅)

else

[7.5282]

[7.5289]

elseif not readonly then
replacement in edit.lua at line 263

[7.5460]→[7.5460:5539](∅→∅)

function edit.keychord_press(State, chord, key)
if State.selection1.line and

[7.5460]

[7.5539]

function edit.keychord_press(State, chord, key, readonly)
if not readonly and State.selection1.line and
replacement in edit.lua at line 312

[7.7575]→[7.7575:7604](∅→∅)

elseif chord == 'C-z' then

[7.7575]

[7.7604]

elseif not readonly and chord == 'C-z' then
replacement in edit.lua at line 326

[7.8198]→[7.8198:8227](∅→∅)

elseif chord == 'C-y' then

[7.8198]

[7.8227]

elseif not readonly and chord == 'C-y' then
replacement in edit.lua at line 348

[7.9035]→[7.9035:9064](∅→∅)

elseif chord == 'C-x' then

[7.9035]

[7.9064]

elseif not readonly and chord == 'C-x' then
replacement in edit.lua at line 355

[7.9310]→[7.9310:9339](∅→∅)

elseif chord == 'C-v' then

[7.9310]

[7.9339]

elseif not readonly and chord == 'C-v' then
replacement in edit.lua at line 378

[7.10318]→[7.10318:10356](∅→∅)

Text.keychord_press(State, chord)

[7.10318]

[7.10356]

Text.keychord_press(State, chord, readonly)
replacement in edit.lua at line 416

[7.11416]→[7.11416:11435](∅→∅)

edit.draw(State)

[7.11416]

[7.11435]

edit.draw(State, Text_color)
replacement in edit.lua at line 425

[7.11638]→[7.11638:11657](∅→∅)

edit.draw(State)

[7.11638]

[7.11657]

edit.draw(State, Text_color)
replacement in edit.lua at line 435

[7.11953]→[7.11953:11972](∅→∅)

edit.draw(State)

[7.11953]

[7.11972]

edit.draw(State, Text_color)
replacement in edit.lua at line 443

[7.12177]→[7.12177:12196](∅→∅)

edit.draw(State)

[7.12177]

[7.12196]

edit.draw(State, Text_color)
replacement in edit.lua at line 451

[7.12407]→[7.12407:12426](∅→∅)

edit.draw(State)

[7.12407]

[7.12426]

edit.draw(State, Text_color)