resolve conflicts

akkartik

Oct 14, 2024, 11:02 PM

SLMSBVJWPDXVUGRHC4INGEZVAU3ILXPEMCNZIXHSL5GSMT7PAKRAC

Dependencies

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

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)