resolve conflicts

akkartik

Jun 11, 2024, 6:40 PM

E3FCMID7RMYSRNSJHSSZ7I5NLYNXPXAWSWYHEK6ZJHZB7775HQ6AC

Dependencies

[2] XYK7ESSI Merge lines.love
[3] 2TCIWW6Z stop caching starty
[4] KKMFQDR4 editing source code from within the app
[5] SDEY7LFJ rename a variable
[6] OEIR7M74 Merge lines.love
[7] G54H3YG2 get rid of all bifold text
[8] I64IPGJX avoid saving fragments in lines
[9] 5SM6DRHK port inscript's bugfix to source editor
[10] ZS5IYZH5 stop caching screen_bottom1
[11] JSJSVQAX Merge lines.love
[12] CUFW4EJL reorganize app.lua and its comments
[13] KMSL74GA support selections in the source editor
[14] HALS7E5U more clearly skip prints before screen top
[*] BULPIBEG beginnings of a module for the text editor
[*] 3QNOKBFM beginnings of a test harness

Change contents

resurrect zombie in text.lua at line 20

[4.363]→[2.3:191](∅→∅),[4.363]→[2.3:191](∅→∅)

local screen_line = Text.screen_line(line, line_cache, i)
--? print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
local frag_len = utf8.len(screen_line)
edit in source_text.lua at line 442

[3.2593]

[3.2593]

if State.lines[loc2.line].mode == 'drawing' then
y = y + Drawing_padding_top
end
replacement in source_text.lua at line 449

[3.2781]→[3.2781:2874](∅→∅)

y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)

[3.2781]

[3.2874]

y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
edit in source_text.lua at line 1108

[4.7723]→[4.145702:145727](∅→∅),[4.145702]→[4.145702:145727](∅→∅)

--? print('too low')
replacement in source_text.lua at line 1109

[4.145772]→[4.145772:145797](∅→∅),[4.145797]→[4.5855:5879](∅→∅),[4.5879]→[4.7724:7859](∅→∅),[4.7859]→[4.6026:6034](∅→∅),[4.6026]→[4.6026:6034](∅→∅)

--? print('tweak')
State.cursor1 = {
line=screen_bottom1.line,
pos=Text.to_pos_on_line(State, screen_bottom1.line, State.right-5, App.screen.height-5),
}

[4.145772]

[4.145985]

State.cursor1 = Text.final_text_loc_on_screen(State)
replacement in source_select.lua at line 72

[4.4297]→[4.4297:4359](∅→∅)

if y < State.line_cache[State.screen_top1.line].starty then

[4.4297]

[4.4359]

if y < State.top then
replacement in app.lua at line 134

[4.8755]→[3.9246:9278](∅→∅)

--? test_click_moves_cursor()

[4.8755]

[4.842]

--? test_click_below_all_lines()