resolve conflicts

akkartik

Oct 14, 2024, 10:57 PM

SYWQBIO5GRBYBD7J55A5AXTMAN24BQIG5H5QFCUIDYZCKLOFTXCAC

Dependencies

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

Change contents

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

[4.2]→[4.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)

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)
replacement in source_text.lua at line 93

[4.91121]→[4.2221:2281](∅→∅)

local endpos = line_cache.screen_line_starting_pos[i+1]-1

[4.91121]

[4.2281]

local endpos = line_cache.screen_line_starting_pos[i+1]
replacement in source_text.lua at line 95

[4.2333]→[4.2333:2376](∅→∅)

return line.data:sub(offset, end_offset)

[4.2333]

[4.91172]

return line.data:sub(offset, end_offset-1)