resolve conflicts

akkartik

Dec 29, 2023, 10:30 PM

QMRQL2FOIIXU3PCSH7UQIDRLKJN2DQHB5IUL4TLBVANNHWWETL6AC

Dependencies

[2] HXH4AIF2 primitives for writing tests
[3] Y3ZR4TOK Merge lines.love
[4] TFUNIT6M resolve conflicts
[5] GAPPXISY moar bugfix X-(
[6] QJISOCHJ some temporary logging to catch a bug
[7] OTIBCAUJ love2d scaffold
[8] W5WCQNMP bugfix: Windows pushing title bar off screen
[9] G54H3YG2 get rid of all bifold text
[10] ZMBPXIZ4 bugfix
[11] OI4FPFIN support drawings in the source editor
[12] 3XNFQDDN Merge lines.love
[13] ZLJYLPOT Merge lines.love
[14] WKXJNESI resolve conflicts
[15] 5SM6DRHK port inscript's bugfix to source editor
[16] B4JEWKWI hide editor cursor while in file navigator
[17] JZR3QMTN Merge lines.love
[18] 2CK5QI7W make love event names consistent
[19] ONHKBLLC Merge lines.love
[20] RU4HIK43 Merge lines.love
[21] 3QNOKBFM beginnings of a test harness
[22] KKMFQDR4 editing source code from within the app
[23] H5UZI3YN editor documentation
[24] VXORMHME delete experimental REPL
[25] OGUV4HSA remove some memory leaks from rendered fragments
[26] VHQCNMAR several more modules
[27] DCO5BQWV Merge lines.love
[28] 4SR3Z4Y3 document the version of LÖVE I've been using
[29] R5QXEHUI somebody stop me
[30] G3DLS5OU audit all asserts
[31] PXSQR2AD hide line numbers from log browser
[32] AYX33NBC Merge lines.love
[33] 7YGYHOEO Merge lines.love
[34] JJDUDMVX Merge lines.love
[35] XX7G2FFJ intermingle freehand line drawings with text
[36] AVTNUQYR basic test-enabled framework
[37] LNUHQOGH start passing in Editor_state explicitly
[38] APYPFFS3 call edit rather than App callbacks in tests
[39] CNCYMM6A make test initializations a little more obvious
[40] KMSL74GA support selections in the source editor
[41] H6QZ7GRR more precise name
[42] IX5YTLSV state validation in source editor as well
[43] BULPIBEG beginnings of a module for the text editor
[44] T4FRZSYL delete an ancient, unused file
[45] TLOAPLBJ add a license
[46] SGMA5JLE save the list of tests in repo
[47] TBTRYEBP Merge lines.love
[48] RRDO6H7H bugfix
[49] H4R5BHVY no more Text allocations
[50] ATQO62TF Merge lines.love
[51] 5XA7TKWY pull font into editor
[52] SDO4DHNU source: load cursor position from settings
[53] TVCPXAAU rename
[54] 2CTN2IEF Merge lines.love
[55] 4VQGE7RA new test
[56] B6DS4GZC Merge lines.love
[57] EVMVBLXD bugfix: preserve window position
[58] 4KC7I3E2 make colors easier to edit
[59] 5RDWSYK2 consistently use App names for methods everywhere
[60] D76MS2G2 Merge lines.love
[61] BLWAYPKV extract a module
[62] S3PNFXTB handle missing cursors in settings
[63] D2GCFTTT clean up repl functionality
[64] LF7BWEG4 group all editor globals
[65] JKENJ2UG Merge lines.love
[66] ZL6DXCQ2 update doc
[67] UZQ2LGHQ bugfix: preserve window position
[68] OB5XOXVC deemphasize the source editor
[69] 2TQUKHBC Merge lines.love
[70] PP2IIHL6 stop putting button state in a global
[71] VBU5YHLR Merge lines.love
[72] MD3W5IRA new fork: rip out drawing support
[73] FS2ITYYH record a known issue
[74] U3MJNFUY Merge lines.love
[75] LXTTOB33 extract a couple of files
[76] YXQOITYS Merge lines.love
[77] KKQKPGCI resolve conflicts
[78] ORKN6EOB Merge lines.love
[79] 2L5MEZV3 experiment: new edit namespace
[80] AOZX2G5F source: no commandline args
[81] 6LJZN727 handle chords
[82] UD7HNQL7 purge unused button infrastructure
[83] JNAQUQKB Merge lines.love
[84] A23MMLJH migrate old settings, attempt #3
[85] 3PSFWAIL Merge lines.love
[86] 66X36NZN a little more prose describing manual_tests
[87] GX236KZG Revert "deemphasize the source editor"
[88] R2ASHK5C fix a bad merge
[89] TFM6F5OD Merge lines.love
[90] 4YDBYBA4 clean up memory leak experiments
[91] LWPFEZBI Merge lines.love
[92] 2WGHUWE6 self-documenting 0 Test_right_margin
[93] 7JEYXICU resolve conflicts
[94] 6VJTQKW7 start supporting LÖVE v12
[95] VP5KC4XZ Merge lines.love
[96] J3I6DVMB drop an unused arg
[97] JOPVPUSA editing source code from within the app
[98] MGJZHZC4 Merge lines.love
[99] 34BZ5ZKN Merge lines.love
[100] K2X6G75Z start writing some tests for drawings
[101] 73OCE2MC after much struggle, a brute-force undo
[102] ISOFHXB2 App.width can no longer take a Text
[103] ED4Z6ORC cleaner API for file-system access
[104] TYFAGQWS repeat bugfix on source editor
[105] VHUNJHXB Merge lines.love
[106] CWQIPU7U always show line numbers in source editor
[107] CE4LZV4T drop last couple of manual tests
[108] 3HHPHDOO couple of typos
[109] N2NUGNN4 include a brief reference enabling many useful apps
[110] RSZD5A7G forgot to add json.lua
[111] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[112] 3TI67SEJ more bugfix

Change contents

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

[6.2]→[6.165725:165764](∅→∅),[6.2]→[6.165725:165764](∅→∅),[6.165764]→[6.152440:152440](∅→∅)

font = font,
end -- edit.initialize_state
love.graphics.setFont(State.font)
State.font = love.graphics.newFont(State.font_height)
love.graphics.getFont(),
14,
15) -- line height
end

