Merge text.love

[?]

Mar 26, 2023, 4:59 PM

Q6RXCILQD7PV6XI44VJSLQZD3DHWOXTNIU5BFTEHHLBWDRQI4CVAC

Dependencies

[2] YMKVHKZR Merge text.love
[3] REAIVN7W Merge lines.love
[4] 36Z442IV back to commit 8123959e52f without code editing
[5] R56CKHYZ Merge text.love
[6] KKMFQDR4 editing source code from within the app
[7] MQTFTTEK Merge lines.love
[8] ORRSP7FV deduce test names on failures
[9] T4FRZSYL delete an ancient, unused file
[10] K2X6G75Z start writing some tests for drawings
[11] XX7G2FFJ intermingle freehand line drawings with text
[12] 2CTN2IEF Merge lines.love
[13] KMSL74GA support selections in the source editor
[14] BLWAYPKV extract a module
[15] ZTZOO2OQ Merge lines.love
[16] MD3W5IRA new fork: rip out drawing support
[17] 2L5MEZV3 experiment: new edit namespace
[18] ETXNVRPT Merge lines.love
[19] LF7BWEG4 group all editor globals
[20] VP5KC4XZ Merge lines.love
[21] C3GUE45I Merge text.love
[22] VOU73AK6 Merge lines.love
[23] VZJHGWSP Merge lines.love
[24] R5QXEHUI somebody stop me
[25] VHQCNMAR several more modules
[26] OGUV4HSA remove some memory leaks from rendered fragments
[27] TRSYJH2Z Merge text.love
[28] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[29] RSZD5A7G forgot to add json.lua
[30] FS2ITYYH record a known issue
[31] VXORMHME delete experimental REPL
[32] 2TQUKHBC Merge lines.love
[33] AF253GHL bugfix
[34] CE4LZV4T drop last couple of manual tests
[35] A4BSGS2C Merge lines.love
[36] D2GCFTTT clean up repl functionality
[37] EX43CDDI Merge text.love
[38] THRPA4VV Merge text.love
[39] OWPI7Y4Q Merge text.love
[40] 5Y24ZDZI bugfix
[41] TLOAPLBJ add a license
[42] UAYCSFSK Merge text.love
[43] 3QNOKBFM beginnings of a test harness
[44] L6XA5EY2 test: moving a point
[45] GUOQRUL7 Merge lines.love
[46] ECBDENZ4 Merge text.love
[47] 3G723RV5 Merge text.love
[48] TVCPXAAU rename
[49] U3MJNFUY Merge lines.love
[50] Y5XAFGMW Merge text.love
[51] MU2HIRR6 Merge lines.love
[52] Q7XPSKII Merge lines.love
[53] LXFHXL2N Merge text.love
[54] BULPIBEG beginnings of a module for the text editor
[55] RXNR3U5E Merge text.love
[56] 5YXILO7X Merge text.love
[57] 4U4VQWNY Merge lines.love
[58] 4YDBYBA4 clean up memory leak experiments
[59] K74U4BAU Merge lines.love
[60] OTIBCAUJ love2d scaffold
[61] AVTNUQYR basic test-enabled framework
[62] VHUNJHXB Merge lines.love
[63] 66X36NZN a little more prose describing manual_tests
[64] ORKN6EOB Merge lines.love
[65] LXTTOB33 extract a couple of files
[66] 7VGDIPLC more robust state validation
[67] 4EGQRXDA bugfix: naming points
[68] 4SR3Z4Y3 document the version of LÖVE I've been using
[69] 73OCE2MC after much struggle, a brute-force undo
[70] 3PSFWAIL Merge lines.love
[71] 6LJZN727 handle chords
[72] JOPVPUSA editing source code from within the app

Change contents

file deletion: drawing_tests.lua (----------)drawing_tests.lua (----------)

[4.2]→[4.1534:1575](∅→∅),[4.2]→[4.1534:1575](∅→∅),[4.1575]→[4.15:15](∅→∅)

