resolve conflicts

akkartik

Oct 14, 2024, 11:02 PM

SLMSBVJWPDXVUGRHC4INGEZVAU3ILXPEMCNZIXHSL5GSMT7PAKRAC

Dependencies

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

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](∅→∅)

local endpos = line_cache.screen_line_starting_pos[i+1]
return line.data:sub(offset, end_offset-1)
end

function Text.draw_cursor(State, x, y)
-- blink every 0.5s
if math.floor(Cursor_time*2)%2 == 0 then
App.color(Cursor_color)
love.graphics.rectangle('fill', x,y, 3,State.line_height)
end
State.cursor_x = x
State.cursor_y = y+State.line_height
end

function Text.populate_screen_line_starting_pos(State, line_index)
local line = State.lines[line_index]
local end_offset = Text.offset(line.data, endpos)