resolve conflicts

akkartik

Jun 28, 2024, 5:41 AM

A6YCG6F2FBZ2WPNGNLRDDN7BCG4PIUH4VXXYMP7A2XLYIK3UAG7AC

Dependencies

[2] 4Y2QDDAZ resolve conflicts
[3] TYLURRX3 resolve conflicts
[4] SGMA5JLE save the list of tests in repo
[5] QMRQL2FO resolve conflicts
[6] K2X6G75Z start writing some tests for drawings
[7] 6VJTQKW7 start supporting LÖVE v12
[8] TBTRYEBP Merge lines.love
[9] 66X36NZN a little more prose describing manual_tests
[10] AVTNUQYR basic test-enabled framework
[11] 36Z442IV back to commit 8123959e52f without code editing
[12] LXTTOB33 extract a couple of files
[13] 4SR3Z4Y3 document the version of LÖVE I've been using
[14] ZS5IYZH5 stop caching screen_bottom1
[15] CAG7PP5Y Merge text.love
[16] OI4FPFIN support drawings in the source editor
[17] MBAJPTDJ resolve conflicts
[18] FS2ITYYH record a known issue
[19] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[20] 34BZ5ZKN Merge lines.love
[21] RSZD5A7G forgot to add json.lua
[22] BLWAYPKV extract a module
[23] TOXPJJYY resolve conflicts
[24] D2GCFTTT clean up repl functionality
[25] R5QXEHUI somebody stop me
[26] OGUV4HSA remove some memory leaks from rendered fragments
[27] PJ5PQAQE record support for multiple versions
[28] D4B52CQ2 Merge lines.love
[29] T4FRZSYL delete an ancient, unused file
[30] XX7G2FFJ intermingle freehand line drawings with text
[31] ONHKBLLC Merge lines.love
[32] TVCPXAAU rename
[33] 2CFLXLIE Merge text.love
[34] YXQOITYS Merge lines.love
[35] VXORMHME delete experimental REPL
[36] LWPFEZBI Merge lines.love
[37] 5ML5VGOC Merge text.love
[38] VSGPLJFA resolve conflicts
[39] CRBLAWBO resolve conflicts
[40] EB6LHFJR use deepcopy where possible
[41] CE4LZV4T drop last couple of manual tests
[42] M5JXTW56 Merge text.love
[43] 3QNOKBFM beginnings of a test harness
[44] OTIBCAUJ love2d scaffold
[45] 2TQUKHBC Merge lines.love
[46] VOU73AK6 Merge lines.love
[47] VHUNJHXB Merge lines.love
[48] N2NUGNN4 include a brief reference enabling many useful apps
[49] 3G723RV5 Merge text.love
[50] ZLJYLPOT Merge lines.love
[51] 2L5MEZV3 experiment: new edit namespace
[52] 3PSFWAIL Merge lines.love
[53] R6MNUXDJ pijul bug
[54] 6LJZN727 handle chords
[55] ORKN6EOB Merge lines.love
[56] KKQKPGCI resolve conflicts
[57] KJLZCK2R resolve conflicts
[58] TLOAPLBJ add a license
[59] 2CTN2IEF Merge lines.love
[60] VXRYVZ74 Merge text.love
[61] 4YDBYBA4 clean up memory leak experiments
[62] MXA3RZYK deduce left/right from state where possible
[63] KMSL74GA support selections in the source editor
[64] X43ZIKR3 Merge text.love
[65] JOPVPUSA editing source code from within the app
[66] KKMFQDR4 editing source code from within the app
[67] VP5KC4XZ Merge lines.love
[68] LXFHXL2N Merge text.love
[69] 73OCE2MC after much struggle, a brute-force undo
[70] ED4Z6ORC cleaner API for file-system access
[71] VHQCNMAR several more modules
[72] VLTU33KW resolve conflicts
[73] BULPIBEG beginnings of a module for the text editor

Change contents

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

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

State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.selection1 = deepcopy(State.cursor1)
State.cursor1 = deepcopy(State.screen_top1)
State.cursor1 = deepcopy(State.screen_top1)
State.screen_top1 = deepcopy(State.cursor1)
State.cursor1 = deepcopy(State.screen_top1)
elseif State.cursor1.line >= screen_bottom1.line then
end
end

function Text.end_of_line(State)
Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks
end

-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)
end
end
end
end
end
end
end
end
end
end
file deletion: source_edit.lua (----------)source_edit.lua (----------)

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

State.cursor1 = deepcopy(State.screen_top1)
State.cursor1 = deepcopy(State.screen_top1)
edit.put_cursor_on_next_text_line(State)
edit.clean_up_mouse_press(State)
return
end
edit in text.lua at line 388

[4.1239]→[2.4:79](∅→∅)

State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}