State.line_height = math.floor(font_height*1.3)
App.color(Text_color)

font_height = font_height,
line_height = line_height,
function edit.initialize_state(top, left, right, font, font_height, line_height) -- currently always draws to bottom of screen
local result = {
file deletion: source.lua (----------)source.lua (----------)

[6.2]→[6.177652:177686](∅→∅),[6.2]→[6.177652:177686](∅→∅),[6.177686]→[6.165766:165766](∅→∅)

local font = love.graphics.newFont(settings.font_height)
local font = love.graphics.newFont(font_height)
Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
Editor_state.filename = 'run.lua'
source.initialize_window_geometry()
Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
Editor_state.filename = settings.filename
-- set up desired window dimensions and make window resizable
_, _, App.screen.flags = App.screen.size()
App.screen.flags.resizable = true
App.screen.width, App.screen.height = settings.width, settings.height
App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
file deletion: run.lua (----------)run.lua (----------)

[6.2]→[6.184046:184077](∅→∅),[6.2]→[6.184046:184077](∅→∅),[6.184077]→[6.178044:178044](∅→∅)

local font = love.graphics.newFont(Settings.font_height)
local font = love.graphics.newFont(font_height)
Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
Settings = run.settings()
end

run.initialize_window_geometry()
Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, Settings.font_height, math.floor(Settings.font_height*1.3))
Editor_state.filename = Settings.filename
Editor_state.screen_top1 = Settings.screen_top
Editor_state.cursor1 = Settings.cursor
-- set up desired window dimensions and make window resizable
_, _, App.screen.flags = App.screen.size()
file deletion: log_browser.lua (----------)log_browser.lua (----------)

[6.2]→[6.203223:203262](∅→∅),[6.2]→[6.203223:203262](∅→∅),[6.203262]→[6.191782:191782](∅→∅)

Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)
Log_browser_state.filename = 'log'
load_from_disk(Log_browser_state) -- TODO: pay no attention to Fold
log_browser.parse(Log_browser_state)
Text.redraw_all(Log_browser_state)
Log_browser_state.screen_top1 = {line=1, pos=1}
replacement in source_edit.lua at line 28

[6.152909]→[6.152909:153031](∅→∅)

function edit.initialize_state(top, left, right, font_height, line_height) -- currently always draws to bottom of screen

[6.152909]

[6.153031]

function edit.initialize_state(top, left, right, font, font_height, line_height) -- currently always draws to bottom of screen
edit in source_edit.lua at line 88

[6.18272]

[6.154867]

font = font,
replacement in source_edit.lua at line 109

[6.155383]→[6.155383:155412](∅→∅)

end -- App.initialize_state

[6.155383]

[6.155412]

end -- edit.initialize_state
edit in source_edit.lua at line 161

[6.155468]

[6.155468]

love.graphics.setFont(State.font)
replacement in source_edit.lua at line 557

[6.164055]→[6.11:77](∅→∅)

love.graphics.setFont(love.graphics.newFont(State.font_height))

[6.164055]

[6.164128]

State.font = love.graphics.newFont(State.font_height)
replacement in source_edit.lua at line 574

[6.557]→[6.164530:164584](∅→∅),[6.164530]→[6.164530:164584](∅→∅)

14, -- font height assuming default LÖVE font

[6.557]

