resolve conflicts

akkartik

Jun 11, 2024, 6:47 PM

XQV3PNH2QH3YTPPMYWZ5IBIMRCSKKQKGFHUAOGFAGIY4P2FCDCEAC

Dependencies

[2] 54HQZ536 resolve conflicts
[3] 2TCIWW6Z stop caching starty
[4] KYNGDE2C consistent names in a few more places
[5] KTZQ57HV replace globals with args in a few functions
[6] ZS5IYZH5 stop caching screen_bottom1
[7] VYIA2JFX resolve conflicts
[8] KF72R2XX resolve conflicts
[9] LF7BWEG4 group all editor globals
[10] KKMFQDR4 editing source code from within the app
[11] 656FM555 bugfix: clear selection when clicking above or below lines
[12] 5UKUADTW distinguish consistently between mouse buttons and other buttons
[13] G54H3YG2 get rid of all bifold text
[14] OO5GDU53 pijul bug: why did previous change not have any effect?
[15] CIK3U5S6 Merge lines.love
[16] TXI6GSQD some minor cleanup
[17] KMSL74GA support selections in the source editor
[18] QAMVLUK2 fix a crash involving mouse and drawings
[19] 5CDHNEKR Merge lines.love
[20] GFXWHTE6 mouse wheel support
[21] CUFW4EJL reorganize app.lua and its comments
[22] VOJISLDC resolve conflicts
[23] P4NJ2KS7 resolve conflicts
[24] 5SM6DRHK port inscript's bugfix to source editor
[25] LNUHQOGH start passing in Editor_state explicitly
[26] OWE64YJ2 Merge lines.love
[27] 2L5MEZV3 experiment: new edit namespace
[28] BW2IUB3K keep all text cache writes inside text.lua
[29] WJBZZQE4 fold together two largely similar cases
[30] KNWMKLNJ Merge lines.love
[31] 3OTESDW6 move drawing.starty into line cache
[32] 2MGBV7NP bugfix: crash when using mouse wheel
[33] APOMBXMU resolve conflicts
[34] Z5WOBP27 Merge lines.love
[35] 6XCJX4DZ bugfix: inscript's bug
[*] 3QNOKBFM beginnings of a test harness

Change contents

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
edit in edit.lua at line 168

[4.952]→[4.952:997](∅→∅)

local screen_bottom1 = {line=nil, pos=nil}
edit in edit.lua at line 173

[4.1227]→[4.1227:1264](∅→∅)

screen_bottom1.line = line_index
replacement in edit.lua at line 195

[4.2351]→[4.2351:2423](∅→∅)

y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos)

[4.2351]

[4.2423]

y = Text.draw(State, line_index, y, startpos)
edit in edit.lua at line 205

[4.2703]→[4.2703:2743](∅→∅)

State.screen_bottom1 = screen_bottom1
replacement in edit.lua at line 278

[4.5068]→[4.5068:5203](∅→∅)

local line_cache = State.line_cache[line_index]
if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

[4.5068]

[4.5203]

if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then
replacement in edit.lua at line 292

[4.5631]→[4.5631:5767](∅→∅)

State.selection1 = {
line=State.screen_bottom1.line,
pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
}

[4.5631]

[4.5767]

State.selection1 = Text.final_text_loc_on_screen(State)
replacement in edit.lua at line 330

[4.373]→[4.373:504](∅→∅)

State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[4.373]

[4.504]

State.cursor1 = Text.final_text_loc_on_screen(State)
replacement in edit.lua at line 358

[4.7749]→[4.7749:7832](∅→∅)

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

[4.7749]

[4.7832]

State.cursor1 = Text.screen_bottom1(State)
edit in edit.lua at line 396

[4.9421]→[4.9421:9528](∅→∅)

for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
edit in edit.lua at line 500

[4.13824]→[4.13824:13866](∅→∅)

-- DON'T reset line_cache.starty here
edit in edit.lua at line 536

[4.15351]→[4.15351:15458](∅→∅)

for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll
edit in edit.lua at line 590

[4.16942]

[4.16942]

edit.draw(State)
edit in edit.lua at line 613

[4.17561]→[2.104:104](∅→∅),[4.182]→[4.8618:8665](∅→∅),[4.182]→[4.8618:8665](∅→∅),[4.5239]→[4.8565:8617](∅→∅),[4.5239]→[4.8565:8617](∅→∅),[4.8089]→[3.4055:4137](∅→∅),[4.8089]→[3.4055:4137](∅→∅),[4.834]→[4.1152:1171](∅→∅),[4.834]→[4.1152:1171](∅→∅),[4.3196]→[4.1094:1151](∅→∅),[4.3196]→[4.1094:1151](∅→∅),[4.2459]→[4.1035:1093](∅→∅),[4.2459]→[4.1035:1093](∅→∅)

State.cursor1 = Text.screen_bottom1(State)
y = Text.draw(State, line_index, y, startpos)
if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then
edit.draw(State)
State.cursor1 = Text.final_text_loc_on_screen(State)
State.selection1 = Text.final_text_loc_on_screen(State)
resolve order conflict in edit.lua at line 613

[4.17561]
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()