Merge text0

[?]

Apr 2, 2023, 11:50 PM

HLIF3YQENAUOE4DTSYBCDIRQVWLJ5VPVYC43OC3QP5HSHMCSVP4AC

Dependencies

[2] A3Z3S62K get rid of dubious heuristic helper
[3] QD4LOFQR Merge text.love
[4] CZQ3NJ4N Merge text0
[5] AVTNUQYR basic test-enabled framework
[6] Y36LOGR5 bugfix: show cursor when past end of line
[7] MD3W5IRA new fork: rip out drawing support
[8] LXTTOB33 extract a couple of files
[9] 7CLGG7J2 test: autosave after any shape
[10] 3ZSUBI57 drop some redundant args from Text.draw
[11] H2DPLWMV snapshot: wrapping long lines at word boundaries
[12] CVGE3SIG I feel confident now that page-down is working.
[13] 5ZCQGZP5 save 2 more alternate formats for test failures
[14] BE3WIEVK update cursor in search box
[15] Z4XRNDTR find text
[16] V5SYDHPQ start thinking of compute_fragments as a detail
[17] EWMPYCDO bugfix
[18] X3F7ECSL add state arg to some functions
[19] ZLJYLPOT Merge lines.love
[20] FZBXBUFF bugfix: search
[21] PX7DDEMO autosave slightly less aggressively
[22] LF7BWEG4 group all editor globals
[23] I64IPGJX avoid saving fragments in lines
[24] R3KXFRZN get rid of to_text
[25] 2CTN2IEF Merge lines.love
[26] MUJTM6RE bring back a level of wrapping
[27] ISOFHXB2 App.width can no longer take a Text
[28] HALS7E5U more clearly skip prints before screen top
[29] HKV72RZV bugfix: save modified files in save directory
[30] AD34IX2Z couple more tests
[31] 4EGQRXDA bugfix: naming points
[32] XNFTJHC4 split keyboard handling between Text and Drawing
[33] 3TFEAQSW start using some globals
[34] ORRSP7FV deduce test names on failures
[35] ZDAJXYIX remove some unnecessary work
[36] JNJ4R56X support running tests multiple times
[37] LWPRYDLW set color for each fragment
[38] TXHMMX25 move caching behavior inside compute_fragments
[39] KURLAXXI clean up some prints
[40] 3QMTXKWN rename
[41] ILOA5BYF separate data structure for each line's cache data
[42] XUGDTYW2 stop confusingly reading a global
[43] GZ2OYPSH configurable colors and cursor in editor widget
[44] 36Z442IV back to commit 8123959e52f without code editing
[45] JCXL74WV bring back everything from commit a68647ae22
[46] 4KC7I3E2 make colors easier to edit
[47] B3IWYWSR delete another arg that can be deduced
[48] 4VKEE43Z bugfix
[49] 2RXZ3PGO beginning of a new approach to scroll+wrap
[50] BW2IUB3K keep all text cache writes inside text.lua
[51] H4R5BHVY no more Text allocations
[52] BULPIBEG beginnings of a module for the text editor
[53] OYXDYPGS get rid of debug variables
[54] NSHI3CH5 Merge text0
[55] TSV3KPBR tweak format of test failures
[56] S2QMLRXL stop creating a singleton table for every word
[*] 3QNOKBFM beginnings of a test harness

Change contents

edit in text.lua at line 12

[4.214]→[4.44:84](∅→∅),[4.214]→[4.44:84](∅→∅)

--? print('text.draw', line_index, y)
resolve order conflict in text.lua at line 12

[4.3584]

[4.42]
edit in text.lua at line 19

[4.3906]→[4.3585:3603](∅→∅),[4.3906]→[4.3585:3603](∅→∅),[4.3906]→[4.3585:3603](∅→∅)

App.color(fg)
edit in text.lua at line 22

[4.319]

[4.48]

App.color(fg)
resurrect zombie in text.lua at line 43

[4.1566]→[4.3604:3632](∅→∅),[4.1566]→[4.3604:3632](∅→∅)

App.color(fg)
edit in text.lua at line 43

[4.1893]

[4.3604]

local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
edit in text.lua at line 45

[4.1893]→[4.106:106](∅→∅),[4.1893]→[4.106:106](∅→∅),[4.106]→[4.741:887](∅→∅),[4.608]→[4.741:887](∅→∅),[4.608]→[4.741:887](∅→∅)

local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
resurrect zombie in text.lua at line 45

[4.774]→[4.888:961](∅→∅),[4.774]→[4.888:961](∅→∅)

love.graphics.print(State.search_term, State.left+lo_px,y)
resolve order conflict in text.lua at line 45

[4.3632]

[4.888]
edit in text.lua at line 48

[4.3671]→[4.3671:3769](∅→∅),[4.869]→[4.962:1048](∅→∅),[4.869]→[4.962:1048](∅→∅)

Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y, Cursor_color, fg)
Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y)
resolve order conflict in text.lua at line 48

[4.3671]
edit in text.lua at line 48

[0.176]

[4.530]

Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y, Cursor_color, fg)
edit in text.lua at line 58

[4.37]→[4.3770:3825](∅→∅),[4.37]→[4.3770:3825](∅→∅),[4.1351]→[4.3826:3880](∅→∅),[4.1351]→[4.3826:3880](∅→∅)

if not hide_cursor and State.search_term == nil then
Text.draw_cursor(State, x, y, Cursor_color, fg)
replacement in search.lua at line 16

[4.49599]→[4.4069:4158](∅→∅),[4.49599]→[4.4069:4158](∅→∅),[4.1671]→[4.899:962](∅→∅)

Text.draw_cursor(State, 25+App.width(State.search_text),y-5, Cursor_color, Text_color)
Text.draw_cursor(State, 25+App.width(State.search_term),y-5)

[4.1671]

[4.49698]

Text.draw_cursor(State, 25+App.width(State.search_term),y-5, Cursor_color, Text_color)
edit in app.lua at line 56

[4.1209]→[4.1209:1247](∅→∅)

App.newText = love.graphics.newText
edit in app.lua at line 57

[4.1286]→[4.1286:1342](∅→∅)

App.width = function(text) return text:getWidth() end
edit in app.lua at line 485

[4.8162]→[4.8570:8726](∅→∅),[4.8162]→[4.8570:8726](∅→∅),[4.60904]→[4.2268:2330](∅→∅),[4.60904]→[4.2268:2330](∅→∅),[4.60904]→[4.2268:2330](∅→∅)

App.open_for_reading = function(filename) return io.open(filename, 'r') end
App.open_for_writing = function(filename) return io.open(filename, 'w') end
local stack_trace = debug.traceback('', --[[stack frame]]5)
resolve order conflict in app.lua at line 485

[4.61192]