-- create a drawing with a line
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
Editor_state = edit.initialize_test_state()
Editor_state.filename = 'foo'
Editor_state.lines = load_array{'```lines', '```', ''}
Text.redraw_all(Editor_state)
edit.check_locs(Editor_state)
Editor_state.current_drawing_mode = 'line'
edit.draw(Editor_state)
-- draw a line
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
local drawing = Editor_state.lines[1]
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
check_eq(#drawing.points, 2, 'baseline/#points')
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
local p1 = drawing.points[drawing.shapes[1].p1]
local p2 = drawing.points[drawing.shapes[1].p2]
check_eq(p1.x, 5, 'baseline/p1:x')
check_eq(p1.y, 6, 'baseline/p1:y')
check_eq(p2.x, 35, 'baseline/p2:x')
check_eq(p2.y, 36, 'baseline/p2:y')
check_nil(p2.name, 'baseline/p2:name')
-- enter 'name' mode without moving the mouse
edit.run_after_keychord(Editor_state, 'C-n')
check_eq(Editor_state.current_drawing_mode, 'name', 'mode:1')
end

function test_move_point()
-- create a drawing with a line
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
Editor_state = edit.initialize_test_state()
Editor_state.filename = 'foo'
Editor_state.lines = load_array{'```lines', '```', ''}
Text.redraw_all(Editor_state)
Editor_state.current_drawing_mode = 'line'
edit.draw(Editor_state)
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
local drawing = Editor_state.lines[1]

check_eq(#drawing.shapes, 1, 'baseline/#shapes')
check_eq(#drawing.points, 2, 'baseline/#points')
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
function test_move_point()
-- click outside the drawing
edit.run_after_mouse_click(Editor_state, App.screen.width-5, App.screen.height-5, 1)
-- press a key
edit.run_after_text_input(Editor_state, 'a')
-- key goes to text
check_eq(Editor_state.lines[2].data, 'a')

check_eq(#drawing.shapes, 1, 'baseline/#shapes')
check_eq(#drawing.points, 2, 'baseline/#points')
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
local p1 = drawing.points[drawing.shapes[1].p1]
local p2 = drawing.points[drawing.shapes[1].p2]
check_eq(p1.x, 5, 'baseline/p1:x')
check_eq(p1.y, 6, 'baseline/p1:y')
check_eq(p2.x, 35, 'baseline/p2:x')
check_eq(p2.y, 36, 'baseline/p2:y')
check_nil(p2.name, 'baseline/p2:name')
-- enter 'name' mode without moving the mouse
edit.run_after_keychord(Editor_state, 'C-n')
check_eq(Editor_state.current_drawing_mode, 'name', 'mode:1')
-- hit backspace
edit.run_after_keychord(Editor_state, 'backspace')
-- no crash
end

function test_name_point_then_exit_drawing()
-- draw a line
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
local drawing = Editor_state.lines[1]
function test_name_point_then_hit_backspace()
-- create a drawing with a line
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
Editor_state = edit.initialize_test_state()
Editor_state.filename = 'foo'
Editor_state.lines = load_array{'```lines', '```', ''}
Text.redraw_all(Editor_state)
Editor_state.current_drawing_mode = 'line'
edit.draw(Editor_state)
file deletion: source_text.lua (----------)source_text.lua (----------)

[4.2]→[4.147125:147164](∅→∅),[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅)

assert(State.lines[State.cursor1.line].mode == 'text')
local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)
State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_offset-1)..t..string.sub(State.lines[State.cursor1.line].data, byte_offset)
Text.clear_screen_line_cache(State, State.cursor1.line)
State.cursor1.pos = State.cursor1.pos+1
file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)

if len > 0 then
local byte_offset = Text.offset(p.name, len-1)
if len == 1 then byte_offset = 0 end
p.name = string.sub(p.name, 1, byte_offset)
record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
end
end
end
schedule_save(State)
elseif State.lines.current_drawing and State.current_drawing_mode == 'name' then
if chord == 'return' then
State.current_drawing_mode = State.previous_drawing_mode
State.previous_drawing_mode = nil
else
local before = snapshot(State, State.lines.current_drawing_index)
local drawing = State.lines.current_drawing
local p = drawing.points[drawing.pending.target_point]
if chord == 'escape' then
p.name = nil
record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
elseif chord == 'backspace' then
local len = utf8.len(p.name)
elseif State.lines.current_drawing and State.current_drawing_mode == 'name' then
local before = snapshot(State, State.lines.current_drawing_index)
local drawing = State.lines.current_drawing
local p = drawing.points[drawing.pending.target_point]
p.name = p.name..t
record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
--? print('text input', t)
if State.search_term then
State.search_term = State.search_term..t
State.search_text = nil
Text.search_next(State)
--? print('release', State.cursor1.line)
if State.lines.current_drawing then
--? print('press', State.cursor1.line)
if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then
-- press on a button and it returned 'true' to short-circuit
return
end

for line_index,line in ipairs(State.lines) do
button(State, 'draw', {x=State.left-Margin_left+4, y=y+4, w=12,h=12, color={1,1,0},
icon = icon.insert_drawing,
onpress1 = function()
Drawing.before = snapshot(State, line_index-1, line_index)
table.insert(State.lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})
table.insert(State.line_cache, line_index, {})
if State.cursor1.line >= line_index then
State.cursor1.line = State.cursor1.line+1
end
schedule_save(State)
record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})
end,
})
if loc1.line > #State.lines then return true end
local l = State.lines[loc1.line]
if l.mode ~= 'text' then return false end -- pos is irrelevant to validity for a drawing line
return loc1.pos > #State.lines[loc1.line].data
end

function edit.cursor_on_text(State)
return State.cursor1.line <= #State.lines
and State.lines[State.cursor1.line].mode == 'text'
end

function edit.put_cursor_on_first_text_line(State)
edit in edit.lua at line 94

[4.565]→[4.565:648](∅→∅),[4.565]→[4.565:648](∅→∅)

return loc1.line > #State.lines
or loc1.pos > #State.lines[loc1.line].data