[6.164584]

love.graphics.getFont(),
14,
replacement in source.lua at line 117

[6.168531]→[6.168531:168600](∅→∅)

love.graphics.setFont(love.graphics.newFont(settings.font_height))

[6.168531]

[6.72]

local font = love.graphics.newFont(settings.font_height)
replacement in source.lua at line 129

[6.169531]→[6.276:442](∅→∅)

Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, settings.font_height, math.floor(settings.font_height*1.3))

[6.169531]

[6.169662]

Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
replacement in source.lua at line 155

[6.170085]→[6.170085:170145](∅→∅)

love.graphics.setFont(love.graphics.newFont(font_height))

[6.170085]

[6.13]

local font = love.graphics.newFont(font_height)
replacement in source.lua at line 157

[6.51]→[6.443:573](∅→∅)

Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right)

[6.51]

[6.2008]

Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
edit in source.lua at line 159

[6.2044]→[6.170346:170444](∅→∅),[6.170346]→[6.170346:170444](∅→∅)

Editor_state.font_height = font_height
Editor_state.line_height = math.floor(font_height*1.3)
replacement in run.lua at line 57

[6.179231]→[6.179231:179300](∅→∅)

love.graphics.setFont(love.graphics.newFont(Settings.font_height))

[6.179231]

[6.1698]

local font = love.graphics.newFont(Settings.font_height)
replacement in run.lua at line 64

[6.88]→[6.179864:180019](∅→∅),[6.1739]→[6.179864:180019](∅→∅),[6.1858]→[6.179864:180019](∅→∅),[6.179864]→[6.179864:180019](∅→∅)

Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, Settings.font_height, math.floor(Settings.font_height*1.3))

[6.1858]

[6.180019]

Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, Settings.font_height, math.floor(Settings.font_height*1.3))
replacement in run.lua at line 82

[6.180226]→[6.180226:180286](∅→∅)

love.graphics.setFont(love.graphics.newFont(font_height))

[6.180226]

[6.102]

local font = love.graphics.newFont(font_height)
replacement in run.lua at line 84

[6.137]→[6.180389:180582](∅→∅),[6.1589]→[6.180389:180582](∅→∅),[6.180389]→[6.180389:180582](∅→∅)

Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
Editor_state.font_height = font_height
Editor_state.line_height = math.floor(font_height*1.3)

[6.137]

[6.180605]

Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
replacement in reference.md at line 193

[6.245]→[3.17:93](∅→∅),[6.245]→[3.17:93](∅→∅)

returns an object that can be used to render an interactive editor widget

[6.164]

[6.17]

* `state = edit.initialize_state(top, left, right, font, font_height, line_height)`
-- returns an object that can be used to render an interactive editor widget
edit in reference.md at line 421

[6.164]→[6.789:952](∅→∅),[6.164]→[6.789:952](∅→∅)

* `state = edit.initialize_state(top, left, right, font, font_height, line_height)`
-- returns an object that can be used to render an interactive editor widget
resolve order conflict in reference.md at line 421

[2.1123]
replacement in log_browser.lua at line 9

[6.191636]→[6.191636:191830](∅→∅)

Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font_height, Editor_state.line_height)

[6.191636]

[6.191830]

Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)
resurrect zombie in edit.lua at line 50

[6.3321]→[6.1441:1458](∅→∅),[6.3321]→[6.1441:1458](∅→∅),[6.1458]→[6.1296:1327](∅→∅),[6.1458]→[6.1296:1327](∅→∅)

font = font,
font_height = font_height,
edit in edit.lua at line 103

[6.84]

[6.84]

love.graphics.setFont(State.font)
replacement in edit.lua at line 389

[6.10509]→[6.10509:10575](∅→∅)

love.graphics.setFont(love.graphics.newFont(State.font_height))

[6.10509]

[6.10575]

State.font = love.graphics.newFont(State.font_height)
replacement in edit.lua at line 406

[6.11061]→[6.11061:11115](∅→∅)

14, -- font height assuming default LÖVE font

[6.11061]

[6.11115]

love.graphics.getFont(),
14,
edit in edit.lua at line 456

[6.12430]→[4.129:129](∅→∅),[6.1119]→[6.1620:1651](∅→∅),[6.1119]→[6.1620:1651](∅→∅),[6.264]→[6.1563:1619](∅→∅),[6.264]→[6.1563:1619](∅→∅),[6.44]→[6.1526:1562](∅→∅),[6.44]→[6.1526:1562](∅→∅),[6.44]→[6.1526:1562](∅→∅),[6.1651]→[6.1328:1338](∅→∅),[6.1651]→[6.1328:1338](∅→∅)

love.graphics.getFont(),
State.font = love.graphics.newFont(State.font_height)
love.graphics.setFont(State.font)
14,
resolve order conflict in edit.lua at line 456

[6.12430]