{"header":{"message":"Merge lines.love","description":null,"timestamp":"2022-09-05T19:47:27Z","authors":[{"email":"vc@akkartik.com","name":"Kartik K. Agaram"}]},"hash":"QEXZHD2VPCM4TAPP7PR2K2PIR4BVES5IZWC3T6ZRNJWKWOXFILNQC","authors":[],"deps":{"hashes":[["QEXZHD2VPCM4TAPP7PR2K2PIR4BVES5IZWC3T6ZRNJWKWOXFILNQC","Merge lines.love"],["AA",null],["32V6ZHQBHMVAY66WO5FAHXPY6W6PWNAURIRNN3S63YUCL5LCH4LAC","Merge lines.love"],["2VEIMUQXG6S776NS77WTIFFIPSA27XDTWJZZ7FW3MTS2OHLHT56AC","Merge lines.love"],["SXTQMD44FCYIGVEBGTZLWBZHFJL32PC3W6GCO6CXXC2DF3WV22OQC","include some missing source files"],["OI4FPFINEROK6GNDEMOBTGSPYIULCLRGGT5W3H7VLM7VFH22GMWQC","support drawings in the source editor"],["MD3W5IRAC6UQALQE4LJC52VQNDO3I3HXF3XE2XHDABXBYJBUVAXQC","new fork: rip out drawing support"],["PX3736DXTMOKZHWGZKY446VJQ4URULLXZTG34A3JYZRDWWE5ETKAC","better error message"],["GBSRQUT4QF5WCFVSTGSOU3BM6VCGPNBBG5WKDEGDGGCOUWTPEC2AC","Merge lines.love"],["K2X6G75Z6XBC4DVIRWC5HC7XA3A2SKOM3MWSQTCFEYWIJL7LME2QC","start writing some tests for drawings"],["OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","love2d scaffold"],["ODLKHO7BO2AODYO2OEQ6D4NSNBT5GR3CKLUXWMDLRYXL7DJOI7BAC","switch to line index in a function"],["TXDMRA5JEAML2GF5QY4ATU22G3NI7DQWPGO4U5OZNP7NGK4JT6WQC","bugfix: alt-tab shouldn't emit keypress events"],["EAEGCJV5JOW46KCZKKPBFKZ4Z3SDB3X4R7TLNXFWCIQN5UCNSXFQC","rename"],["MUJTM6REGQAK3LZTIFWGJRXE2UPCM4HSLXQYSF5ITLXLS6JCVPMQC","bring back a level of wrapping"],["R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC","somebody stop me"],["BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC","let's prevent the text cursor from ever getting on a drawing"],["LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC","extract a couple of files"],["RSZD5A7GI5MISRTDFFJ63VUSFUFF3R7SXA66J64CBHWHNEUBMICQC","forgot to add json.lua"],["5USLYLBVMNECPWJHHCFMWMLEJFPWWRXN4XQZRA22XQ752U75GYVAC","duplicate"],["SDRXK4X5R6KBAFZTFWKTC7375HVVVPSTCDJVAYWSNUSHSKD242GQC","move"],["3QNOKBFMKBGXBVJIRHR2444JRRMBTABHE4674NR3DT67RRM2X6GAC","beginnings of a test harness"],["K464QQR4FTXFUMHFWAGOD5DJ6YHUBUKRHLXF2ORE74DVT7TVQ35QC","more defensive resize handling"],["D2GCFTTT2RNUBFB243YTA4F2H5ZXFTFHBSKHLZ2CX4JSKRZFTUUQC","clean up repl functionality"],["SVJZZDC3K6AKAXHGRNAZKRE2ZXEKJANNLG7LSSUZJARFBL5F7C4AC","snapshot - no, that's all wrong"],["WJBZZQE4A4KLYGS2KA254I6VN2DVXDY4XKCNAE76GTMLLQGYCUOQC","fold together two largely similar cases"],["73OCE2MCBJJZZMN2KYPJTBOUCKBZAOQ2QIAMTGCNOOJ2AJAXFT2AC","after much struggle, a brute-force undo"],["2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","experiment: new edit namespace"],["SPNMXTYRSNPNQJNBTYDZSHYDZVZRPM4LI5QX7GR2TLTC6SPJX4DAC","have file API operate on state object"],["6LJZN727CRPYR34LV75CQF55YZI3E7MGESYZSFSYAE73SNEZE3FAC","handle chords"],["KECEMMMRW2VVBZ567HJQPGLC57LTSBKWH7UFP32IW43D23X6WTEQC","extract couple of functions"],["Z4XRNDTRTGSZHNB65WNHOVUBFW4QWQABLVSK4RM3QJHGK33DMRJAC","find text"],["R6GUSTBY5ZHR7E46DSIDQDNZDJI6QMZQDC7RPQMQWLGWQKXU6HVQC","default font size and line-height"],["E4HEHLRTRRIZZV4UMGVPG3LU4KJIPO5WFCBXHK7TG6YDURIEBVJQC","extract a variable"],["VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","several more modules"],["LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC","group all editor globals"],["66X36NZNEHWWURKSZ6G3XSC4CKQ7NTR4HYGDJGLHAUELMUAQC34AC","a little more prose describing manual_tests"],["JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC","editing source code from within the app"],["TVCPXAAU4P3K5MFYINH2MWDK3KGTQ2GE74TUNERYOONG2G5EYKMQC","rename"],["4YDBYBA4H77LGAJHWRKVQSUGSYFNXKINO3VHFSQLU2XE36EIGO5AC","clean up memory leak experiments"],["HTWAM4NZFOY463TNSKYIM2EWB7QNBGDRRTTGHF5N3Z4TGC7Q3SFAC","bugfix: scrolling in left/right movements"],["F65ADDGLR2PNXVSM2XBHM3OSLQC2OTRR3GQBI7DJWIKPJCJ5CSOAC","add state arg to a few functions"],["TLOAPLBJPPBAROMWGXUK6JIFEIR222YAB4JOYCARGAYDIOZDXSBQC","add a license"],["ZPUQSPQPQFVRUIHGLAWW3IDBYODIWDHO62HAC3WWF5TM3CIJGHNQC","extract a few methods"],["GUOQRUL75BMNH7UOZIQ7EYXKK2TMQAIU6HAKMZ75TZYB7NWSZAVQC","Merge lines.love"],["YGCT2D2ORMLTBHANLGHZV3EBGGHD7ZK55UAM7HF2AVSHDXAAKK5QC","start loading settings as applicable"],["4CCBB66RZIPCP5O6TWGXZE3MVZ7WE4FN5SJOHDMPENWSRS7NWZGAC","Merge lines.love"],["AVTNUQYRBW7IX2YQ3KDLVQ23RGW3BAKTAE7P73ASBYNKOHMQMH5AC","basic test-enabled framework"],["FS2ITYYHBLFT66YUC3ENPFYI2HOYHOVEPQIN7NQR6KF5MEK4NKZAC","record a known issue"],["T4FRZSYLUWDA4K3URU4MI33EGD4XWSM7FPSIRNMAEYQAFEDFGPZAC","delete an ancient, unused file"],["X3CQLBTR7ICDAVFZZRLAWWJZI2SNZAMRUWW7O4R25DIKDUHL75CQC","set window title within each app"],["3QQZ7W4EJ7G4HQM5IYWXICMAHVRGERY4X6AOC6LOV5NSZ4OBICSAC","bring couple more globals back to the app level"],["UN7L3DNN4Y3BCIA7SM6GYYWQG3OKVCH7ADPKAVF33E6QXY2HEJMQC","avoid some string concatenations"],["EGH7XDBKE3R74VXLNTCAP5LJTRBPFUEMPS647MJARDGCMUHJG2QQC","support non-text lines in Text.to2"],["CE4LZV4TNXJT54CVGM3QANCBP42TMLMZWF2DBSMUYKAHILXIZEMQC","drop last couple of manual tests"],["2RXZ3PGOTTZ6M4R372JXIKPLBQKPVBMAXNPIEO2HZDN4EMYW4GNAC","beginning of a new approach to scroll+wrap"],["BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","extract a module"],["XX7G2FFJ4QCGQGD4REAW5QFHVYAKCFUPGZCK7L6DFGS5ISVBYBQQC","intermingle freehand line drawings with text"],["LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC","start passing in Editor_state explicitly"],["OGUV4HSA7XGSQLUVWBAE3AE263Z7Z6G3BZOB4CN2AOYD2DEJMOZAC","remove some memory leaks from rendered fragments"],["KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","editing source code from within the app"],["Z5HLXU4PJWWJJDBCK52NBD6PIRIA3TAN2BKZB5HBYFGIDBX4F5HAC","add state arg to a few functions"],["SVA7IC5OQMN72OUQ7BLBM4SKAMTZOHYNKZTYOFMW6AY4577LUCWQC","Merge lines.love"],["NP7PIUBTR4K6SWJS46YZG3H2RYYNRGNEJMPV4I24TQXT5O3YT27QC","bugfix: restore state after C-f (find)"],["BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","beginnings of a module for the text editor"],["VXORMHME4X64HL6AC7BVYMSYEAYASG6RENGUZ7PEIZ4YQJ7ZHBIQC","delete experimental REPL"]],"deps":["32V6ZHQBHMVAY66WO5FAHXPY6W6PWNAURIRNN3S63YUCL5LCH4LAC","2VEIMUQXG6S776NS77WTIFFIPSA27XDTWJZZ7FW3MTS2OHLHT56AC","SXTQMD44FCYIGVEBGTZLWBZHFJL32PC3W6GCO6CXXC2DF3WV22OQC","OI4FPFINEROK6GNDEMOBTGSPYIULCLRGGT5W3H7VLM7VFH22GMWQC"],"known":["R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC","OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","6LJZN727CRPYR34LV75CQF55YZI3E7MGESYZSFSYAE73SNEZE3FAC","XX7G2FFJ4QCGQGD4REAW5QFHVYAKCFUPGZCK7L6DFGS5ISVBYBQQC","D2GCFTTT2RNUBFB243YTA4F2H5ZXFTFHBSKHLZ2CX4JSKRZFTUUQC","RSZD5A7GI5MISRTDFFJ63VUSFUFF3R7SXA66J64CBHWHNEUBMICQC","T4FRZSYLUWDA4K3URU4MI33EGD4XWSM7FPSIRNMAEYQAFEDFGPZAC","VXORMHME4X64HL6AC7BVYMSYEAYASG6RENGUZ7PEIZ4YQJ7ZHBIQC","TLOAPLBJPPBAROMWGXUK6JIFEIR222YAB4JOYCARGAYDIOZDXSBQC","BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC","FS2ITYYHBLFT66YUC3ENPFYI2HOYHOVEPQIN7NQR6KF5MEK4NKZAC","BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","SVJZZDC3K6AKAXHGRNAZKRE2ZXEKJANNLG7LSSUZJARFBL5F7C4AC","2RXZ3PGOTTZ6M4R372JXIKPLBQKPVBMAXNPIEO2HZDN4EMYW4GNAC","3QNOKBFMKBGXBVJIRHR2444JRRMBTABHE4674NR3DT67RRM2X6GAC","TVCPXAAU4P3K5MFYINH2MWDK3KGTQ2GE74TUNERYOONG2G5EYKMQC","AVTNUQYRBW7IX2YQ3KDLVQ23RGW3BAKTAE7P73ASBYNKOHMQMH5AC","KECEMMMRW2VVBZ567HJQPGLC57LTSBKWH7UFP32IW43D23X6WTEQC","ZPUQSPQPQFVRUIHGLAWW3IDBYODIWDHO62HAC3WWF5TM3CIJGHNQC","EGH7XDBKE3R74VXLNTCAP5LJTRBPFUEMPS647MJARDGCMUHJG2QQC","73OCE2MCBJJZZMN2KYPJTBOUCKBZAOQ2QIAMTGCNOOJ2AJAXFT2AC","Z4XRNDTRTGSZHNB65WNHOVUBFW4QWQABLVSK4RM3QJHGK33DMRJAC","R6GUSTBY5ZHR7E46DSIDQDNZDJI6QMZQDC7RPQMQWLGWQKXU6HVQC","NP7PIUBTR4K6SWJS46YZG3H2RYYNRGNEJMPV4I24TQXT5O3YT27QC","LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC","K464QQR4FTXFUMHFWAGOD5DJ6YHUBUKRHLXF2ORE74DVT7TVQ35QC","UN7L3DNN4Y3BCIA7SM6GYYWQG3OKVCH7ADPKAVF33E6QXY2HEJMQC","OGUV4HSA7XGSQLUVWBAE3AE263Z7Z6G3BZOB4CN2AOYD2DEJMOZAC","4YDBYBA4H77LGAJHWRKVQSUGSYFNXKINO3VHFSQLU2XE36EIGO5AC","K2X6G75Z6XBC4DVIRWC5HC7XA3A2SKOM3MWSQTCFEYWIJL7LME2QC","66X36NZNEHWWURKSZ6G3XSC4CKQ7NTR4HYGDJGLHAUELMUAQC34AC","CE4LZV4TNXJT54CVGM3QANCBP42TMLMZWF2DBSMUYKAHILXIZEMQC","HTWAM4NZFOY463TNSKYIM2EWB7QNBGDRRTTGHF5N3Z4TGC7Q3SFAC","YGCT2D2ORMLTBHANLGHZV3EBGGHD7ZK55UAM7HF2AVSHDXAAKK5QC","PX3736DXTMOKZHWGZKY446VJQ4URULLXZTG34A3JYZRDWWE5ETKAC","2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","3QQZ7W4EJ7G4HQM5IYWXICMAHVRGERY4X6AOC6LOV5NSZ4OBICSAC","LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC","LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC","Z5HLXU4PJWWJJDBCK52NBD6PIRIA3TAN2BKZB5HBYFGIDBX4F5HAC","F65ADDGLR2PNXVSM2XBHM3OSLQC2OTRR3GQBI7DJWIKPJCJ5CSOAC","WJBZZQE4A4KLYGS2KA254I6VN2DVXDY4XKCNAE76GTMLLQGYCUOQC","ODLKHO7BO2AODYO2OEQ6D4NSNBT5GR3CKLUXWMDLRYXL7DJOI7BAC","SDRXK4X5R6KBAFZTFWKTC7375HVVVPSTCDJVAYWSNUSHSKD242GQC","TXDMRA5JEAML2GF5QY4ATU22G3NI7DQWPGO4U5OZNP7NGK4JT6WQC","SPNMXTYRSNPNQJNBTYDZSHYDZVZRPM4LI5QX7GR2TLTC6SPJX4DAC","EAEGCJV5JOW46KCZKKPBFKZ4Z3SDB3X4R7TLNXFWCIQN5UCNSXFQC","MD3W5IRAC6UQALQE4LJC52VQNDO3I3HXF3XE2XHDABXBYJBUVAXQC","MUJTM6REGQAK3LZTIFWGJRXE2UPCM4HSLXQYSF5ITLXLS6JCVPMQC","E4HEHLRTRRIZZV4UMGVPG3LU4KJIPO5WFCBXHK7TG6YDURIEBVJQC","GUOQRUL75BMNH7UOZIQ7EYXKK2TMQAIU6HAKMZ75TZYB7NWSZAVQC","JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC","KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","GBSRQUT4QF5WCFVSTGSOU3BM6VCGPNBBG5WKDEGDGGCOUWTPEC2AC","5USLYLBVMNECPWJHHCFMWMLEJFPWWRXN4XQZRA22XQ752U75GYVAC","SVA7IC5OQMN72OUQ7BLBM4SKAMTZOHYNKZTYOFMW6AY4577LUCWQC","X3CQLBTR7ICDAVFZZRLAWWJZI2SNZAMRUWW7O4R25DIKDUHL75CQC","4CCBB66RZIPCP5O6TWGXZE3MVZ7WE4FN5SJOHDMPENWSRS7NWZGAC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"source_undo.lua","metadata":0},{"basename":"source_undo.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":3457,"end":3496},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":3457,"end":3496},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":3496},"to":{"change":6,"start":5,"end":5},"introduced_by":6}],"inode":{"change":6,"pos":5}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1787},"to":{"change":5,"start":1463,"end":1557},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2014},"to":{"change":5,"start":1558,"end":2260},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2260},"to":{"change":6,"start":2080,"end":3456},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1557},"to":{"change":6,"start":1787,"end":2014},"introduced_by":5}],"inode":{"change":6,"pos":5}},"content":[{"Del":" current_drawing_mode=Drawing_mode,\n previous_drawing_mode=State.previous_drawing_mode,\n"},{"Del":" if line.mode == 'text' then\n table.insert(event.lines, {mode='text', data=line.data, dataB=line.dataB})\n elseif line.mode == 'drawing' then\n local points=deepcopy(line.points)\n--? print('copying', line.points, 'with', #line.points, 'points into', points)\n local shapes=deepcopy(line.shapes)\n--? print('copying', line.shapes, 'with', #line.shapes, 'shapes into', shapes)\n table.insert(event.lines, {mode='drawing', h=line.h, points=points, shapes=shapes, pending={}})\n--? table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})\n else\n print(line.mode)\n assert(false)\n end\n"},{"Del":" end\n return event\nend\n\nfunction patch(lines, from, to)\n--? if #from.lines == 1 and #to.lines == 1 then\n--? assert(from.start_line == from.end_line)\n--? assert(to.start_line == to.end_line)\n--? assert(from.start_line == to.start_line)\n--? lines[from.start_line] = to.lines[1]\n--? return\n--? end\n assert(from.start_line == to.start_line)\n for i=from.end_line,from.start_line,-1 do\n table.remove(lines, i)\n end\n assert(#to.lines == to.end_line-to.start_line+1)\n for i=1,#to.lines do\n table.insert(lines, to.start_line+i-1, to.lines[i])\n end\nend\n\nfunction patch_placeholders(line_cache, from, to)\n assert(from.start_line == to.start_line)\n for i=from.end_line,from.start_line,-1 do\n table.remove(line_cache, i)\n end\n assert(#to.lines == to.end_line-to.start_line+1)\n for i=1,#to.lines do\n table.insert(line_cache, to.start_line+i-1, {})\n end\nend\n\n-- https://stackoverflow.com/questions/640642/how-do-you-copy-a-lua-table-by-value/26367080#26367080\nfunction deepcopy(obj, seen)\n if type(obj) ~= 'table' then return obj end\n if seen and seen[obj] then return seen[obj] end\n local s = seen or {}\n local result = setmetatable({}, getmetatable(obj))\n s[obj] = result\n for k,v in pairs(obj) do\n result[deepcopy(k, s)] = deepcopy(v, s)\n end\n return result\nend\n\nfunction minmax(a, b)\n return math.min(a,b), math.max(a,b)\nend\n"},{"Del":" lines={},\n start_line=s,\n end_line=e,\n -- no filename; undo history is cleared when filename changes\n }\n -- deep copy lines without cached stuff like text fragments\n for i=s,e do\n local line = State.lines[i]\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_text_tests.lua","metadata":0},{"basename":"source_text_tests.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":83676,"end":83721},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":83676,"end":83721},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":83721},"to":{"change":6,"start":3498,"end":3498},"introduced_by":6}],"inode":{"change":6,"pos":3498}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4179},"to":{"change":5,"start":2262,"end":3566},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":34188},"to":{"change":5,"start":3567,"end":5256},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80428},"to":{"change":5,"start":5257,"end":5331},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5331},"to":{"change":6,"start":80490,"end":83675},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5256},"to":{"change":6,"start":34188,"end":80428},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":3566},"to":{"change":6,"start":4179,"end":34188},"introduced_by":5}],"inode":{"change":6,"pos":3498}},"content":[{"Del":"end\n\nfunction test_click_to_create_drawing()\n io.write('\\ntest_click_to_create_drawing')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{}\n Text.redraw_all(Editor_state)\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)\n -- cursor skips drawing to always remain on text\n check_eq(#Editor_state.lines, 2, 'F - test_click_to_create_drawing/#lines')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_click_to_create_drawing/cursor')\nend\n\nfunction test_backspace_to_delete_drawing()\n io.write('\\ntest_backspace_to_delete_drawing')\n -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'```lines', '```', ''}\n Text.redraw_all(Editor_state)\n -- cursor is on text as always (outside tests this will get initialized correctly)\n Editor_state.cursor1.line = 2\n -- backspacing deletes the drawing\n edit.run_after_keychord(Editor_state, 'backspace')\n check_eq(#Editor_state.lines, 1, 'F - test_backspace_to_delete_drawing/#lines')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_to_delete_drawing/cursor')\n"},{"Del":"end\n\nfunction test_pagedown_skips_drawings()\n io.write('\\ntest_pagedown_skips_drawings')\n -- some lines of text with a drawing intermixed\n local drawing_width = 50\n App.screen.init{width=Editor_state.left+drawing_width, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', -- height 15\n '```lines', '```', -- height 25\n 'def', -- height 15\n 'ghi'} -- height 15\n Text.redraw_all(Editor_state)\n check_eq(Editor_state.lines[2].mode, 'drawing', 'F - test_pagedown_skips_drawings/baseline/lines')\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n local drawing_height = Drawing_padding_height + drawing_width/2 -- default\n -- initially the screen displays the first line and the drawing\n -- 15px margin + 15px line1 + 10px margin + 25px drawing + 10px margin = 75px < screen height 80px\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_pagedown_skips_drawings/baseline/screen:1')\n -- after pagedown the screen draws the drawing up top\n -- 15px margin + 10px margin + 25px drawing + 10px margin + 15px line3 = 75px < screen height 80px\n edit.run_after_keychord(Editor_state, 'pagedown')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown_skips_drawings/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_skips_drawings/cursor')\n y = Editor_state.top + drawing_height\n App.screen.check(y, 'def', 'F - test_pagedown_skips_drawings/screen:1')\n"},{"Del":" Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', 'deg'}\n"},{"Del":" Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n -- search for a string\n edit.run_after_keychord(Editor_state, 'C-f')\n edit.run_after_textinput(Editor_state, 'd')\n edit.run_after_keychord(Editor_state, 'return')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_search/1/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/1/cursor:pos')\n -- reset cursor\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n -- search for second occurrence\n edit.run_after_keychord(Editor_state, 'C-f')\n edit.run_after_textinput(Editor_state, 'de')\n edit.run_after_keychord(Editor_state, 'down')\n edit.run_after_keychord(Editor_state, 'return')\n check_eq(Editor_state.cursor1.line, 4, 'F - test_search/2/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/2/cursor:pos')\nend\n\nfunction test_search_upwards()\n io.write('\\ntest_search_upwards')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc abd'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=2}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n -- search for a string\n edit.run_after_keychord(Editor_state, 'C-f')\n edit.run_after_textinput(Editor_state, 'a')\n -- search for previous occurrence\n edit.run_after_keychord(Editor_state, 'up')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_search_upwards/2/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_upwards/2/cursor:pos')\nend\n\nfunction test_search_wrap()\n io.write('\\ntest_search_wrap')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=3}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n -- search for a string\n edit.run_after_keychord(Editor_state, 'C-f')\n edit.run_after_textinput(Editor_state, 'a')\n edit.run_after_keychord(Editor_state, 'return')\n -- cursor wraps\n check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap/1/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_wrap/1/cursor:pos')\nend\n\nfunction test_search_wrap_upwards()\n io.write('\\ntest_search_wrap_upwards')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc abd'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n -- search upwards for a string\n edit.run_after_keychord(Editor_state, 'C-f')\n edit.run_after_textinput(Editor_state, 'a')\n edit.run_after_keychord(Editor_state, 'up')\n -- cursor wraps\n check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap_upwards/1/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_search_wrap_upwards/1/cursor:pos')\nend\n"},{"Del":"end\n\nfunction test_pagedown_can_start_from_middle_of_long_wrapping_line()\n io.write('\\ntest_pagedown_can_start_from_middle_of_long_wrapping_line')\n -- draw a few lines starting from a very long wrapping line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def ghi jkl mno pqr stu vwx yza bcd efg hij', 'XYZ'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=2}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:3')\n -- after pagedown we scroll down the very long wrapping line\n edit.run_after_keychord(Editor_state, 'pagedown')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen_top:line')\n check_eq(Editor_state.screen_top1.pos, 9, 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen_top:pos')\n y = Editor_state.top\n App.screen.check(y, 'ghi ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:3')\nend\n\nfunction test_pagedown_never_moves_up()\n io.write('\\ntest_pagedown_never_moves_up')\n -- draw the final screen line of a wrapping line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def ghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=9}\n Editor_state.screen_top1 = {line=1, pos=9}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n -- pagedown makes no change\n edit.run_after_keychord(Editor_state, 'pagedown')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_pagedown_never_moves_up/screen_top:line')\n check_eq(Editor_state.screen_top1.pos, 9, 'F - test_pagedown_never_moves_up/screen_top:pos')\nend\n\nfunction test_down_arrow_moves_cursor()\n io.write('\\ntest_down_arrow_moves_cursor')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- initially the first three lines are displayed\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_down_arrow_moves_cursor/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_down_arrow_moves_cursor/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_down_arrow_moves_cursor/baseline/screen:3')\n -- after hitting the down arrow, the cursor moves down by 1 line\n edit.run_after_keychord(Editor_state, 'down')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_down_arrow_moves_cursor/screen_top')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_down_arrow_moves_cursor/cursor')\n -- the screen is unchanged\n y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_down_arrow_moves_cursor/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_down_arrow_moves_cursor/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_down_arrow_moves_cursor/screen:3')\nend\n\nfunction test_down_arrow_scrolls_down_by_one_line()\n io.write('\\ntest_down_arrow_scrolls_down_by_one_line')\n -- display the first three lines with the cursor on the bottom line\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:3')\n -- after hitting the down arrow the screen scrolls down by one line\n edit.run_after_keychord(Editor_state, 'down')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_line/screen_top')\n check_eq(Editor_state.cursor1.line, 4, 'F - test_down_arrow_scrolls_down_by_one_line/cursor')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_down_arrow_scrolls_down_by_one_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_down_arrow_scrolls_down_by_one_line/screen:3')\nend\n\nfunction test_down_arrow_scrolls_down_by_one_screen_line()\n io.write('\\ntest_down_arrow_scrolls_down_by_one_screen_line')\n -- display the first three lines with the cursor on the bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:3') -- line wrapping includes trailing whitespace\n -- after hitting the down arrow the screen scrolls down by one line\n edit.run_after_keychord(Editor_state, 'down')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:3')\nend\n\nfunction test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word()\n io.write('\\ntest_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word')\n -- display the first three lines with the cursor on the bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghijkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:3')\n -- after hitting the down arrow the screen scrolls down by one line\n edit.run_after_keychord(Editor_state, 'down')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'kl', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:3')\nend\n\nfunction test_page_down_followed_by_down_arrow_does_not_scroll_screen_up()\n io.write('\\ntest_page_down_followed_by_down_arrow_does_not_scroll_screen_up')\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghijkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghij', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')\n -- after hitting pagedown the screen scrolls down to start of a long line\n edit.run_after_keychord(Editor_state, 'pagedown')\n check_eq(Editor_state.screen_top1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos')\n -- after hitting down arrow the screen doesn't scroll down further, and certainly doesn't scroll up\n edit.run_after_keychord(Editor_state, 'down')\n check_eq(Editor_state.screen_top1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'ghij', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'kl', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:3')\nend\n\nfunction test_up_arrow_moves_cursor()\n io.write('\\ntest_up_arrow_moves_cursor')\n -- display the first 3 lines with the cursor on the bottom line\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_up_arrow_moves_cursor/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_up_arrow_moves_cursor/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_up_arrow_moves_cursor/baseline/screen:3')\n -- after hitting the up arrow the cursor moves up by 1 line\n edit.run_after_keychord(Editor_state, 'up')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_moves_cursor/screen_top')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_up_arrow_moves_cursor/cursor')\n -- the screen is unchanged\n y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_up_arrow_moves_cursor/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_up_arrow_moves_cursor/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_up_arrow_moves_cursor/screen:3')\nend\n\nfunction test_up_arrow_scrolls_up_by_one_line()\n io.write('\\ntest_up_arrow_scrolls_up_by_one_line')\n -- display the lines 2/3/4 with the cursor on line 2\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:3')\n -- after hitting the up arrow the screen scrolls up by one line\n edit.run_after_keychord(Editor_state, 'up')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_by_one_line/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_by_one_line/cursor')\n y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_by_one_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_by_one_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_by_one_line/screen:3')\nend\n\nfunction test_up_arrow_scrolls_up_by_one_screen_line()\n io.write('\\ntest_up_arrow_scrolls_up_by_one_screen_line')\n -- display lines starting from second screen line of a line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=6}\n Editor_state.screen_top1 = {line=3, pos=5}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_screen_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_by_one_screen_line/baseline/screen:2')\n -- after hitting the up arrow the screen scrolls up to first screen line\n edit.run_after_keychord(Editor_state, 'up')\n y = Editor_state.top\n App.screen.check(y, 'ghi ', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:3')\n check_eq(Editor_state.screen_top1.line, 3, 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen_top')\n check_eq(Editor_state.screen_top1.pos, 1, 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_up_arrow_scrolls_up_by_one_screen_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_up_arrow_scrolls_up_by_one_screen_line/cursor:pos')\nend\n\nfunction test_up_arrow_scrolls_up_to_final_screen_line()\n io.write('\\ntest_up_arrow_scrolls_up_to_final_screen_line')\n -- display lines starting just after a long line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def', 'ghi', 'jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:3')\n -- after hitting the up arrow the screen scrolls up to final screen line of previous line\n edit.run_after_keychord(Editor_state, 'up')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:3')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen_top')\n check_eq(Editor_state.screen_top1.pos, 5, 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_to_final_screen_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_up_arrow_scrolls_up_to_final_screen_line/cursor:pos')\nend\n\nfunction test_up_arrow_scrolls_up_to_empty_line()\n io.write('\\ntest_up_arrow_scrolls_up_to_empty_line')\n -- display a screenful of text with an empty line just above it outside the screen\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'', 'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:3')\n -- after hitting the up arrow the screen scrolls up by one line\n edit.run_after_keychord(Editor_state, 'up')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_to_empty_line/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_to_empty_line/cursor')\n y = Editor_state.top\n -- empty first line\n y = y + Editor_state.line_height\n App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_to_empty_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_empty_line/screen:3')\nend\n\nfunction test_pageup()\n io.write('\\ntest_pageup')\n App.screen.init{width=120, height=45}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n -- initially the last two lines are displayed\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_pageup/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_pageup/baseline/screen:2')\n -- after pageup the cursor goes to first line\n edit.run_after_keychord(Editor_state, 'pageup')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup/cursor')\n y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_pageup/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_pageup/screen:2')\nend\n\nfunction test_pageup_scrolls_up_by_screen_line()\n io.write('\\ntest_pageup_scrolls_up_by_screen_line')\n -- display the first three lines with the cursor on the bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def', 'ghi', 'jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'ghi', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:3') -- line wrapping includes trailing whitespace\n -- after hitting the page-up key the screen scrolls up to top\n edit.run_after_keychord(Editor_state, 'pageup')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup_scrolls_up_by_screen_line/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup_scrolls_up_by_screen_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_pageup_scrolls_up_by_screen_line/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'abc ', 'F - test_pageup_scrolls_up_by_screen_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_pageup_scrolls_up_by_screen_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_pageup_scrolls_up_by_screen_line/screen:3')\nend\n\nfunction test_pageup_scrolls_up_from_middle_screen_line()\n io.write('\\ntest_pageup_scrolls_up_from_middle_screen_line')\n -- display a few lines starting from the middle of a line (Editor_state.cursor1.pos > 1)\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=5}\n Editor_state.screen_top1 = {line=2, pos=5}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'jkl', 'F - test_pageup_scrolls_up_from_middle_screen_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_pageup_scrolls_up_from_middle_screen_line/baseline/screen:3') -- line wrapping includes trailing whitespace\n -- after hitting the page-up key the screen scrolls up to top\n edit.run_after_keychord(Editor_state, 'pageup')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'abc ', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:3')\nend\n\nfunction test_enter_on_bottom_line_scrolls_down()\n io.write('\\ntest_enter_on_bottom_line_scrolls_down')\n -- display a few lines with cursor on bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=2}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_enter_on_bottom_line_scrolls_down/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_enter_on_bottom_line_scrolls_down/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_enter_on_bottom_line_scrolls_down/baseline/screen:3')\n -- after hitting the enter key the screen scrolls down\n edit.run_after_keychord(Editor_state, 'return')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_enter_on_bottom_line_scrolls_down/screen_top')\n check_eq(Editor_state.cursor1.line, 4, 'F - test_enter_on_bottom_line_scrolls_down/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_enter_on_bottom_line_scrolls_down/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_enter_on_bottom_line_scrolls_down/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'g', 'F - test_enter_on_bottom_line_scrolls_down/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'hi', 'F - test_enter_on_bottom_line_scrolls_down/screen:3')\nend\n\nfunction test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom()\n io.write('\\ntest_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom')\n -- display just the bottom line on screen\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=4, pos=2}\n Editor_state.screen_top1 = {line=4, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'jkl', 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/baseline/screen:1')\n -- after hitting the enter key the screen does not scroll down\n edit.run_after_keychord(Editor_state, 'return')\n check_eq(Editor_state.screen_top1.line, 4, 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen_top')\n check_eq(Editor_state.cursor1.line, 5, 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'j', 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'kl', 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen:2')\nend\n\nfunction test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom()\n io.write('\\ntest_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom')\n -- display just an empty bottom line on screen\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', ''}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n -- after hitting the inserting_text key the screen does not scroll down\n edit.run_after_textinput(Editor_state, 'a')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen_top')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:line')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:pos')\n local y = Editor_state.top\n App.screen.check(y, 'a', 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen:1')\nend\n\nfunction test_typing_on_bottom_line_scrolls_down()\n io.write('\\ntest_typing_on_bottom_line_scrolls_down')\n -- display a few lines with cursor on bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=4}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_typing_on_bottom_line_scrolls_down/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_typing_on_bottom_line_scrolls_down/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_typing_on_bottom_line_scrolls_down/baseline/screen:3')\n -- after typing something the line wraps and the screen scrolls down\n edit.run_after_textinput(Editor_state, 'j')\n edit.run_after_textinput(Editor_state, 'k')\n edit.run_after_textinput(Editor_state, 'l')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_typing_on_bottom_line_scrolls_down/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_typing_on_bottom_line_scrolls_down/cursor:line')\n check_eq(Editor_state.cursor1.pos, 7, 'F - test_typing_on_bottom_line_scrolls_down/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_typing_on_bottom_line_scrolls_down/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghij', 'F - test_typing_on_bottom_line_scrolls_down/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'kl', 'F - test_typing_on_bottom_line_scrolls_down/screen:3')\nend\n\nfunction test_left_arrow_scrolls_up_in_wrapped_line()\n io.write('\\ntest_left_arrow_scrolls_up_in_wrapped_line')\n -- display lines starting from second screen line of a line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.screen_top1 = {line=3, pos=5}\n Editor_state.screen_bottom1 = {}\n -- cursor is at top of screen\n Editor_state.cursor1 = {line=3, pos=5}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'jkl', 'F - test_left_arrow_scrolls_up_in_wrapped_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_left_arrow_scrolls_up_in_wrapped_line/baseline/screen:2')\n -- after hitting the left arrow the screen scrolls up to first screen line\n edit.run_after_keychord(Editor_state, 'left')\n y = Editor_state.top\n App.screen.check(y, 'ghi ', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:3')\n check_eq(Editor_state.screen_top1.line, 3, 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen_top')\n check_eq(Editor_state.screen_top1.pos, 1, 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_left_arrow_scrolls_up_in_wrapped_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_left_arrow_scrolls_up_in_wrapped_line/cursor:pos')\nend\n\nfunction test_right_arrow_scrolls_down_in_wrapped_line()\n io.write('\\ntest_right_arrow_scrolls_down_in_wrapped_line')\n -- display the first three lines with the cursor on the bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- cursor is at bottom right of screen\n Editor_state.cursor1 = {line=3, pos=5}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:3') -- line wrapping includes trailing whitespace\n -- after hitting the right arrow the screen scrolls down by one line\n edit.run_after_keychord(Editor_state, 'right')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_right_arrow_scrolls_down_in_wrapped_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 6, 'F - test_right_arrow_scrolls_down_in_wrapped_line/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:3')\nend\n\nfunction test_home_scrolls_up_in_wrapped_line()\n io.write('\\ntest_home_scrolls_up_in_wrapped_line')\n -- display lines starting from second screen line of a line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.screen_top1 = {line=3, pos=5}\n Editor_state.screen_bottom1 = {}\n -- cursor is at top of screen\n Editor_state.cursor1 = {line=3, pos=5}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'jkl', 'F - test_home_scrolls_up_in_wrapped_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_home_scrolls_up_in_wrapped_line/baseline/screen:2')\n -- after hitting home the screen scrolls up to first screen line\n edit.run_after_keychord(Editor_state, 'home')\n y = Editor_state.top\n App.screen.check(y, 'ghi ', 'F - test_home_scrolls_up_in_wrapped_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_home_scrolls_up_in_wrapped_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_home_scrolls_up_in_wrapped_line/screen:3')\n check_eq(Editor_state.screen_top1.line, 3, 'F - test_home_scrolls_up_in_wrapped_line/screen_top')\n check_eq(Editor_state.screen_top1.pos, 1, 'F - test_home_scrolls_up_in_wrapped_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_home_scrolls_up_in_wrapped_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_home_scrolls_up_in_wrapped_line/cursor:pos')\nend\n\nfunction test_end_scrolls_down_in_wrapped_line()\n io.write('\\ntest_end_scrolls_down_in_wrapped_line')\n -- display the first three lines with the cursor on the bottom line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- cursor is at bottom right of screen\n Editor_state.cursor1 = {line=3, pos=5}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:3') -- line wrapping includes trailing whitespace\n -- after hitting end the screen scrolls down by one line\n edit.run_after_keychord(Editor_state, 'end')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_end_scrolls_down_in_wrapped_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_end_scrolls_down_in_wrapped_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 8, 'F - test_end_scrolls_down_in_wrapped_line/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_end_scrolls_down_in_wrapped_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi ', 'F - test_end_scrolls_down_in_wrapped_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_end_scrolls_down_in_wrapped_line/screen:3')\nend\n\nfunction test_position_cursor_on_recently_edited_wrapping_line()\n -- draw a line wrapping over 2 screen lines\n io.write('\\ntest_position_cursor_on_recently_edited_wrapping_line')\n App.screen.init{width=100, height=200}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def ghi jkl mno pqr ', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=25}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc def ghi ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline1/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl mno pqr ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline1/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'xyz', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline1/screen:3')\n -- add to the line until it's wrapping over 3 screen lines\n edit.run_after_textinput(Editor_state, 's')\n edit.run_after_textinput(Editor_state, 't')\n edit.run_after_textinput(Editor_state, 'u')\n check_eq(Editor_state.cursor1.pos, 28, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'abc def ghi ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline2/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl mno pqr ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline2/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'stu', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline2/screen:3')\n -- try to move the cursor earlier in the third screen line by clicking the mouse\n edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height*2+5, 1)\n -- cursor should move\n check_eq(Editor_state.cursor1.line, 1, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 26, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')\nend\n\nfunction test_backspace_can_scroll_up()\n io.write('\\ntest_backspace_can_scroll_up')\n -- display the lines 2/3/4 with the cursor on line 2\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_backspace_can_scroll_up/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_backspace_can_scroll_up/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_backspace_can_scroll_up/baseline/screen:3')\n -- after hitting backspace the screen scrolls up by one line\n edit.run_after_keychord(Editor_state, 'backspace')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_backspace_can_scroll_up/screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_can_scroll_up/cursor')\n y = Editor_state.top\n App.screen.check(y, 'abcdef', 'F - test_backspace_can_scroll_up/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_backspace_can_scroll_up/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'F - test_backspace_can_scroll_up/screen:3')\nend\n\nfunction test_backspace_can_scroll_up_screen_line()\n io.write('\\ntest_backspace_can_scroll_up_screen_line')\n -- display lines starting from second screen line of a line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi jkl', 'mno'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=5}\n Editor_state.screen_top1 = {line=3, pos=5}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'jkl', 'F - test_backspace_can_scroll_up_screen_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_backspace_can_scroll_up_screen_line/baseline/screen:2')\n -- after hitting backspace the screen scrolls up by one screen line\n edit.run_after_keychord(Editor_state, 'backspace')\n y = Editor_state.top\n App.screen.check(y, 'ghij', 'F - test_backspace_can_scroll_up_screen_line/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'kl', 'F - test_backspace_can_scroll_up_screen_line/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'mno', 'F - test_backspace_can_scroll_up_screen_line/screen:3')\n check_eq(Editor_state.screen_top1.line, 3, 'F - test_backspace_can_scroll_up_screen_line/screen_top')\n check_eq(Editor_state.screen_top1.pos, 1, 'F - test_backspace_can_scroll_up_screen_line/screen_top')\n check_eq(Editor_state.cursor1.line, 3, 'F - test_backspace_can_scroll_up_screen_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_backspace_can_scroll_up_screen_line/cursor:pos')\nend\n\nfunction test_backspace_past_line_boundary()\n io.write('\\ntest_backspace_past_line_boundary')\n -- position cursor at start of a (non-first) line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n -- backspace joins with previous line\n edit.run_after_keychord(Editor_state, 'backspace')\n check_eq(Editor_state.lines[1].data, 'abcdef', \"F - test_backspace_past_line_boundary\")\nend\n\nfunction test_undo_insert_text()\n io.write('\\ntest_undo_insert_text')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=4}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- insert a character\n edit.draw(Editor_state)\n edit.run_after_textinput(Editor_state, 'g')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_insert_text/baseline/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_undo_insert_text/baseline/cursor:pos')\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_undo_insert_text/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'defg', 'F - test_undo_insert_text/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'xyz', 'F - test_undo_insert_text/baseline/screen:3')\n -- undo\n edit.run_after_keychord(Editor_state, 'C-z')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_insert_text/cursor:line')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_undo_insert_text/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_undo_insert_text/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_undo_insert_text/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'xyz', 'F - test_undo_insert_text/screen:3')\nend\n\nfunction test_undo_delete_text()\n io.write('\\ntest_undo_delete_text')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'defg', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=5}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- delete a character\n edit.run_after_keychord(Editor_state, 'backspace')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_delete_text/baseline/cursor:line')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_undo_delete_text/baseline/cursor:pos')\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_undo_delete_text/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_undo_delete_text/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'xyz', 'F - test_undo_delete_text/baseline/screen:3')\n -- undo\n--? -- after undo, the backspaced key is selected\n edit.run_after_keychord(Editor_state, 'C-z')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_delete_text/cursor:line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_undo_delete_text/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_undo_delete_text/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'defg', 'F - test_undo_delete_text/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'xyz', 'F - test_undo_delete_text/screen:3')\nend\n\nfunction test_search()\n io.write('\\ntest_search')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n"},{"Del":"end\n\nfunction test_backspace_from_start_of_final_line()\n io.write('\\ntest_backspace_from_start_of_final_line')\n -- display final line of text with cursor at start of it\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def'}\n Editor_state.screen_top1 = {line=2, pos=1}\n Editor_state.cursor1 = {line=2, pos=1}\n Text.redraw_all(Editor_state)\n -- backspace scrolls up\n edit.run_after_keychord(Editor_state, 'backspace')\n check_eq(#Editor_state.lines, 1, 'F - test_backspace_from_start_of_final_line/#lines')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_from_start_of_final_line/cursor')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_backspace_from_start_of_final_line/screen_top')\nend\n\nfunction test_insert_first_character()\n io.write('\\ntest_insert_first_character')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{}\n Text.redraw_all(Editor_state)\n edit.draw(Editor_state)\n edit.run_after_textinput(Editor_state, 'a')\n local y = Editor_state.top\n App.screen.check(y, 'a', 'F - test_insert_first_character/screen:1')\nend\n\nfunction test_press_ctrl()\n io.write('\\ntest_press_ctrl')\n -- press ctrl while the cursor is on text\n App.screen.init{width=50, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{''}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.run_after_keychord(Editor_state, 'C-m')\nend\n\nfunction test_move_left()\n io.write('\\ntest_move_left')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'a'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=2}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'left')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_left')\nend\n\nfunction test_move_right()\n io.write('\\ntest_move_right')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'a'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'right')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_right')\nend\n\nfunction test_move_left_to_previous_line()\n io.write('\\ntest_move_left_to_previous_line')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'left')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_move_left_to_previous_line/line')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_left_to_previous_line/pos') -- past end of line\nend\n\nfunction test_move_right_to_next_line()\n io.write('\\ntest_move_right_to_next_line')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=4} -- past end of line\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'right')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_move_right_to_next_line/line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_right_to_next_line/pos')\nend\n\nfunction test_move_to_start_of_word()\n io.write('\\ntest_move_to_start_of_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=3}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-left')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_to_start_of_word')\nend\n\nfunction test_move_to_start_of_previous_word()\n io.write('\\ntest_move_to_start_of_previous_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=4} -- at the space between words\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-left')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_to_start_of_previous_word')\nend\n\nfunction test_skip_to_previous_word()\n io.write('\\ntest_skip_to_previous_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=5} -- at the start of second word\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-left')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_skip_to_previous_word')\nend\n\nfunction test_skip_past_tab_to_previous_word()\n io.write('\\ntest_skip_past_tab_to_previous_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def\\tghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=10} -- within third word\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-left')\n check_eq(Editor_state.cursor1.pos, 9, 'F - test_skip_past_tab_to_previous_word')\nend\n\nfunction test_skip_multiple_spaces_to_previous_word()\n io.write('\\ntest_skip_multiple_spaces_to_previous_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=6} -- at the start of second word\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-left')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_skip_multiple_spaces_to_previous_word')\nend\n\nfunction test_move_to_start_of_word_on_previous_line()\n io.write('\\ntest_move_to_start_of_word_on_previous_line')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def', 'ghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-left')\n check_eq(Editor_state.cursor1.line, 1, 'F - test_move_to_start_of_word_on_previous_line/line')\n check_eq(Editor_state.cursor1.pos, 5, 'F - test_move_to_start_of_word_on_previous_line/pos')\nend\n\nfunction test_move_past_end_of_word()\n io.write('\\ntest_move_past_end_of_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-right')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_past_end_of_word')\nend\n\nfunction test_skip_to_next_word()\n io.write('\\ntest_skip_to_next_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=4} -- at the space between words\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-right')\n check_eq(Editor_state.cursor1.pos, 8, 'F - test_skip_to_next_word')\nend\n\nfunction test_skip_past_tab_to_next_word()\n io.write('\\ntest_skip_past_tab_to_next_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc\\tdef'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1} -- at the space between words\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-right')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_skip_past_tab_to_next_word')\nend\n\nfunction test_skip_multiple_spaces_to_next_word()\n io.write('\\ntest_skip_multiple_spaces_to_next_word')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=4} -- at the start of second word\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-right')\n check_eq(Editor_state.cursor1.pos, 9, 'F - test_skip_multiple_spaces_to_next_word')\nend\n\nfunction test_move_past_end_of_word_on_next_line()\n io.write('\\ntest_move_past_end_of_word_on_next_line')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def', 'ghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=8}\n edit.draw(Editor_state)\n edit.run_after_keychord(Editor_state, 'M-right')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_move_past_end_of_word_on_next_line/line')\n check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_past_end_of_word_on_next_line/pos')\nend\n\nfunction test_click_with_mouse()\n io.write('\\ntest_click_with_mouse')\n -- display two lines with cursor on one of them\n App.screen.init{width=50, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- click on the other line\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)\n -- cursor moves\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse/cursor:line')\nend\n\nfunction test_click_with_mouse_to_left_of_line()\n io.write('\\ntest_click_with_mouse_to_left_of_line')\n -- display a line with the cursor in the middle\n App.screen.init{width=50, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=3}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- click to the left of the line\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, Editor_state.left-4,Editor_state.top+5, 1)\n -- cursor moves to start of line\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_to_left_of_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_with_mouse_to_left_of_line/cursor:pos')\nend\n\nfunction test_click_with_mouse_takes_margins_into_account()\n io.write('\\ntest_click_with_mouse_takes_margins_into_account')\n -- display two lines with cursor on one of them\n App.screen.init{width=100, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.left = 50 -- occupy only right side of screen\n Editor_state.lines = load_array{'abc', 'def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- click on the other line\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)\n -- cursor moves\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_takes_margins_into_account/cursor:line')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_takes_margins_into_account/cursor:pos')\nend\n\nfunction test_click_with_mouse_on_empty_line()\n io.write('\\ntest_click_with_mouse_on_empty_line')\n -- display two lines with the first one empty\n App.screen.init{width=50, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'', 'def'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- click on the empty line\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)\n -- cursor moves\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_on_empty_line/cursor')\nend\n\nfunction test_draw_text()\n io.write('\\ntest_draw_text')\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_draw_text/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_draw_text/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_draw_text/screen:3')\nend\n\nfunction test_draw_wrapping_text()\n io.write('\\ntest_draw_wrapping_text')\n App.screen.init{width=50, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_draw_wrapping_text/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'de', 'F - test_draw_wrapping_text/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'fgh', 'F - test_draw_wrapping_text/screen:3')\nend\n\nfunction test_draw_word_wrapping_text()\n io.write('\\ntest_draw_word_wrapping_text')\n App.screen.init{width=60, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc ', 'F - test_draw_word_wrapping_text/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def ', 'F - test_draw_word_wrapping_text/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_draw_word_wrapping_text/screen:3')\nend\n\nfunction test_click_with_mouse_on_wrapping_line()\n io.write('\\ntest_click_with_mouse_on_wrapping_line')\n -- display two lines with cursor on one of them\n App.screen.init{width=50, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc def ghi jkl mno pqr stu'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=20}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- click on the other line\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)\n -- cursor moves\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_on_wrapping_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_on_wrapping_line/cursor:pos')\nend\n\nfunction test_click_with_mouse_on_wrapping_line_takes_margins_into_account()\n io.write('\\ntest_click_with_mouse_on_wrapping_line_takes_margins_into_account')\n -- display two lines with cursor on one of them\n App.screen.init{width=100, height=80}\n Editor_state = edit.initialize_test_state()\n Editor_state.left = 50 -- occupy only right side of screen\n Editor_state.lines = load_array{'abc def ghi jkl mno pqr stu'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=20}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- click on the other line\n edit.draw(Editor_state)\n edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)\n -- cursor moves\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/cursor:line')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/cursor:pos')\nend\n\nfunction test_draw_text_wrapping_within_word()\n -- arrange a screen line that needs to be split within a word\n io.write('\\ntest_draw_text_wrapping_within_word')\n App.screen.init{width=60, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abcd e fghijk', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abcd ', 'F - test_draw_text_wrapping_within_word/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'e fgh', 'F - test_draw_text_wrapping_within_word/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ijk', 'F - test_draw_text_wrapping_within_word/screen:3')\nend\n\nfunction test_draw_wrapping_text_containing_non_ascii()\n -- draw a long line containing non-ASCII\n io.write('\\ntest_draw_wrapping_text_containing_non_ascii')\n App.screen.init{width=60, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'madam I’m adam', 'xyz'} -- notice the non-ASCII apostrophe\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'mad', 'F - test_draw_wrapping_text_containing_non_ascii/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'am I', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, '’m a', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3')\nend\n\nfunction test_click_on_wrapping_line()\n io.write('\\ntest_click_on_wrapping_line')\n -- display a wrapping line\n App.screen.init{width=75, height=80}\n Editor_state = edit.initialize_test_state()\n -- 12345678901234\n Editor_state.lines = load_array{\"madam I'm adam\"}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'madam ', 'F - test_click_on_wrapping_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, \"I'm ad\", 'F - test_click_on_wrapping_line/baseline/screen:2')\n y = y + Editor_state.line_height\n -- click past end of second screen line\n edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)\n -- cursor moves to end of screen line\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line/cursor:pos')\nend\n\nfunction test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen()\n io.write('\\ntest_click_on_wrapping_line_rendered_from_partway_at_top_of_screen')\n -- display a wrapping line from its second screen line\n App.screen.init{width=75, height=80}\n Editor_state = edit.initialize_test_state()\n -- 12345678901234\n Editor_state.lines = load_array{\"madam I'm adam\"}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=8}\n Editor_state.screen_top1 = {line=1, pos=7}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, \"I'm ad\", 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/baseline/screen:2')\n y = y + Editor_state.line_height\n -- click past end of second screen line\n edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)\n -- cursor moves to end of screen line\n check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:line')\n check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:pos')\nend\n\nfunction test_click_past_end_of_wrapping_line()\n io.write('\\ntest_click_past_end_of_wrapping_line')\n -- display a wrapping line\n App.screen.init{width=75, height=80}\n Editor_state = edit.initialize_test_state()\n -- 12345678901234\n Editor_state.lines = load_array{\"madam I'm adam\"}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, \"I'm ad\", 'F - test_click_past_end_of_wrapping_line/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line/baseline/screen:3')\n y = y + Editor_state.line_height\n -- click past the end of it\n edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)\n -- cursor moves to end of line\n check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line/cursor') -- one more than the number of UTF-8 code-points\nend\n\nfunction test_click_past_end_of_wrapping_line_containing_non_ascii()\n io.write('\\ntest_click_past_end_of_wrapping_line_containing_non_ascii')\n -- display a wrapping line containing non-ASCII\n App.screen.init{width=75, height=80}\n Editor_state = edit.initialize_test_state()\n -- 12345678901234\n Editor_state.lines = load_array{'madam I’m adam'} -- notice the non-ASCII apostrophe\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'I’m ad', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:3')\n y = y + Editor_state.line_height\n -- click past the end of it\n edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)\n -- cursor moves to end of line\n check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/cursor') -- one more than the number of UTF-8 code-points\nend\n\nfunction test_click_past_end_of_word_wrapping_line()\n io.write('\\ntest_click_past_end_of_word_wrapping_line')\n -- display a long line wrapping at a word boundary on a screen of more realistic length\n App.screen.init{width=160, height=80}\n Editor_state = edit.initialize_test_state()\n -- 0 1 2\n -- 123456789012345678901\n Editor_state.lines = load_array{'the quick brown fox jumped over the lazy dog'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'the quick brown fox ', 'F - test_click_past_end_of_word_wrapping_line/baseline/screen:1')\n y = y + Editor_state.line_height\n -- click past the end of the screen line\n edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)\n -- cursor moves to end of screen line\n check_eq(Editor_state.cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')\nend\n\nfunction test_edit_wrapping_text()\n io.write('\\ntest_edit_wrapping_text')\n App.screen.init{width=50, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=2, pos=4}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n edit.run_after_textinput(Editor_state, 'g')\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_edit_wrapping_text/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'de', 'F - test_edit_wrapping_text/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'fg', 'F - test_edit_wrapping_text/screen:3')\nend\n\nfunction test_insert_newline()\n io.write('\\ntest_insert_newline')\n -- display a few lines\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=2}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_insert_newline/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_insert_newline/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_insert_newline/baseline/screen:3')\n -- hitting the enter key splits the line\n edit.run_after_keychord(Editor_state, 'return')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_insert_newline/screen_top')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_insert_newline/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_insert_newline/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'a', 'F - test_insert_newline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'bc', 'F - test_insert_newline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_insert_newline/screen:3')\nend\n\nfunction test_insert_newline_at_start_of_line()\n io.write('\\ntest_insert_newline_at_start_of_line')\n -- display a line\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- hitting the enter key splits the line\n edit.run_after_keychord(Editor_state, 'return')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_insert_newline_at_start_of_line/cursor:line')\n check_eq(Editor_state.cursor1.pos, 1, 'F - test_insert_newline_at_start_of_line/cursor:pos')\n check_eq(Editor_state.lines[1].data, '', 'F - test_insert_newline_at_start_of_line/data:1')\n check_eq(Editor_state.lines[2].data, 'abc', 'F - test_insert_newline_at_start_of_line/data:2')\nend\n\nfunction test_insert_from_clipboard()\n io.write('\\ntest_insert_from_clipboard')\n -- display a few lines\n App.screen.init{width=Editor_state.left+30, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=2}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_insert_from_clipboard/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_insert_from_clipboard/baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_insert_from_clipboard/baseline/screen:3')\n -- paste some text including a newline, check that new line is created\n App.clipboard = 'xy\\nz'\n edit.run_after_keychord(Editor_state, 'C-v')\n check_eq(Editor_state.screen_top1.line, 1, 'F - test_insert_from_clipboard/screen_top')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_insert_from_clipboard/cursor:line')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_insert_from_clipboard/cursor:pos')\n y = Editor_state.top\n App.screen.check(y, 'axy', 'F - test_insert_from_clipboard/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'zbc', 'F - test_insert_from_clipboard/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_insert_from_clipboard/screen:3')\nend\n\nfunction test_move_cursor_using_mouse()\n io.write('\\ntest_move_cursor_using_mouse')\n App.screen.init{width=50, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'xyz'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state) -- populate line_cache.starty for each line Editor_state.line_cache\n edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)\n check_eq(Editor_state.cursor1.line, 1, 'F - test_move_cursor_using_mouse/cursor:line')\n check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_cursor_using_mouse/cursor:pos')\nend\n\nfunction test_pagedown()\n io.write('\\ntest_pagedown')\n App.screen.init{width=120, height=45}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', 'def', 'ghi'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=1, pos=1}\n Editor_state.screen_top1 = {line=1, pos=1}\n Editor_state.screen_bottom1 = {}\n -- initially the first two lines are displayed\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'abc', 'F - test_pagedown/baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'def', 'F - test_pagedown/baseline/screen:2')\n -- after pagedown the bottom line becomes the top\n edit.run_after_keychord(Editor_state, 'pagedown')\n check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown/screen_top')\n check_eq(Editor_state.cursor1.line, 2, 'F - test_pagedown/cursor')\n y = Editor_state.top\n App.screen.check(y, 'def', 'F - test_pagedown/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'F - test_pagedown/screen:2')\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_text.lua","metadata":0},{"basename":"source_text.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":147062,"end":147101},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":147062,"end":147101},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":147101},"to":{"change":6,"start":83723,"end":83723},"introduced_by":6}],"inode":{"change":6,"pos":83723}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":91485},"to":{"change":5,"start":5333,"end":5374},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":92319},"to":{"change":5,"start":5375,"end":5416},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":101765},"to":{"change":5,"start":5417,"end":5961},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":104895},"to":{"change":5,"start":5962,"end":6308},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":106902},"to":{"change":5,"start":6309,"end":6489},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":107889},"to":{"change":5,"start":6490,"end":6769},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":108572},"to":{"change":5,"start":6770,"end":6889},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":109127},"to":{"change":5,"start":6890,"end":6947},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":109599},"to":{"change":5,"start":6948,"end":8019},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":111628},"to":{"change":5,"start":8020,"end":8919},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":114836},"to":{"change":5,"start":8920,"end":8977},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115146},"to":{"change":5,"start":8978,"end":9404},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118525},"to":{"change":5,"start":9405,"end":9512},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":122940},"to":{"change":5,"start":9513,"end":9867},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":123998},"to":{"change":5,"start":9868,"end":9925},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124285},"to":{"change":5,"start":9926,"end":10213},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124571},"to":{"change":5,"start":10214,"end":10221},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124655},"to":{"change":5,"start":10222,"end":10502},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126718},"to":{"change":5,"start":10503,"end":11230},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127996},"to":{"change":5,"start":11231,"end":11827},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":139891},"to":{"change":5,"start":11828,"end":11942},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11942},"to":{"change":6,"start":139891,"end":142635},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11827},"to":{"change":6,"start":128070,"end":128078},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11230},"to":{"change":6,"start":126778,"end":127996},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10502},"to":{"change":6,"start":124710,"end":126718},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10221},"to":{"change":6,"start":124622,"end":124655},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10213},"to":{"change":6,"start":124391,"end":124571},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9925},"to":{"change":6,"start":123998,"end":124285},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9867},"to":{"change":6,"start":123106,"end":123998},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9512},"to":{"change":6,"start":118591,"end":122940},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9404},"to":{"change":6,"start":115402,"end":118525},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8977},"to":{"change":6,"start":114836,"end":115146},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8919},"to":{"change":6,"start":112363,"end":114836},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8019},"to":{"change":6,"start":110479,"end":111628},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":6947},"to":{"change":6,"start":109127,"end":109599},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":6889},"to":{"change":6,"start":108659,"end":109127},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":6769},"to":{"change":6,"start":107919,"end":108572},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":6489},"to":{"change":6,"start":107069,"end":107889},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":6308},"to":{"change":6,"start":105160,"end":106902},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5961},"to":{"change":6,"start":102095,"end":104895},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5416},"to":{"change":6,"start":92319,"end":101765},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5374},"to":{"change":6,"start":91485,"end":92319},"introduced_by":5}],"inode":{"change":6,"pos":83723}},"content":[{"Del":" if line.mode ~= 'text' then return end\n"},{"Del":" if line.mode ~= 'text' then return end\n"},{"Del":" if State.lines[State.cursor1.line-1].mode == 'drawing' then\n table.remove(State.lines, State.cursor1.line-1)\n table.remove(State.line_cache, State.cursor1.line-1)\n else\n -- join lines\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1\n State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data\n table.remove(State.lines, State.cursor1.line)\n table.remove(State.line_cache, State.cursor1.line)\n end\n"},{"Del":" if State.lines[State.cursor1.line+1].mode == 'text' then\n -- join lines\n State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data\n -- delete side B on first line\n State.lines[State.cursor1.line].dataB = State.lines[State.cursor1.line+1].dataB\n end\n"},{"Del":" table.insert(State.lines, State.cursor1.line+1, {mode='text', data=string.sub(State.lines[State.cursor1.line].data, byte_offset), dataB=State.lines[State.cursor1.line].dataB})\n"},{"Del":" if State.lines[State.screen_top1.line].mode == 'text' then\n y = y - State.line_height\n elseif State.lines[State.screen_top1.line].mode == 'drawing' then\n y = y - Drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width)\n end\n"},{"Del":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos, posB=State.screen_bottom1.posB}\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text')\n"},{"Del":" local new_cursor_line = State.cursor1.line\n while new_cursor_line > 1 do\n new_cursor_line = new_cursor_line-1\n if State.lines[new_cursor_line].mode == 'text' then\n--? print('found previous text line')\n State.cursor1 = {line=State.cursor1.line-1, pos=nil}\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n -- previous text line found, pick its final screen line\n--? print('has multiple screen lines')\n local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos\n--? print(#screen_line_starting_pos)\n screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]\n local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)\n State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n break\n end\n"},{"Del":" local new_cursor_line = State.cursor1.line\n while new_cursor_line > 1 do\n new_cursor_line = new_cursor_line-1\n if State.lines[new_cursor_line].mode == 'text' then\n State.cursor1 = {line=State.cursor1.line-1, posB=nil}\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n local prev_line_cache = State.line_cache[State.cursor1.line]\n local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]\n local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)\n State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n break\n end\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text')\n"},{"Del":" local new_cursor_line = State.cursor1.line\n while new_cursor_line < #State.lines do\n new_cursor_line = new_cursor_line+1\n if State.lines[new_cursor_line].mode == 'text' then\n State.cursor1 = {\n line = new_cursor_line,\n pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),\n }\n--? print(State.cursor1.pos)\n break\n end\n"},{"Del":" State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB} -- copy\n"},{"Del":" else\n local new_cursor_line = State.cursor1.line\n while new_cursor_line > 1 do\n new_cursor_line = new_cursor_line-1\n if State.lines[new_cursor_line].mode == 'text' then\n State.cursor1 = {\n line = new_cursor_line,\n pos = utf8.len(State.lines[new_cursor_line].data) + 1,\n }\n break\n end\n end\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text')\n"},{"Del":" else\n local new_cursor_line = State.cursor1.line\n while new_cursor_line <= #State.lines-1 do\n new_cursor_line = new_cursor_line+1\n if State.lines[new_cursor_line].mode == 'text' then\n State.cursor1 = {line=new_cursor_line, pos=1}\n break\n end\n end\n"},{"Del":" else\n"},{"Del":" local new_cursor_line = State.cursor1.line\n while new_cursor_line <= #State.lines-1 do\n new_cursor_line = new_cursor_line+1\n if State.lines[new_cursor_line].mode == 'text' then\n State.cursor1 = {line=new_cursor_line, pos=1}\n break\n end\n end\n"},{"Del":" local y = State.top\n while State.cursor1.line <= #State.lines do\n if State.lines[State.cursor1.line].mode == 'text' then\n break\n end\n--? print('cursor skips', State.cursor1.line)\n y = y + Drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h, State.width)\n State.cursor1.line = State.cursor1.line + 1\n end\n -- hack: insert a text line at bottom of file if necessary\n if State.cursor1.line > #State.lines then\n assert(State.cursor1.line == #State.lines+1)\n table.insert(State.lines, {mode='text', data=''})\n table.insert(State.line_cache, {})\n end\n--? print(y, App.screen.height, App.screen.height-State.line_height)\n if y > App.screen.height - State.line_height then\n"},{"Del":" if top2.screen_line > 1 or State.lines[top2.line-1].mode == 'text' then\n local h = State.line_height\n if y - h < State.top then\n break\n end\n y = y - h\n else\n assert(top2.line > 1)\n assert(State.lines[top2.line-1].mode == 'drawing')\n -- We currently can't draw partial drawings, so either skip it entirely\n -- or not at all.\n local h = Drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width)\n if y - h < State.top then\n break\n end\n--? print('skipping drawing of height', h)\n y = y - h\n"},{"Del":" if State.lines[loc1.line].mode == 'drawing' then\n return {line=loc1.line, screen_line=1, screen_pos=1}\n end\n"},{"Del":" if loc1.pos then\n return Text.to2A(State, loc1)\n else\n return Text.to2B(State, loc1)\n end\nend\n\nfunction Text.to2A(State, loc1)\n local result = {line=loc1.line}\n local line_cache = State.line_cache[loc1.line]\n Text.populate_screen_line_starting_pos(State, loc1.line)\n for i=#line_cache.screen_line_starting_pos,1,-1 do\n local spos = line_cache.screen_line_starting_pos[i]\n if spos <= loc1.pos then\n result.screen_line = i\n result.screen_pos = loc1.pos - spos + 1\n break\n end\n end\n assert(result.screen_pos)\n return result\nend\n\nfunction Text.to2B(State, loc1)\n local result = {line=loc1.line}\n local line_cache = State.line_cache[loc1.line]\n Text.populate_screen_line_starting_pos(State, loc1.line)\n local x = Margin_left + Text.screen_line_width(State, loc1.line, #line_cache.screen_line_starting_pos) + AB_padding\n Text.populate_screen_line_starting_posB(State, loc1.line, x)\n for i=#line_cache.screen_line_starting_posB,1,-1 do\n local sposB = line_cache.screen_line_starting_posB[i]\n if sposB <= loc1.posB then\n result.screen_lineB = i\n result.screen_posB = loc1.posB - sposB + 1\n break\n end\n end\n assert(result.screen_posB)\n return result\nend\n\nfunction Text.to1(State, loc2)\n if loc2.screen_pos then\n return Text.to1A(State, loc2)\n else\n return Text.to1B(State, loc2)\n end\nend\n\nfunction Text.to1A(State, loc2)\n local result = {line=loc2.line, pos=loc2.screen_pos}\n if loc2.screen_line > 1 then\n result.pos = State.line_cache[loc2.line].screen_line_starting_pos[loc2.screen_line] + loc2.screen_pos - 1\n end\n return result\nend\n\nfunction Text.to1B(State, loc2)\n local result = {line=loc2.line, posB=loc2.screen_posB}\n if loc2.screen_lineB > 1 then\n result.posB = State.line_cache[loc2.line].screen_line_starting_posB[loc2.screen_lineB] + loc2.screen_posB - 1\n end\n return result\nend\n\nfunction Text.lt1(a, b)\n if a.line < b.line then\n return true\n end\n if a.line > b.line then\n return false\n end\n -- A side < B side\n if a.pos and not b.pos then\n return true\n end\n if not a.pos and b.pos then\n return false\n end\n if a.pos then\n return a.pos < b.pos\n else\n return a.posB < b.posB\n end\nend\n\nfunction Text.le1(a, b)\n return eq(a, b) or Text.lt1(a, b)\nend\n\nfunction Text.offset(s, pos1)\n if pos1 == 1 then return 1 end\n local result = utf8.offset(s, pos1)\n if result == nil then\n print(pos1, #s, s)\n end\n assert(result)\n return result\nend\n\nfunction Text.previous_screen_line(State, loc2)\n if loc2.screen_pos then\n return Text.previous_screen_lineA(State, loc2)\n else\n return Text.previous_screen_lineB(State, loc2)\n end\nend\n\nfunction Text.previous_screen_lineA(State, loc2)\n if loc2.screen_line > 1 then\n"},{"Del":" end\n"},{"Del":"--? print('scroll up')\n Text.snap_cursor_to_bottom_of_screen(State)\n end\nend\n\n-- should never modify State.cursor1\nfunction Text.snap_cursor_to_bottom_of_screen(State)\n--? print('to2:', State.cursor1.line, State.cursor1.pos, State.cursor1.posB)\n local top2 = Text.to2(State, State.cursor1)\n--? print('to2: =>', top2.line, top2.screen_line, top2.screen_pos, top2.screen_lineB, top2.screen_posB)\n -- slide to start of screen line\n if top2.screen_pos then\n top2.screen_pos = 1\n else\n assert(top2.screen_posB)\n top2.screen_posB = 1\n end\n--? print('snap', State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.cursor1.posB, State.screen_bottom1.line, State.screen_bottom1.pos, State.screen_bottom1.posB)\n--? print('cursor pos '..tostring(State.cursor1.pos)..' is on the #'..tostring(top2.screen_line)..' screen line down')\n local y = App.screen.height - State.line_height\n -- duplicate some logic from love.draw\n while true do\n--? print(y, 'top2:', State.lines[top2.line].data, top2.line, top2.screen_line, top2.screen_pos, top2.screen_lineB, top2.screen_posB)\n if top2.line == 1 and top2.screen_line == 1 then break end\n"},{"Del":" end\nend\n\nfunction Text.pos_at_start_of_screen_line(State, loc1)\n Text.populate_screen_line_starting_pos(State, loc1.line)\n local line_cache = State.line_cache[loc1.line]\n for i=#line_cache.screen_line_starting_pos,1,-1 do\n local spos = line_cache.screen_line_starting_pos[i]\n if spos <= loc1.pos then\n return spos,i\n end\n end\n assert(false)\nend\n\nfunction Text.pos_at_start_of_screen_lineB(State, loc1)\n Text.populate_screen_line_starting_pos(State, loc1.line)\n local line_cache = State.line_cache[loc1.line]\n local x = Margin_left + Text.screen_line_width(State, loc1.line, #line_cache.screen_line_starting_pos) + AB_padding\n Text.populate_screen_line_starting_posB(State, loc1.line, x)\n for i=#line_cache.screen_line_starting_posB,1,-1 do\n local sposB = line_cache.screen_line_starting_posB[i]\n if sposB <= loc1.posB then\n return sposB,i\n end\n end\n assert(false)\nend\n\nfunction Text.cursor_at_final_screen_line(State)\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n local line = State.lines[State.cursor1.line]\n local screen_lines = State.line_cache[State.cursor1.line].screen_line_starting_pos\n--? print(screen_lines[#screen_lines], State.cursor1.pos)\n if (not State.expanded and not line.expanded) or\n line.dataB == nil then\n return screen_lines[#screen_lines] <= State.cursor1.pos\n end\n if State.cursor1.pos then\n -- ignore B side\n return screen_lines[#screen_lines] <= State.cursor1.pos\n end\n assert(State.cursor1.posB)\n local line_cache = State.line_cache[State.cursor1.line]\n local x = Margin_left + Text.screen_line_width(State, State.cursor1.line, #line_cache.screen_line_starting_pos) + AB_padding\n Text.populate_screen_line_starting_posB(State, State.cursor1.line, x)\n local screen_lines = State.line_cache[State.cursor1.line].screen_line_starting_posB\n return screen_lines[#screen_lines] <= State.cursor1.posB\nend\n\nfunction Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)\n"},{"Del":" -- overflow back into A side\n"},{"Del":" end\nend\n\nfunction Text.right_without_scrollB(State)\n if State.cursor1.posB <= utf8.len(State.lines[State.cursor1.line].dataB) then\n State.cursor1.posB = State.cursor1.posB+1\n"},{"Del":" if State.cursor1.pos then\n Text.right_without_scrollA(State)\n else\n Text.right_without_scrollB(State)\n end\nend\n\nfunction Text.right_without_scrollA(State)\n if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n State.cursor1.pos = State.cursor1.pos+1\n"},{"Del":" end\n if Text.lt1(State.cursor1, State.screen_top1) then\n local top2 = Text.to2(State, State.screen_top1)\n top2 = Text.previous_screen_line(State, top2)\n State.screen_top1 = Text.to1(State, top2)\n end\nend\n\nfunction Text.leftB(State)\n if State.cursor1.posB > 1 then\n State.cursor1.posB = State.cursor1.posB-1\n else\n -- overflow back into A side\n State.cursor1.posB = nil\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line].data) + 1\n end\n if Text.lt1(State.cursor1, State.screen_top1) then\n local top2 = Text.to2(State, State.screen_top1)\n top2 = Text.previous_screen_line(State, top2)\n State.screen_top1 = Text.to1(State, top2)\n end\nend\n\nfunction Text.right(State)\n Text.right_without_scroll(State)\n if Text.cursor_out_of_screen(State) then\n Text.snap_cursor_to_bottom_of_screen(State)\n end\nend\n\nfunction Text.right_without_scroll(State)\n"},{"Del":" end\nend\n\nfunction Text.end_of_line(State)\n if State.cursor1.pos then\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line].data) + 1\n else\n State.cursor1.posB = utf8.len(State.lines[State.cursor1.line].dataB) + 1\n end\n if Text.cursor_out_of_screen(State) then\n Text.snap_cursor_to_bottom_of_screen(State)\n end\nend\n\nfunction Text.word_left(State)\n -- we can cross the fold, so check side A/B one level down\n Text.skip_whitespace_left(State)\n Text.left(State)\n Text.skip_non_whitespace_left(State)\nend\n\nfunction Text.word_right(State)\n -- we can cross the fold, so check side A/B one level down\n Text.skip_whitespace_right(State)\n Text.right(State)\n Text.skip_non_whitespace_right(State)\n if Text.cursor_out_of_screen(State) then\n Text.snap_cursor_to_bottom_of_screen(State)\n end\nend\n\nfunction Text.skip_whitespace_left(State)\n if State.cursor1.pos then\n Text.skip_whitespace_leftA(State)\n else\n Text.skip_whitespace_leftB(State)\n end\nend\n\nfunction Text.skip_non_whitespace_left(State)\n if State.cursor1.pos then\n Text.skip_non_whitespace_leftA(State)\n else\n Text.skip_non_whitespace_leftB(State)\n end\nend\n\nfunction Text.skip_whitespace_leftA(State)\n while true do\n if State.cursor1.pos == 1 then\n break\n end\n if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos-1, '%S') then\n break\n end\n Text.left(State)\n end\nend\n\nfunction Text.skip_whitespace_leftB(State)\n while true do\n if State.cursor1.posB == 1 then\n break\n end\n if Text.match(State.lines[State.cursor1.line].dataB, State.cursor1.posB-1, '%S') then\n break\n end\n Text.left(State)\n end\nend\n\nfunction Text.skip_non_whitespace_leftA(State)\n while true do\n if State.cursor1.pos == 1 then\n break\n end\n assert(State.cursor1.pos > 1)\n if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos-1, '%s') then\n break\n end\n Text.left(State)\n end\nend\n\nfunction Text.skip_non_whitespace_leftB(State)\n while true do\n if State.cursor1.posB == 1 then\n break\n end\n assert(State.cursor1.posB > 1)\n if Text.match(State.lines[State.cursor1.line].dataB, State.cursor1.posB-1, '%s') then\n break\n end\n Text.left(State)\n end\nend\n\nfunction Text.skip_whitespace_right(State)\n if State.cursor1.pos then\n Text.skip_whitespace_rightA(State)\n else\n Text.skip_whitespace_rightB(State)\n end\nend\n\nfunction Text.skip_non_whitespace_right(State)\n if State.cursor1.pos then\n Text.skip_non_whitespace_rightA(State)\n else\n Text.skip_non_whitespace_rightB(State)\n end\nend\n\nfunction Text.skip_whitespace_rightA(State)\n while true do\n if State.cursor1.pos > utf8.len(State.lines[State.cursor1.line].data) then\n break\n end\n if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos, '%S') then\n break\n end\n Text.right_without_scroll(State)\n end\nend\n\nfunction Text.skip_whitespace_rightB(State)\n while true do\n if State.cursor1.posB > utf8.len(State.lines[State.cursor1.line].dataB) then\n break\n end\n if Text.match(State.lines[State.cursor1.line].dataB, State.cursor1.posB, '%S') then\n break\n end\n Text.right_without_scroll(State)\n end\nend\n\nfunction Text.skip_non_whitespace_rightA(State)\n while true do\n if State.cursor1.pos > utf8.len(State.lines[State.cursor1.line].data) then\n break\n end\n if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos, '%s') then\n break\n end\n Text.right_without_scroll(State)\n end\nend\n\nfunction Text.skip_non_whitespace_rightB(State)\n while true do\n if State.cursor1.posB > utf8.len(State.lines[State.cursor1.line].dataB) then\n break\n end\n if Text.match(State.lines[State.cursor1.line].dataB, State.cursor1.posB, '%s') then\n break\n end\n Text.right_without_scroll(State)\n end\nend\n\nfunction Text.match(s, pos, pat)\n local start_offset = Text.offset(s, pos)\n assert(start_offset)\n local end_offset = Text.offset(s, pos+1)\n assert(end_offset > start_offset)\n local curr = s:sub(start_offset, end_offset-1)\n return curr:match(pat)\nend\n\nfunction Text.left(State)\n if State.cursor1.pos then\n Text.leftA(State)\n else\n Text.leftB(State)\n end\nend\n\nfunction Text.leftA(State)\n if State.cursor1.pos > 1 then\n State.cursor1.pos = State.cursor1.pos-1\n"},{"Del":" end\n if State.cursor1.line > State.screen_bottom1.line then\n--? print('screen top before:', State.screen_top1.line, State.screen_top1.pos)\n--? print('scroll up preserving cursor')\n Text.snap_cursor_to_bottom_of_screen(State)\n--? print('screen top after:', State.screen_top1.line, State.screen_top1.pos)\n end\n elseif State.cursor1.pos then\n -- move down one screen line (A side) in current line\n local scroll_down = Text.le1(State.screen_bottom1, State.cursor1)\n--? print('cursor is NOT at final screen line of its line')\n local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n local new_screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos[screen_line_index+1]\n--? print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))\n local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)\n State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n--? print('cursor pos is now', State.cursor1.line, State.cursor1.pos)\n if scroll_down then\n--? print('scroll up preserving cursor')\n Text.snap_cursor_to_bottom_of_screen(State)\n--? print('screen top after:', State.screen_top1.line, State.screen_top1.pos)\n end\n else\n -- move down one screen line (B side) in current line\n local scroll_down = false\n if Text.le1(State.screen_bottom1, State.cursor1) then\n scroll_down = true\n end\n local cursor_line = State.lines[State.cursor1.line]\n local cursor_line_cache = State.line_cache[State.cursor1.line]\n local cursor2 = Text.to2(State, State.cursor1)\n assert(cursor2.screen_lineB < #cursor_line_cache.screen_line_starting_posB)\n local screen_line_starting_posB, screen_line_indexB = Text.pos_at_start_of_screen_lineB(State, State.cursor1)\n Text.populate_screen_line_starting_posB(State, State.cursor1.line)\n local new_screen_line_starting_posB = cursor_line_cache.screen_line_starting_posB[screen_line_indexB+1]\n local new_screen_line_starting_byte_offsetB = Text.offset(cursor_line.dataB, new_screen_line_starting_posB)\n local s = string.sub(cursor_line.dataB, new_screen_line_starting_byte_offsetB)\n State.cursor1.posB = new_screen_line_starting_posB + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n if scroll_down then\n Text.snap_cursor_to_bottom_of_screen(State)\n end\n end\n--? print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\nend\n\nfunction Text.start_of_line(State)\n if State.cursor1.pos then\n State.cursor1.pos = 1\n else\n State.cursor1.posB = 1\n end\n if Text.lt1(State.cursor1, State.screen_top1) then\n"},{"Del":"--? print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n if Text.cursor_at_final_screen_line(State) then\n -- line is done, skip to next text line\n--? print('cursor at final screen line of its line')\n"},{"Del":" end\n elseif screen_line_indexB == 2 then\n -- all-B screen-line to potentially A+B screen-line\n local xA = Margin_left + Text.screen_line_width(State, State.cursor1.line, #line_cache.screen_line_starting_pos) + AB_padding\n if State.cursor_x < xA then\n State.cursor1.posB = nil\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n local new_screen_line_starting_pos = line_cache.screen_line_starting_pos[#line_cache.screen_line_starting_pos]\n local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)\n State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n else\n Text.populate_screen_line_starting_posB(State, State.cursor1.line)\n local new_screen_line_starting_posB = line_cache.screen_line_starting_posB[screen_line_indexB-1]\n local new_screen_line_starting_byte_offsetB = Text.offset(State.lines[State.cursor1.line].dataB, new_screen_line_starting_posB)\n local s = string.sub(State.lines[State.cursor1.line].dataB, new_screen_line_starting_byte_offsetB)\n State.cursor1.posB = new_screen_line_starting_posB + Text.nearest_cursor_pos(s, State.cursor_x-xA, State.left) - 1\n end\n else\n assert(screen_line_indexB > 2)\n -- all-B screen-line to all-B screen-line\n Text.populate_screen_line_starting_posB(State, State.cursor1.line)\n local new_screen_line_starting_posB = line_cache.screen_line_starting_posB[screen_line_indexB-1]\n local new_screen_line_starting_byte_offsetB = Text.offset(State.lines[State.cursor1.line].dataB, new_screen_line_starting_posB)\n local s = string.sub(State.lines[State.cursor1.line].dataB, new_screen_line_starting_byte_offsetB)\n State.cursor1.posB = new_screen_line_starting_posB + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n end\n if Text.lt1(State.cursor1, State.screen_top1) then\n local top2 = Text.to2(State, State.screen_top1)\n top2 = Text.previous_screen_line(State, top2)\n State.screen_top1 = Text.to1(State, top2)\n end\nend\n\n-- cursor on final screen line (A or B side) => goes to next screen line on A side\n-- cursor on A side => move down one screen line (A side) in current line\n-- cursor on B side => move down one screen line (B side) in current line\nfunction Text.down(State)\n"},{"Del":" end\n else\n -- move up one screen line in current line\n assert(screen_line_index > 1)\n local new_screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos[screen_line_index-1]\n local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)\n State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n--? print('cursor pos is now '..tostring(State.cursor1.pos))\n end\n if Text.lt1(State.cursor1, State.screen_top1) then\n local top2 = Text.to2(State, State.screen_top1)\n top2 = Text.previous_screen_line(State, top2)\n State.screen_top1 = Text.to1(State, top2)\n end\nend\n\nfunction Text.upB(State)\n local line_cache = State.line_cache[State.cursor1.line]\n local screen_line_starting_posB, screen_line_indexB = Text.pos_at_start_of_screen_lineB(State, State.cursor1)\n assert(screen_line_indexB >= 1)\n if screen_line_indexB == 1 then\n -- move to A side of previous line\n"},{"Del":" if State.cursor1.pos then\n Text.upA(State)\n else\n Text.upB(State)\n end\nend\n\nfunction Text.upA(State)\n--? print('up', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)\n local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)\n if screen_line_starting_pos == 1 then\n--? print('cursor is at first screen line of its line')\n -- line is done; skip to previous text line\n"},{"Del":" end\n--? print('setting top to', State.screen_top1.line, State.screen_top1.pos)\n State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos, posB=State.screen_top1.posB}\n Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)\n--? print('top now', State.screen_top1.line)\n Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks\n--? print('pagedown end')\nend\n\nfunction Text.up(State)\n"},{"Del":" top2 = Text.previous_screen_line(State, top2)\n end\n State.screen_top1 = Text.to1(State, top2)\n State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos, posB=State.screen_top1.posB}\n Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)\n--? print(State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)\n--? print('pageup end')\nend\n\nfunction Text.pagedown(State)\n--? print('pagedown')\n local bot2 = Text.to2(State, State.screen_bottom1)\n local new_top1 = Text.to1(State, bot2)\n if Text.lt1(State.screen_top1, new_top1) then\n State.screen_top1 = new_top1\n else\n"},{"Del":" table.insert(State.line_cache, State.cursor1.line+1, {})\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_offset-1)\n State.lines[State.cursor1.line].dataB = nil\n Text.clear_screen_line_cache(State, State.cursor1.line)\n State.cursor1 = {line=State.cursor1.line+1, pos=1}\n else\n -- disable enter when cursor is on the B side\n end\nend\n\nfunction Text.pageup(State)\n--? print('pageup')\n -- duplicate some logic from love.draw\n local top2 = Text.to2(State, State.screen_top1)\n--? print(App.screen.height)\n local y = App.screen.height - State.line_height\n while y >= State.top do\n--? print(y, top2.line, top2.screen_line, top2.screen_pos)\n if State.screen_top1.line == 1 and State.screen_top1.pos and State.screen_top1.pos == 1 then break end\n"},{"Del":" table.remove(State.lines, State.cursor1.line+1)\n table.remove(State.line_cache, State.cursor1.line+1)\n end\n Text.clear_screen_line_cache(State, State.cursor1.line)\n schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})\n --== shortcuts that move the cursor\n elseif chord == 'left' then\n Text.left(State)\n elseif chord == 'right' then\n Text.right(State)\n elseif chord == 'S-left' then\n Text.left(State)\n elseif chord == 'S-right' then\n Text.right(State)\n -- C- hotkeys reserved for drawings, so we'll use M-\n elseif chord == 'M-left' then\n Text.word_left(State)\n elseif chord == 'M-right' then\n Text.word_right(State)\n elseif chord == 'M-S-left' then\n Text.word_left(State)\n elseif chord == 'M-S-right' then\n Text.word_right(State)\n elseif chord == 'home' then\n Text.start_of_line(State)\n elseif chord == 'end' then\n Text.end_of_line(State)\n elseif chord == 'S-home' then\n Text.start_of_line(State)\n elseif chord == 'S-end' then\n Text.end_of_line(State)\n elseif chord == 'up' then\n Text.up(State)\n elseif chord == 'down' then\n Text.down(State)\n elseif chord == 'S-up' then\n Text.up(State)\n elseif chord == 'S-down' then\n Text.down(State)\n elseif chord == 'pageup' then\n Text.pageup(State)\n elseif chord == 'pagedown' then\n Text.pagedown(State)\n elseif chord == 'S-pageup' then\n Text.pageup(State)\n elseif chord == 'S-pagedown' then\n Text.pagedown(State)\n end\nend\n\nfunction Text.insert_return(State)\n if State.cursor1.pos then\n -- when inserting a newline, move any B side to the new line\n local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)\n"},{"Del":" State.cursor1.line = State.cursor1.line-1\n end\n if State.screen_top1.line > #State.lines then\n Text.populate_screen_line_starting_pos(State, #State.lines)\n local line_cache = State.line_cache[#State.line_cache]\n State.screen_top1 = {line=#State.lines, pos=line_cache.screen_line_starting_pos[#line_cache.screen_line_starting_pos]}\n elseif Text.lt1(State.cursor1, State.screen_top1) then\n local top2 = Text.to2(State, State.screen_top1)\n top2 = Text.previous_screen_line(State, top2, State.left, State.right)\n State.screen_top1 = Text.to1(State, top2)\n Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks\n end\n Text.clear_screen_line_cache(State, State.cursor1.line)\n assert(Text.le1(State.screen_top1, State.cursor1))\n schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})\n elseif chord == 'delete' then\n local before\n if State.cursor1.posB or State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n before = snapshot(State, State.cursor1.line)\n else\n before = snapshot(State, State.cursor1.line, State.cursor1.line+1)\n end\n if State.cursor1.pos and State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n local byte_start = utf8.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)\n local byte_end = utf8.offset(State.lines[State.cursor1.line].data, State.cursor1.pos+1)\n if byte_start then\n if byte_end then\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_start-1)..string.sub(State.lines[State.cursor1.line].data, byte_end)\n else\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_start-1)\n end\n -- no change to State.cursor1.pos\n end\n elseif State.cursor1.posB then\n if State.cursor1.posB <= utf8.len(State.lines[State.cursor1.line].dataB) then\n local byte_start = utf8.offset(State.lines[State.cursor1.line].dataB, State.cursor1.posB)\n local byte_end = utf8.offset(State.lines[State.cursor1.line].dataB, State.cursor1.posB+1)\n if byte_start then\n if byte_end then\n State.lines[State.cursor1.line].dataB = string.sub(State.lines[State.cursor1.line].dataB, 1, byte_start-1)..string.sub(State.lines[State.cursor1.line].dataB, byte_end)\n else\n State.lines[State.cursor1.line].dataB = string.sub(State.lines[State.cursor1.line].dataB, 1, byte_start-1)\n end\n -- no change to State.cursor1.pos\n end\n else\n -- refuse to delete past end of side B\n end\n elseif State.cursor1.line < #State.lines then\n"},{"Del":" local line_cache = State.line_cache[line_index]\n if line_cache.fragments then\n return\n end\n line_cache.fragments = {}\n local x = State.left\n -- try to wrap at word boundaries\n for frag in line.data:gmatch('%S*%s*') do\n local frag_text = App.newText(love.graphics.getFont(), frag)\n local frag_width = App.width(frag_text)\n--? print('x: '..tostring(x)..'; frag_width: '..tostring(frag_width)..'; '..tostring(State.right-x)..'px to go')\n while x + frag_width > State.right do\n--? print(('checking whether to split fragment ^%s$ of width %d when rendering from %d'):format(frag, frag_width, x))\n if (x-State.left) < 0.8 * (State.right-State.left) then\n--? print('splitting')\n -- long word; chop it at some letter\n -- We're not going to reimplement TeX here.\n local bpos = Text.nearest_pos_less_than(frag, State.right - x)\n--? print('bpos', bpos)\n if bpos == 0 then break end -- avoid infinite loop when window is too narrow\n local boffset = Text.offset(frag, bpos+1) -- byte _after_ bpos\n--? print('space for '..tostring(bpos)..' graphemes, '..tostring(boffset-1)..' bytes')\n local frag1 = string.sub(frag, 1, boffset-1)\n local frag1_text = App.newText(love.graphics.getFont(), frag1)\n local frag1_width = App.width(frag1_text)\n--? print('extracting ^'..frag1..'$ of width '..tostring(frag1_width)..'px')\n assert(x + frag1_width <= State.right)\n table.insert(line_cache.fragments, {data=frag1, text=frag1_text})\n frag = string.sub(frag, boffset)\n frag_text = App.newText(love.graphics.getFont(), frag)\n frag_width = App.width(frag_text)\n end\n x = State.left -- new line\n end\n if #frag > 0 then\n--? print('inserting ^'..frag..'$ of width '..tostring(frag_width)..'px')\n table.insert(line_cache.fragments, {data=frag, text=frag_text})\n end\n x = x + frag_width\n end\nend\n\nfunction Text.populate_screen_line_starting_posB(State, line_index, x)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n if line_cache.screen_line_starting_posB then\n return\n end\n -- duplicate some logic from Text.draw\n Text.compute_fragmentsB(State, line_index, x)\n line_cache.screen_line_starting_posB = {1}\n local pos = 1\n for _, f in ipairs(line_cache.fragmentsB) do\n local frag, frag_text = f.data, f.text\n -- render fragment\n local frag_width = App.width(frag_text)\n if x + frag_width > State.right then\n x = State.left\n table.insert(line_cache.screen_line_starting_posB, pos)\n end\n x = x + frag_width\n local frag_len = utf8.len(frag)\n pos = pos + frag_len\n end\nend\n\nfunction Text.compute_fragmentsB(State, line_index, x)\n--? print('compute_fragmentsB', line_index, 'between', x, State.right)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n if line_cache.fragmentsB then\n return\n end\n line_cache.fragmentsB = {}\n -- try to wrap at word boundaries\n for frag in line.dataB:gmatch('%S*%s*') do\n local frag_text = App.newText(love.graphics.getFont(), frag)\n local frag_width = App.width(frag_text)\n--? print('x: '..tostring(x)..'; '..tostring(State.right-x)..'px to go')\n while x + frag_width > State.right do\n--? print(('checking whether to split fragment ^%s$ of width %d when rendering from %d'):format(frag, frag_width, x))\n if (x-State.left) < 0.8 * (State.right-State.left) then\n--? print('splitting')\n -- long word; chop it at some letter\n -- We're not going to reimplement TeX here.\n local bpos = Text.nearest_pos_less_than(frag, State.right - x)\n--? print('bpos', bpos)\n if bpos == 0 then break end -- avoid infinite loop when window is too narrow\n local boffset = Text.offset(frag, bpos+1) -- byte _after_ bpos\n--? print('space for '..tostring(bpos)..' graphemes, '..tostring(boffset-1)..' bytes')\n local frag1 = string.sub(frag, 1, boffset-1)\n local frag1_text = App.newText(love.graphics.getFont(), frag1)\n local frag1_width = App.width(frag1_text)\n--? print('extracting ^'..frag1..'$ of width '..tostring(frag1_width)..'px')\n assert(x + frag1_width <= State.right)\n table.insert(line_cache.fragmentsB, {data=frag1, text=frag1_text})\n frag = string.sub(frag, boffset)\n frag_text = App.newText(love.graphics.getFont(), frag)\n frag_width = App.width(frag_text)\n end\n x = State.left -- new line\n end\n if #frag > 0 then\n--? print('inserting ^'..frag..'$ of width '..tostring(frag_width)..'px')\n table.insert(line_cache.fragmentsB, {data=frag, text=frag_text})\n end\n x = x + frag_width\n end\nend\n\nfunction Text.textinput(State, t)\n if App.mouse_down(1) then return end\n if App.ctrl_down() or App.alt_down() or App.cmd_down() then return end\n local before = snapshot(State, State.cursor1.line)\n--? print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n Text.insert_at_cursor(State, t)\n if State.cursor_y > App.screen.height - State.line_height then\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)\n end\n record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})\nend\n\nfunction Text.insert_at_cursor(State, t)\n if State.cursor1.pos then\n local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_offset-1)..t..string.sub(State.lines[State.cursor1.line].data, byte_offset)\n Text.clear_screen_line_cache(State, State.cursor1.line)\n State.cursor1.pos = State.cursor1.pos+1\n else\n assert(State.cursor1.posB)\n local byte_offset = Text.offset(State.lines[State.cursor1.line].dataB, State.cursor1.posB)\n State.lines[State.cursor1.line].dataB = string.sub(State.lines[State.cursor1.line].dataB, 1, byte_offset-1)..t..string.sub(State.lines[State.cursor1.line].dataB, byte_offset)\n Text.clear_screen_line_cache(State, State.cursor1.line)\n State.cursor1.posB = State.cursor1.posB+1\n end\nend\n\n-- Don't handle any keys here that would trigger love.textinput above.\nfunction Text.keychord_pressed(State, chord)\n--? print('chord', chord)\n --== shortcuts that mutate text\n if chord == 'return' then\n local before_line = State.cursor1.line\n local before = snapshot(State, before_line)\n Text.insert_return(State)\n if State.cursor_y > App.screen.height - State.line_height then\n Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)\n end\n schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})\n elseif chord == 'tab' then\n local before = snapshot(State, State.cursor1.line)\n--? print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n Text.insert_at_cursor(State, '\\t')\n if State.cursor_y > App.screen.height - State.line_height then\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)\n--? print('=>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n end\n schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})\n elseif chord == 'backspace' then\n local before\n if State.cursor1.pos and State.cursor1.pos > 1 then\n before = snapshot(State, State.cursor1.line)\n local byte_start = utf8.offset(State.lines[State.cursor1.line].data, State.cursor1.pos-1)\n local byte_end = utf8.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)\n if byte_start then\n if byte_end then\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_start-1)..string.sub(State.lines[State.cursor1.line].data, byte_end)\n else\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_start-1)\n end\n State.cursor1.pos = State.cursor1.pos-1\n end\n elseif State.cursor1.posB then\n if State.cursor1.posB > 1 then\n before = snapshot(State, State.cursor1.line)\n local byte_start = utf8.offset(State.lines[State.cursor1.line].dataB, State.cursor1.posB-1)\n local byte_end = utf8.offset(State.lines[State.cursor1.line].dataB, State.cursor1.posB)\n if byte_start then\n if byte_end then\n State.lines[State.cursor1.line].dataB = string.sub(State.lines[State.cursor1.line].dataB, 1, byte_start-1)..string.sub(State.lines[State.cursor1.line].dataB, byte_end)\n else\n State.lines[State.cursor1.line].dataB = string.sub(State.lines[State.cursor1.line].dataB, 1, byte_start-1)\n end\n State.cursor1.posB = State.cursor1.posB-1\n end\n else\n -- refuse to delete past beginning of side B\n end\n elseif State.cursor1.line > 1 then\n before = snapshot(State, State.cursor1.line-1, State.cursor1.line)\n"},{"Del":" local line_cache = State.line_cache[line_index]\n if line_cache.screen_line_starting_pos then\n return\n end\n -- duplicate some logic from Text.draw\n Text.compute_fragments(State, line_index)\n line_cache.screen_line_starting_pos = {1}\n local x = State.left\n local pos = 1\n for _, f in ipairs(line_cache.fragments) do\n local frag, frag_text = f.data, f.text\n -- render fragment\n local frag_width = App.width(frag_text)\n if x + frag_width > State.right then\n x = State.left\n table.insert(line_cache.screen_line_starting_pos, pos)\n end\n x = x + frag_width\n local frag_len = utf8.len(frag)\n pos = pos + frag_len\n end\nend\n\nfunction Text.compute_fragments(State, line_index)\n--? print('compute_fragments', line_index, 'between', State.left, State.right)\n local line = State.lines[line_index]\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_file.lua","metadata":0},{"basename":"source_file.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":152399,"end":152438},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":152399,"end":152438},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":152438},"to":{"change":6,"start":150241,"end":150241},"introduced_by":6}],"inode":{"change":6,"pos":150241}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":150962},"to":{"change":5,"start":11945,"end":12113},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151134},"to":{"change":5,"start":12114,"end":12389},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151249},"to":{"change":5,"start":12390,"end":12439},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151521},"to":{"change":5,"start":12440,"end":12693},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151707},"to":{"change":5,"start":12694,"end":15557},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152071},"to":{"change":5,"start":15558,"end":15844},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152235},"to":{"change":5,"start":15845,"end":16140},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152336},"to":{"change":5,"start":16141,"end":16190},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152398},"to":{"change":5,"start":16191,"end":17838},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":16190},"to":{"change":6,"start":152372,"end":152398},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":16140},"to":{"change":6,"start":152263,"end":152271},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15844},"to":{"change":6,"start":152226,"end":152235},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":15557},"to":{"change":6,"start":151873,"end":152071},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":12693},"to":{"change":6,"start":151651,"end":151659},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":12439},"to":{"change":6,"start":151285,"end":151521},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":12389},"to":{"change":6,"start":151164,"end":151174},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":12113},"to":{"change":6,"start":151123,"end":151134},"introduced_by":5}],"inode":{"change":6,"pos":150241}},"content":[{"Del":" if line == '```lines' then -- inflexible with whitespace since these files are always autogenerated\n table.insert(result, load_drawing(infile_next_line))\n"},{"Del":" local line_info = {mode='text'}\n if line:find(Fold) then\n _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')\n else\n line_info.data = line\n end\n table.insert(result, line_info)\n"},{"Del":" table.insert(result, {mode='text', data=''})\n"},{"Del":" if line.mode == 'drawing' then\n store_drawing(outfile, line)\n else\n outfile:write(line.data)\n if line.dataB and #line.dataB > 0 then\n outfile:write(Fold)\n outfile:write(line.dataB)\n end\n outfile:write('\\n')\n"},{"Del":"end\n\nfunction load_drawing(infile_next_line)\n local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}\n while true do\n local line = infile_next_line()\n assert(line)\n if line == '```' then break end\n local shape = json.decode(line)\n if shape.mode == 'freehand' then\n -- no changes needed\n elseif shape.mode == 'line' or shape.mode == 'manhattan' then\n local name = shape.p1.name\n shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p1].name = name\n name = shape.p2.name\n shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p2].name = name\n elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then\n for i,p in ipairs(shape.vertices) do\n local name = p.name\n shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.vertices[i]].name = name\n end\n elseif shape.mode == 'circle' or shape.mode == 'arc' then\n local name = shape.center.name\n shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.center].name = name\n elseif shape.mode == 'deleted' then\n -- ignore\n else\n print(shape.mode)\n assert(false)\n end\n table.insert(drawing.shapes, shape)\n end\n return drawing\nend\n\nfunction store_drawing(outfile, drawing)\n outfile:write('```lines\\n')\n for _,shape in ipairs(drawing.shapes) do\n if shape.mode == 'freehand' then\n outfile:write(json.encode(shape), '\\n')\n elseif shape.mode == 'line' or shape.mode == 'manhattan' then\n local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})\n outfile:write(line, '\\n')\n elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then\n local obj = {mode=shape.mode, vertices={}}\n for _,p in ipairs(shape.vertices) do\n table.insert(obj.vertices, drawing.points[p])\n end\n local line = json.encode(obj)\n outfile:write(line, '\\n')\n elseif shape.mode == 'circle' then\n outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}), '\\n')\n elseif shape.mode == 'arc' then\n outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}), '\\n')\n elseif shape.mode == 'deleted' then\n -- ignore\n else\n print(shape.mode)\n assert(false)\n end\n end\n outfile:write('```\\n')\n"},{"Del":"--? print(line)\n if line == '```lines' then -- inflexible with whitespace since these files are always autogenerated\n--? print('inserting drawing')\n i, drawing = load_drawing_from_array(next_line, a, i)\n--? print('i now', i)\n table.insert(result, drawing)\n"},{"Del":"--? print('inserting text')\n local line_info = {mode='text'}\n if line:find(Fold) then\n _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')\n else\n line_info.data = line\n end\n table.insert(result, line_info)\n"},{"Del":" table.insert(result, {mode='text', data=''})\n"},{"Del":"\nfunction load_drawing_from_array(iter, a, i)\n local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}\n local line\n while true do\n i, line = iter(a, i)\n assert(i)\n--? print(i)\n if line == '```' then break end\n local shape = json.decode(line)\n if shape.mode == 'freehand' then\n -- no changes needed\n elseif shape.mode == 'line' or shape.mode == 'manhattan' then\n local name = shape.p1.name\n shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p1].name = name\n name = shape.p2.name\n shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p2].name = name\n elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then\n for i,p in ipairs(shape.vertices) do\n local name = p.name\n shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.vertices[i]].name = name\n end\n elseif shape.mode == 'circle' or shape.mode == 'arc' then\n local name = shape.center.name\n shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.center].name = name\n elseif shape.mode == 'deleted' then\n -- ignore\n else\n print(shape.mode)\n assert(false)\n end\n table.insert(drawing.shapes, shape)\n end\n return i, drawing\nend\n"},{"Del":" end\n return result\nend\n"},{"Del":" end\n"},{"Del":" else\n"},{"Del":"end\n\n-- for tests\nfunction load_array(a)\n local result = {}\n local next_line = ipairs(a)\n local i,line,drawing = 0, ''\n while true do\n i,line = next_line(a, i)\n if i == nil then break end\n"},{"Del":" end\n"},{"Del":" end\n return result\nend\n\nfunction save_to_disk(State)\n local outfile = App.open_for_writing(State.filename)\n if outfile == nil then\n error('failed to write to \"'..State.filename..'\"')\n end\n for _,line in ipairs(State.lines) do\n"},{"Del":" end\n"},{"Del":" else\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_edit.lua","metadata":0},{"basename":"source_edit.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":165725,"end":165764},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":165725,"end":165764},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":165764},"to":{"change":6,"start":152440,"end":152440},"introduced_by":6}],"inode":{"change":6,"pos":152440}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152546},"to":{"change":5,"start":17840,"end":18033},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152673},"to":{"change":5,"start":18034,"end":18192},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152798},"to":{"change":5,"start":18193,"end":18317},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152799},"to":{"change":5,"start":18318,"end":18406},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152987},"to":{"change":5,"start":18407,"end":19576},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":154804},"to":{"change":5,"start":19577,"end":19722},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":155350},"to":{"change":5,"start":19723,"end":19888},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":155884},"to":{"change":5,"start":19889,"end":19944},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156056},"to":{"change":5,"start":19945,"end":19977},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156098},"to":{"change":5,"start":19978,"end":21096},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156342},"to":{"change":5,"start":21097,"end":21511},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156628},"to":{"change":5,"start":21512,"end":21540},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157151},"to":{"change":5,"start":21541,"end":21562},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157427},"to":{"change":5,"start":21563,"end":22284},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157753},"to":{"change":5,"start":22285,"end":22645},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158026},"to":{"change":5,"start":22646,"end":23001},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":159775},"to":{"change":5,"start":23002,"end":23031},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":161174},"to":{"change":5,"start":23032,"end":23121},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":161677},"to":{"change":5,"start":23122,"end":23211},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":163099},"to":{"change":5,"start":23212,"end":24756},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":24756},"to":{"change":6,"start":163121,"end":165724},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":23211},"to":{"change":6,"start":161677,"end":163099},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":23121},"to":{"change":6,"start":161174,"end":161677},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":23031},"to":{"change":6,"start":159804,"end":161174},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":23001},"to":{"change":6,"start":158026,"end":159775},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":22645},"to":{"change":6,"start":157753,"end":158026},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":22284},"to":{"change":6,"start":157679,"end":157753},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":21562},"to":{"change":6,"start":157217,"end":157427},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":21540},"to":{"change":6,"start":156628,"end":157151},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":21511},"to":{"change":6,"start":156342,"end":156350},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":21096},"to":{"change":6,"start":156332,"end":156342},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":19977},"to":{"change":6,"start":156056,"end":156098},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":19944},"to":{"change":6,"start":155928,"end":156056},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":19888},"to":{"change":6,"start":155350,"end":155884},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":19722},"to":{"change":6,"start":154804,"end":155350},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":19576},"to":{"change":6,"start":153197,"end":154804},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":18406},"to":{"change":6,"start":152799,"end":152987},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":18317},"to":{"change":6,"start":152798,"end":152799},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":18192},"to":{"change":6,"start":152673,"end":152798},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":18033},"to":{"change":6,"start":152546,"end":152673},"introduced_by":5}],"inode":{"change":6,"pos":152440}},"content":[{"Del":"Stroke_color = {r=0, g=0, b=0}\nCurrent_stroke_color = {r=0.7, g=0.7, b=0.7} -- in process of being drawn\nCurrent_name_background_color = {r=1, g=0, b=0, a=0.1} -- name currently being edited\n"},{"Del":"Icon_color = {r=0.7, g=0.7, b=0.7} -- color of current mode icon in drawings\nHelp_color = {r=0, g=0.5, b=0}\nHelp_background_color = {r=0, g=0.5, b=0, a=0.1}\n"},{"Del":"\nDrawing_padding_top = 10\nDrawing_padding_bottom = 10\nDrawing_padding_height = Drawing_padding_top + Drawing_padding_bottom\n"},{"Del":"Same_point_distance = 4 -- pixel distance at which two points are considered the same\n\n"},{"Del":" -- a line is either bifold text or a drawing\n -- a line of bifold text consists of an A side and an optional B side\n -- mode = 'text',\n -- string data,\n -- string dataB,\n -- expanded: whether to show B side\n -- a drawing is a table with:\n -- mode = 'drawing'\n -- a (y) coord in pixels (updated while painting screen),\n -- a (h)eight,\n -- an array of points, and\n -- an array of shapes\n -- a shape is a table containing:\n -- a mode\n -- an array points for mode 'freehand' (raw x,y coords; freehand drawings don't pollute the points array of a drawing)\n -- an array vertices for mode 'polygon', 'rectangle', 'square'\n -- p1, p2 for mode 'line'\n -- center, radius for mode 'circle'\n -- center, radius, start_angle, end_angle for mode 'arc'\n -- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide\n -- The field names are carefully chosen so that switching modes in midstream\n -- remembers previously entered points where that makes sense.\n lines = {{mode='text', data='', dataB=nil, expanded=nil}}, -- array of lines\n"},{"Del":" current_drawing_mode = 'line',\n previous_drawing_mode = nil, -- extra state for some ephemeral modes like moving/deleting/naming points\n\n"},{"Del":"function edit.fixup_cursor(State)\n for i,line in ipairs(State.lines) do\n if line.mode == 'text' then\n State.cursor1.line = i\n break\n end\n end\nend\n\n"},{"Del":"--? print('draw:', y, line_index, line, line.mode)\n"},{"Del":" if line.mode == 'text' then\n"},{"Del":" local startpos, startposB = 1, nil\n if line_index == State.screen_top1.line then\n if State.screen_top1.pos then\n startpos = State.screen_top1.pos\n else\n startpos, startposB = nil, State.screen_top1.posB\n end\n end\n if line.data == '' then\n -- button to insert new drawing\n button(State, 'draw', {x=4,y=y+4, w=12,h=12, color={1,1,0},\n icon = icon.insert_drawing,\n onpress1 = function()\n Drawing.before = snapshot(State, line_index-1, line_index)\n table.insert(State.lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})\n table.insert(State.line_cache, line_index, {})\n if State.cursor1.line >= line_index then\n State.cursor1.line = State.cursor1.line+1\n end\n schedule_save(State)\n record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})\n end,\n })\n"},{"Del":" y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)\n y = y + State.line_height\n--? print('=> y', y)\n elseif line.mode == 'drawing' then\n y = y+Drawing_padding_top\n Drawing.draw(State, line_index, y)\n y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom\n else\n print(line.mode)\n assert(false)\n"},{"Del":" Drawing.update(State, dt)\n"},{"Del":"--? print('press')\n"},{"Del":" if line.mode == 'text' then\n if Text.in_line(State, line_index, x,y) then\n local pos,posB = Text.to_pos_on_line(State, line_index, x, y)\n --? print(x,y, 'setting cursor:', line_index, pos, posB)\n State.cursor1 = {line=line_index, pos=pos, posB=posB}\n break\n end\n elseif line.mode == 'drawing' then\n local line_cache = State.line_cache[line_index]\n if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then\n State.lines.current_drawing_index = line_index\n State.lines.current_drawing = line\n Drawing.before = snapshot(State, line_index)\n Drawing.mouse_pressed(State, line_index, x,y, mouse_button)\n break\n end\n"},{"Del":" if State.search_term then return end\n--? print('release')\n if State.lines.current_drawing then\n Drawing.mouse_released(State, x,y, mouse_button)\n schedule_save(State)\n if Drawing.before then\n record_undo_event(State, {before=Drawing.before, after=snapshot(State, State.lines.current_drawing_index)})\n Drawing.before = nil\n end\n end\n"},{"Del":" elseif State.current_drawing_mode == 'name' then\n local before = snapshot(State, State.lines.current_drawing_index)\n local drawing = State.lines.current_drawing\n local p = drawing.points[drawing.pending.target_point]\n p.name = p.name..t\n record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})\n"},{"Del":" elseif chord == 'C-i' then\n"},{"Del":" -- invalidate various cached bits of lines\n State.lines.current_drawing = nil\n"},{"Del":" -- invalidate various cached bits of lines\n State.lines.current_drawing = nil\n"},{"Del":" -- dispatch to drawing or text\n elseif App.mouse_down(1) or chord:sub(1,2) == 'C-' then\n -- DON'T reset line_cache.starty here\n local drawing_index, drawing = Drawing.current_drawing(State)\n if drawing_index then\n local before = snapshot(State, drawing_index)\n Drawing.keychord_pressed(State, chord)\n record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})\n schedule_save(State)\n end\n elseif chord == 'escape' and not App.mouse_down(1) then\n for _,line in ipairs(State.lines) do\n if line.mode == 'drawing' then\n line.show_help = false\n end\n end\n elseif State.current_drawing_mode == 'name' then\n if chord == 'return' then\n State.current_drawing_mode = State.previous_drawing_mode\n State.previous_drawing_mode = nil\n else\n local before = snapshot(State, State.lines.current_drawing_index)\n local drawing = State.lines.current_drawing\n local p = drawing.points[drawing.pending.target_point]\n if chord == 'escape' then\n p.name = nil\n record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})\n elseif chord == 'backspace' then\n local len = utf8.len(p.name)\n local byte_offset = Text.offset(p.name, len-1)\n if len == 1 then byte_offset = 0 end\n p.name = string.sub(p.name, 1, byte_offset)\n record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})\n end\n end\n schedule_save(State)\n"},{"Del":" else\n for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll\n Text.keychord_pressed(State, chord)\n end\nend\n\nfunction edit.eradicate_locations_after_the_fold(State)\n -- eradicate side B from any locations we track\n if State.cursor1.posB then\n State.cursor1.posB = nil\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line].data)\n State.cursor1.pos = Text.pos_at_start_of_screen_line(State, State.cursor1)\n end\n if State.screen_top1.posB then\n State.screen_top1.posB = nil\n State.screen_top1.pos = utf8.len(State.lines[State.screen_top1.line].data)\n State.screen_top1.pos = Text.pos_at_start_of_screen_line(State, State.screen_top1)\n end\nend\n\nfunction edit.key_released(State, key, scancode)\nend\n\nfunction edit.update_font_settings(State, font_height)\n State.font_height = font_height\n love.graphics.setFont(love.graphics.newFont(Editor_state.font_height))\n State.line_height = math.floor(font_height*1.3)\n State.em = App.newText(love.graphics.getFont(), 'm')\n Text_cache = {}\nend\n\n--== some methods for tests\n\nTest_margin_left = 25\n\nfunction edit.initialize_test_state()\n -- if you change these values, tests will start failing\n return edit.initialize_state(\n 15, -- top margin\n Test_margin_left,\n App.screen.width, -- right margin = 0\n 14, -- font height assuming default LÖVE font\n 15) -- line height\nend\n\n-- all textinput events are also keypresses\n-- TODO: handle chords of multiple keys\nfunction edit.run_after_textinput(State, t)\n edit.keychord_pressed(State, t)\n edit.textinput(State, t)\n edit.key_released(State, t)\n App.screen.contents = {}\n edit.draw(State)\nend\n\n-- not all keys are textinput\nfunction edit.run_after_keychord(State, chord)\n edit.keychord_pressed(State, chord)\n edit.key_released(State, chord)\n App.screen.contents = {}\n edit.draw(State)\nend\n\nfunction edit.run_after_mouse_click(State, x,y, mouse_button)\n App.fake_mouse_press(x,y, mouse_button)\n edit.mouse_pressed(State, x,y, mouse_button)\n App.fake_mouse_release(x,y, mouse_button)\n edit.mouse_released(State, x,y, mouse_button)\n App.screen.contents = {}\n edit.draw(State)\nend\n\nfunction edit.run_after_mouse_press(State, x,y, mouse_button)\n App.fake_mouse_press(x,y, mouse_button)\n edit.mouse_pressed(State, x,y, mouse_button)\n App.screen.contents = {}\n edit.draw(State)\nend\n\nfunction edit.run_after_mouse_release(State, x,y, mouse_button)\n App.fake_mouse_release(x,y, mouse_button)\n edit.mouse_released(State, x,y, mouse_button)\n App.screen.contents = {}\n edit.draw(State)\nend\n"},{"Del":" -- if we're scrolling, reclaim all fragments to avoid memory leaks\n Text.redraw_all(State)\n schedule_save(State)\n end\n -- clipboard\n elseif chord == 'C-c' then\n local s = Text.selection(State)\n if s then\n App.setClipboardText(s)\n end\n elseif chord == 'C-x' then\n for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll\n local s = Text.cut_selection(State, State.left, State.right)\n if s then\n App.setClipboardText(s)\n end\n schedule_save(State)\n elseif chord == 'C-v' then\n for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll\n -- We don't have a good sense of when to scroll, so we'll be conservative\n -- and sometimes scroll when we didn't quite need to.\n local before_line = State.cursor1.line\n local before = snapshot(State, before_line)\n local clipboard_data = App.getClipboardText()\n for _,code in utf8.codes(clipboard_data) do\n local c = utf8.char(code)\n if c == '\\n' then\n Text.insert_return(State)\n else\n Text.insert_at_cursor(State, c)\n end\n end\n if Text.cursor_out_of_screen(State) then\n Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)\n end\n schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})\n"},{"Del":" -- if we're scrolling, reclaim all fragments to avoid memory leaks\n Text.redraw_all(State)\n schedule_save(State)\n end\n elseif chord == 'C-y' then\n for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll\n local event = redo_event(State)\n if event then\n local src = event.after\n State.screen_top1 = deepcopy(src.screen_top)\n State.cursor1 = deepcopy(src.cursor)\n patch(State.lines, event.before, event.after)\n"},{"Del":" if State.cursor1.posB == nil then\n local before = snapshot(State, State.cursor1.line)\n if State.lines[State.cursor1.line].dataB == nil then\n State.lines[State.cursor1.line].dataB = ''\n end\n State.lines[State.cursor1.line].expanded = true\n State.cursor1.pos = nil\n State.cursor1.posB = 1\n if Text.cursor_out_of_screen(State) then\n Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)\n end\n schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})\n end\n -- zoom\n elseif chord == 'C-=' then\n edit.update_font_settings(State, State.font_height+2)\n Text.redraw_all(State)\n elseif chord == 'C--' then\n edit.update_font_settings(State, State.font_height-2)\n Text.redraw_all(State)\n elseif chord == 'C-0' then\n edit.update_font_settings(State, 20)\n Text.redraw_all(State)\n -- undo\n elseif chord == 'C-z' then\n for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll\n local event = undo_event(State)\n if event then\n local src = event.before\n State.screen_top1 = deepcopy(src.screen_top)\n State.cursor1 = deepcopy(src.cursor)\n patch(State.lines, event.after, event.before)\n patch_placeholders(State.line_cache, event.after, event.before)\n"},{"Del":" else\n Text.textinput(State, t)\n end\n schedule_save(State)\nend\n\nfunction edit.keychord_pressed(State, chord, key)\n if State.search_term then\n if chord == 'escape' then\n State.search_term = nil\n State.search_text = nil\n State.cursor1 = State.search_backup.cursor\n State.screen_top1 = State.search_backup.screen_top\n State.search_backup = nil\n Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks\n elseif chord == 'return' then\n State.search_term = nil\n State.search_text = nil\n State.search_backup = nil\n elseif chord == 'backspace' then\n local len = utf8.len(State.search_term)\n local byte_offset = Text.offset(State.search_term, len)\n State.search_term = string.sub(State.search_term, 1, byte_offset-1)\n State.search_text = nil\n elseif chord == 'down' then\n if State.cursor1.pos then\n State.cursor1.pos = State.cursor1.pos+1\n else\n State.cursor1.posB = State.cursor1.posB+1\n end\n Text.search_next(State)\n elseif chord == 'up' then\n Text.search_previous(State)\n end\n return\n elseif chord == 'C-f' then\n State.search_term = ''\n State.search_backup = {\n cursor={line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB},\n screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos, posB=State.screen_top1.posB},\n }\n assert(State.search_text == nil)\n -- bifold text\n elseif chord == 'C-b' then\n State.expanded = not State.expanded\n Text.redraw_all(State)\n if not State.expanded then\n for _,line in ipairs(State.lines) do\n line.expanded = nil\n end\n edit.eradicate_locations_after_the_fold(State)\n end\n"},{"Del":"end\n\nfunction edit.textinput(State, t)\n for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end -- just in case we scroll\n if State.search_term then\n State.search_term = State.search_term..t\n State.search_text = nil\n Text.search_next(State)\n"},{"Del":" end\n end\nend\n\nfunction edit.mouse_released(State, x,y, mouse_button)\n"},{"Del":" if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then\n -- press on a button and it returned 'true' to short-circuit\n return\n end\n\n for line_index,line in ipairs(State.lines) do\n"},{"Del":" if State.next_save and State.next_save < App.getTime() then\n save_to_disk(State)\n State.next_save = nil\n end\nend\n\nfunction schedule_save(State)\n if State.next_save == nil then\n State.next_save = App.getTime() + 3 -- short enough that you're likely to still remember what you did\n end\nend\n\nfunction edit.quit(State)\n -- make sure to save before quitting\n if State.next_save then\n save_to_disk(State)\n end\nend\n\nfunction edit.mouse_pressed(State, x,y, mouse_button)\n if State.search_term then return end\n"},{"Del":" end\n"},{"Del":" end\n"},{"Del":"--? print('text.draw', y, line_index)\n"},{"Del":" if y + State.line_height > App.screen.height then break end\n State.screen_bottom1 = {line=line_index, pos=nil, posB=nil}\n"},{"Del":"function edit.draw(State)\n State.button_handlers = {}\n App.color(Text_color)\n assert(#State.lines == #State.line_cache)\n if not Text.le1(State.screen_top1, State.cursor1) then\n print(State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.cursor1.posB)\n assert(false)\n end\n State.cursor_x = nil\n State.cursor_y = nil\n local y = State.top\n--? print('== draw')\n for line_index = State.screen_top1.line,#State.lines do\n local line = State.lines[line_index]\n"},{"Del":" font_height = font_height,\n line_height = line_height,\n em = App.newText(love.graphics.getFont(), 'm'), -- widest possible character width\n\n top = top,\n left = left,\n right = right,\n width = right-left,\n\n filename = love.filesystem.getUserDirectory()..'/lines.txt',\n next_save = nil,\n\n -- undo\n history = {},\n next_history = 1,\n\n -- search\n search_term = nil,\n search_text = nil,\n search_backup = nil, -- stuff to restore when cancelling search\n }\n return result\nend -- App.initialize_state\n\n"},{"Del":"\n -- Lines can be too long to fit on screen, in which case they _wrap_ into\n -- multiple _screen lines_.\n\n -- rendering wrapped text lines needs some additional short-lived data per line:\n -- startpos, the index of data the line starts rendering from, can only be >1 for topmost line on screen\n -- starty, the y coord in pixels the line starts rendering from\n -- fragments: snippets of rendered love.graphics.Text, guaranteed to not straddle screen lines\n -- screen_line_starting_pos: optional array of grapheme indices if it wraps over more than one screen line\n line_cache = {},\n\n -- Given wrapping, any potential location for the text cursor can be described in two ways:\n -- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units)\n -- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line.\n -- Positions (and screen line indexes) can be in either the A or the B side.\n --\n -- Most of the time we'll only persist positions in schema 1, translating to\n -- schema 2 when that's convenient.\n --\n -- Make sure these coordinates are never aliased, so that changing one causes\n -- action at a distance.\n screen_top1 = {line=1, pos=1, posB=nil}, -- position of start of screen line at top of screen\n cursor1 = {line=1, pos=1, posB=nil}, -- position of cursor\n screen_bottom1 = {line=1, pos=1, posB=nil}, -- position of start of screen line at bottom of screen\n\n -- cursor coordinates in pixels\n cursor_x = 0,\n cursor_y = 0,\n\n"},{"Del":"edit = {}\n\n-- run in both tests and a real run\nfunction edit.initialize_state(top, left, right, font_height, line_height) -- currently always draws to bottom of screen\n local result = {\n"},{"Del":"\n"},{"Del":"Fold_color = {r=0, g=0.6, b=0}\nFold_background_color = {r=0, g=0.7, b=0}\n\nMargin_top = 15\nMargin_left = 25\nMargin_right = 25\n"},{"Del":"Focus_stroke_color = {r=1, g=0, b=0} -- what mouse is hovering over\nHighlight_color = {r=0.7, g=0.7, b=0.9} -- selected text\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source.lua","metadata":0},{"basename":"source.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":177652,"end":177686},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":177652,"end":177686},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":177686},"to":{"change":6,"start":165766,"end":165766},"introduced_by":3}],"inode":{"change":6,"pos":165766}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":166103},"to":{"change":4,"start":11,"end":42},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":166183},"to":{"change":4,"start":43,"end":80},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":174838},"to":{"change":5,"start":24758,"end":24806},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":24806},"to":{"change":6,"start":174898,"end":177651},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":4,"pos":80},"to":{"change":6,"start":166183,"end":167316},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":42},"to":{"change":6,"start":166103,"end":166183},"introduced_by":4}],"inode":{"change":6,"pos":165766}},"content":[{"Del":" 'drawing',\n 'help',\n"},{"Del":" 'geom',\n 'drawing_tests',\n"},{"Del":" if x < Editor_state.right + Margin_right then\n"},{"Del":"--? print('click on edit side')\n if Focus ~= 'edit' then\n Focus = 'edit'\n end\n edit.mouse_pressed(Editor_state, x,y, mouse_button)\n elseif Show_log_browser_side and Log_browser_state.left <= x and x < Log_browser_state.right then\n--? print('click on log_browser side')\n if Focus ~= 'log_browser' then\n Focus = 'log_browser'\n end\n log_browser.mouse_pressed(Log_browser_state, x,y, mouse_button)\n for _,line_cache in ipairs(Editor_state.line_cache) do line_cache.starty = nil end -- just in case we scroll\n end\nend\n\nfunction source.mouse_released(x,y, mouse_button)\n Cursor_time = 0 -- ensure cursor is visible immediately after it moves\n if Focus == 'edit' then\n return edit.mouse_released(Editor_state, x,y, mouse_button)\n else\n return log_browser.mouse_released(Log_browser_state, x,y, mouse_button)\n end\nend\n\nfunction source.textinput(t)\n Cursor_time = 0 -- ensure cursor is visible immediately after it moves\n if Focus == 'edit' then\n return edit.textinput(Editor_state, t)\n else\n return log_browser.textinput(Log_browser_state, t)\n end\nend\n\nfunction source.keychord_pressed(chord, key)\n Cursor_time = 0 -- ensure cursor is visible immediately after it moves\n--? print('source keychord')\n if Show_file_navigator then\n keychord_pressed_on_file_navigator(chord, key)\n return\n end\n if chord == 'C-l' then\n--? print('C-l')\n Show_log_browser_side = not Show_log_browser_side\n if Show_log_browser_side then\n App.screen.width = Log_browser_state.right + Margin_right\n else\n App.screen.width = Editor_state.right + Margin_right\n end\n--? print('setting window:', App.screen.width, App.screen.height)\n love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)\n--? print('done setting window')\n -- try to restore position if possible\n -- if the window gets wider the window manager may not respect this\n source.set_window_position_from_settings(Settings.source)\n return\n end\n if chord == 'C-g' then\n Show_file_navigator = true\n File_navigation.index = 1\n return\n end\n if Focus == 'edit' then\n return edit.keychord_pressed(Editor_state, chord, key)\n else\n return log_browser.keychord_pressed(Log_browser_state, chord, key)\n end\nend\n\nfunction source.key_released(key, scancode)\n Cursor_time = 0 -- ensure cursor is visible immediately after it moves\n if Focus == 'edit' then\n return edit.key_released(Editor_state, key, scancode)\n else\n return log_browser.keychord_pressed(Log_browser_state, chordkey, scancode)\n end\nend\n\n-- use this sparingly\nfunction to_text(s)\n if Text_cache[s] == nil then\n Text_cache[s] = App.newText(love.graphics.getFont(), s)\n end\n return Text_cache[s]\nend\n"},{"Del":" 'file',\n 'source',\n 'source_tests',\n 'commands',\n 'log_browser',\n 'source_edit',\n 'source_text',\n 'source_undo',\n 'colorize',\n 'source_text_tests',\n 'source_file',\n 'main',\n 'button',\n 'keychord',\n 'app',\n 'test',\n 'json',\n },\n index = 1,\n }\n\n Menu_status_bar_height = nil -- initialized below\n\n -- a few text objects we can avoid recomputing unless the font changes\n Text_cache = {}\n\n -- blinking cursor\n Cursor_time = 0\nend\n\n-- called only for real run\nfunction source.initialize()\n love.keyboard.setTextInput(true) -- bring up keyboard on touch screen\n love.keyboard.setKeyRepeat(true)\n\n love.graphics.setBackgroundColor(1,1,1)\n\n if Settings and Settings.source then\n source.load_settings()\n else\n source.initialize_default_settings()\n end\n\n source.initialize_edit_side{'run.lua'}\n source.initialize_log_browser_side()\n\n Menu_status_bar_height = 5 + Editor_state.line_height + 5\n Editor_state.top = Editor_state.top + Menu_status_bar_height\n Log_browser_state.top = Log_browser_state.top + Menu_status_bar_height\n"},{"Del":" 'text',\n 'search',\n 'select',\n 'undo',\n 'text_tests',\n"}]}},{"FileDel":{"deleted_names":[{"basename":"commands.lua","metadata":0},{"basename":"commands.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":207726,"end":207762},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":207726,"end":207762},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":207762},"to":{"change":6,"start":204370,"end":204370},"introduced_by":6}],"inode":{"change":6,"pos":204370}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":205424},"to":{"change":5,"start":25416,"end":25474},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":25474},"to":{"change":6,"start":205482,"end":207725},"introduced_by":5}],"inode":{"change":6,"pos":204370}},"content":[{"Del":" add_hotkey_to_menu('ctrl+i: create/edit debug print')\n"},{"Del":" add_hotkey_to_menu('ctrl+f: find in file')\n add_hotkey_to_menu('alt+left alt+right: prev/next word')\n elseif Focus == 'log_browser' then\n -- nothing yet\n else\n assert(false, 'unknown focus \"'..Focus..'\"')\n end\n add_hotkey_to_menu('ctrl+z ctrl+y: undo/redo')\n add_hotkey_to_menu('ctrl+x ctrl+c ctrl+v: cut/copy/paste')\n add_hotkey_to_menu('ctrl+= ctrl+- ctrl+0: zoom')\nend\n\nfunction add_hotkey_to_menu(s)\n if Text_cache[s] == nil then\n Text_cache[s] = App.newText(love.graphics.getFont(), s)\n end\n local width = App.width(Text_cache[s])\n if Menu_cursor + width > App.screen.width - 5 then\n return\n end\n App.color(Menu_command_color)\n App.screen.draw(Text_cache[s], Menu_cursor,5)\n Menu_cursor = Menu_cursor + width + 30\nend\n\nfunction source.draw_file_navigator()\n for i,file in ipairs(File_navigation.candidates) do\n if file == 'source' then\n App.color(Menu_border_color)\n love.graphics.line(Menu_cursor-10,2, Menu_cursor-10,Menu_status_bar_height-2)\n end\n add_file_to_menu(file, i == File_navigation.index)\n end\nend\n\nfunction add_file_to_menu(s, cursor_highlight)\n if Text_cache[s] == nil then\n Text_cache[s] = App.newText(love.graphics.getFont(), s)\n end\n local width = App.width(Text_cache[s])\n if Menu_cursor + width > App.screen.width - 5 then\n return\n end\n if cursor_highlight then\n App.color(Menu_highlight_color)\n love.graphics.rectangle('fill', Menu_cursor-5,5-2, App.width(Text_cache[s])+5*2,Editor_state.line_height+2*2)\n end\n App.color(Menu_command_color)\n App.screen.draw(Text_cache[s], Menu_cursor,5)\n Menu_cursor = Menu_cursor + width + 30\nend\n\nfunction keychord_pressed_on_file_navigator(chord, key)\n if chord == 'escape' then\n Show_file_navigator = false\n elseif chord == 'return' then\n local candidate = guess_source(File_navigation.candidates[File_navigation.index]..'.lua')\n source.switch_to_file(candidate)\n Show_file_navigator = false\n elseif chord == 'left' then\n if File_navigation.index > 1 then\n File_navigation.index = File_navigation.index-1\n end\n elseif chord == 'right' then\n if File_navigation.index < #File_navigation.candidates then\n File_navigation.index = File_navigation.index+1\n end\n end\nend\n"}]}},{"Edit":{"inode":{"change":6,"pos":1},"path":"text.lua","line":420,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":657},"to":{"change":5,"start":415,"end":476},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":657},"to":{"change":5,"start":415,"end":476},"introduced_by":6}],"inode":{"change":6,"pos":1}}},"contents":[{"Del":" State.cursor1 = {line=State.cursor1.line-1, pos=nil}\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":1},"path":"text.lua","line":420,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":4502}],"down_context":[{"change":6,"pos":3974}],"flag":"","start":4,"end":4,"inode":{"change":6,"pos":1}}},"contents":[]}},{"Edit":{"inode":{"change":6,"pos":1},"path":"text.lua","line":450,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6283},"to":{"change":5,"start":477,"end":651},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":6283},"to":{"change":5,"start":477,"end":651},"introduced_by":6}],"inode":{"change":6,"pos":1}}},"contents":[{"Del":" State.cursor1 = {\n line = new_cursor_line,\n pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),\n }\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":1},"path":"text.lua","line":450,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":5714}],"down_context":[{"change":6,"pos":1313}],"flag":"","start":6,"end":6,"inode":{"change":6,"pos":1}}},"contents":[]}},{"Edit":{"inode":{"change":6,"pos":1},"path":"text.lua","line":556,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428},"to":{"change":5,"start":723,"end":858},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":428},"to":{"change":5,"start":723,"end":858},"introduced_by":6}],"inode":{"change":6,"pos":1}}},"contents":[{"Del":" State.cursor1 = {\n line = new_cursor_line,\n pos = utf8.len(State.lines[new_cursor_line].data) + 1,\n }\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":1},"path":"text.lua","line":556,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":5437}],"down_context":[{"change":6,"pos":6550}],"flag":"","start":8,"end":8,"inode":{"change":6,"pos":1}}},"contents":[]}},{"Edit":{"inode":{"change":6,"pos":1},"path":"text.lua","line":578,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1156},"to":{"change":5,"start":859,"end":913},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":1156},"to":{"change":5,"start":859,"end":913},"introduced_by":6}],"inode":{"change":6,"pos":1}}},"contents":[{"Del":" State.cursor1 = {line=new_cursor_line, pos=1}\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":1},"path":"text.lua","line":578,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":6919}],"down_context":[{"change":6,"pos":1327}],"flag":"","start":10,"end":10,"inode":{"change":6,"pos":1}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":6,"pos":1},"path":"text.lua","line":787,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":109},"to":{"change":5,"start":1426,"end":1460},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":109},"to":{"change":5,"start":1426,"end":1460},"introduced_by":6}],"inode":{"change":6,"pos":1}}},"contents":[{"Add":" local result = {line=loc1.line}\n"}]}},{"Edit":{"inode":{"change":6,"pos":68},"path":"source_undo.lua","line":53,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1850}],"down_context":[{"change":6,"pos":1850}],"flag":"BLOCK","start":13,"end":107,"inode":{"change":6,"pos":68}}},"contents":[{"Add":" current_drawing_mode=Drawing_mode,"},{"Add":" previous_drawing_mode=State.previous_drawing_mode,"}]}},{"Replacement":{"inode":{"change":6,"pos":68},"path":"source_undo.lua","line":63,"ins":{"up_context":[{"change":6,"pos":2077}],"down_context":[{"change":6,"pos":2143}],"flag":"BLOCK","start":108,"end":810,"inode":{"change":6,"pos":68}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2077},"to":{"change":6,"start":2077,"end":2143},"introduced_by":6}],"inode":{"change":6,"pos":68}},"ins_contents":[{"Add":" if line.mode == 'text' then"},{"Add":" table.insert(event.lines, {mode='text', data=line.data, dataB=line.dataB})"},{"Add":" elseif line.mode == 'drawing' then"},{"Add":" local points=deepcopy(line.points)"},{"Add":"--? print('copying', line.points, 'with', #line.points, 'points into', points)"},{"Add":" local shapes=deepcopy(line.shapes)"},{"Add":"--? print('copying', line.shapes, 'with', #line.shapes, 'shapes into', shapes)"},{"Add":" table.insert(event.lines, {mode='drawing', h=line.h, points=points, shapes=shapes, pending={}})"},{"Add":"--? table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})"},{"Add":" else"},{"Add":" print(line.mode)"},{"Add":" assert(false)"},{"Add":" end"}],"del_contents":[{"Del":" table.insert(event.lines, {data=line.data, dataB=line.dataB})\n"}]}},{"Edit":{"inode":{"change":6,"pos":3561},"path":"source_text_tests.lua","line":15,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":4242}],"down_context":[{"change":6,"pos":4242}],"flag":"BLOCK","start":812,"end":2116,"inode":{"change":6,"pos":3561}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function test_click_to_create_drawing()"},{"Add":" io.write('\\ntest_click_to_create_drawing')"},{"Add":" App.screen.init{width=120, height=60}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)"},{"Add":" -- cursor skips drawing to always remain on text"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_click_to_create_drawing/#lines')"},{"Add":" check_eq(Editor_state.cursor1.line, 2, 'F - test_click_to_create_drawing/cursor')"},{"Add":"end"},{"Add":""},{"Add":"function test_backspace_to_delete_drawing()"},{"Add":" io.write('\\ntest_backspace_to_delete_drawing')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=120, height=60}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" -- cursor is on text as always (outside tests this will get initialized correctly)"},{"Add":" Editor_state.cursor1.line = 2"},{"Add":" -- backspacing deletes the drawing"},{"Add":" edit.run_after_keychord(Editor_state, 'backspace')"},{"Add":" check_eq(#Editor_state.lines, 1, 'F - test_backspace_to_delete_drawing/#lines')"},{"Add":" check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_to_delete_drawing/cursor')"}]}},{"Edit":{"inode":{"change":6,"pos":3561},"path":"source_text_tests.lua","line":724,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34251}],"down_context":[{"change":6,"pos":34251}],"flag":"BLOCK","start":2117,"end":3806,"inode":{"change":6,"pos":3561}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function test_pagedown_skips_drawings()"},{"Add":" io.write('\\ntest_pagedown_skips_drawings')"},{"Add":" -- some lines of text with a drawing intermixed"},{"Add":" local drawing_width = 50"},{"Add":" App.screen.init{width=Editor_state.left+drawing_width, height=80}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'abc', -- height 15"},{"Add":" '```lines', '```', -- height 25"},{"Add":" 'def', -- height 15"},{"Add":" 'ghi'} -- height 15"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" check_eq(Editor_state.lines[2].mode, 'drawing', 'F - test_pagedown_skips_drawings/baseline/lines')"},{"Add":" Editor_state.cursor1 = {line=1, pos=1}"},{"Add":" Editor_state.screen_top1 = {line=1, pos=1}"},{"Add":" Editor_state.screen_bottom1 = {}"},{"Add":" local drawing_height = Drawing_padding_height + drawing_width/2 -- default"},{"Add":" -- initially the screen displays the first line and the drawing"},{"Add":" -- 15px margin + 15px line1 + 10px margin + 25px drawing + 10px margin = 75px < screen height 80px"},{"Add":" edit.draw(Editor_state)"},{"Add":" local y = Editor_state.top"},{"Add":" App.screen.check(y, 'abc', 'F - test_pagedown_skips_drawings/baseline/screen:1')"},{"Add":" -- after pagedown the screen draws the drawing up top"},{"Add":" -- 15px margin + 10px margin + 25px drawing + 10px margin + 15px line3 = 75px < screen height 80px"},{"Add":" edit.run_after_keychord(Editor_state, 'pagedown')"},{"Add":" check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown_skips_drawings/screen_top')"},{"Add":" check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_skips_drawings/cursor')"},{"Add":" y = Editor_state.top + drawing_height"},{"Add":" App.screen.check(y, 'def', 'F - test_pagedown_skips_drawings/screen:1')"}]}},{"Replacement":{"inode":{"change":6,"pos":3561},"path":"source_text_tests.lua","line":1588,"ins":{"up_context":[{"change":6,"pos":80491}],"down_context":[{"change":6,"pos":80553}],"flag":"BLOCK","start":3807,"end":3881,"inode":{"change":6,"pos":3561}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80491},"to":{"change":6,"start":80491,"end":80553},"introduced_by":6}],"inode":{"change":6,"pos":3561}},"ins_contents":[{"Add":" Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', 'deg'}"}],"del_contents":[{"Del":" Editor_state.lines = load_array{'abc', 'def', 'ghi', 'deg'}\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":56,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":85916},"to":{"change":6,"start":85916,"end":86070},"introduced_by":6}],"inode":{"change":6,"pos":83786}}},"contents":[{"Del":"--? if Foo then\n--? print('draw:', State.lines[line_index].data, \"=====\", State.lines[line_index].dataB, 'starting from x', x+AB_padding)\n--? end\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":196,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":91548}],"down_context":[{"change":6,"pos":91548}],"flag":"BLOCK","start":3883,"end":3924,"inode":{"change":6,"pos":83786}}},"contents":[{"Add":" if line.mode ~= 'text' then return end"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":223,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":92382}],"down_context":[{"change":6,"pos":92382}],"flag":"BLOCK","start":3925,"end":3966,"inode":{"change":6,"pos":83786}}},"contents":[{"Add":" if line.mode ~= 'text' then return end"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":418,"ins":{"up_context":[{"change":6,"pos":101828}],"down_context":[{"change":6,"pos":102158}],"flag":"BLOCK","start":3967,"end":4511,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":101828},"to":{"change":6,"start":101828,"end":102158},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" if State.lines[State.cursor1.line-1].mode == 'drawing' then"},{"Add":" table.remove(State.lines, State.cursor1.line-1)"},{"Add":" table.remove(State.line_cache, State.cursor1.line-1)"},{"Add":" else"},{"Add":" -- join lines"},{"Add":" State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1"},{"Add":" State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data"},{"Add":" table.remove(State.lines, State.cursor1.line)"},{"Add":" table.remove(State.line_cache, State.cursor1.line)"},{"Add":" end"}],"del_contents":[{"Del":" -- join lines\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1\n State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data\n table.remove(State.lines, State.cursor1.line)\n table.remove(State.line_cache, State.cursor1.line)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":478,"ins":{"up_context":[{"change":6,"pos":104958}],"down_context":[{"change":6,"pos":105223}],"flag":"BLOCK","start":4512,"end":4858,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":104958},"to":{"change":6,"start":104958,"end":105223},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" if State.lines[State.cursor1.line+1].mode == 'text' then"},{"Add":" -- join lines"},{"Add":" State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data"},{"Add":" -- delete side B on first line"},{"Add":" State.lines[State.cursor1.line].dataB = State.lines[State.cursor1.line+1].dataB"},{"Add":" end"}],"del_contents":[{"Del":" -- join lines\n State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data\n -- delete side B on first line\n State.lines[State.cursor1.line].dataB = State.lines[State.cursor1.line+1].dataB\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":539,"ins":{"up_context":[{"change":6,"pos":106965}],"down_context":[{"change":6,"pos":107132}],"flag":"BLOCK","start":4859,"end":5039,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":106965},"to":{"change":6,"start":106965,"end":107132},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" table.insert(State.lines, State.cursor1.line+1, {mode='text', data=string.sub(State.lines[State.cursor1.line].data, byte_offset), dataB=State.lines[State.cursor1.line].dataB})"}],"del_contents":[{"Del":" table.insert(State.lines, State.cursor1.line+1, {data=string.sub(State.lines[State.cursor1.line].data, byte_offset), dataB=State.lines[State.cursor1.line].dataB})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":559,"ins":{"up_context":[{"change":6,"pos":107952}],"down_context":[{"change":6,"pos":107982}],"flag":"BLOCK","start":5040,"end":5319,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":107952},"to":{"change":6,"start":107952,"end":107982},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" if State.lines[State.screen_top1.line].mode == 'text' then"},{"Add":" y = y - State.line_height"},{"Add":" elseif State.lines[State.screen_top1.line].mode == 'drawing' then"},{"Add":" y = y - Drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width)"},{"Add":" end"}],"del_contents":[{"Del":" y = y - State.line_height\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":580,"ins":{"up_context":[{"change":6,"pos":108635}],"down_context":[{"change":6,"pos":108722}],"flag":"BLOCK","start":5320,"end":5439,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":108635},"to":{"change":6,"start":108635,"end":108722},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos, posB=State.screen_bottom1.posB}"}],"del_contents":[{"Del":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":591,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":109190}],"down_context":[{"change":6,"pos":109190}],"flag":"BLOCK","start":5440,"end":5497,"inode":{"change":6,"pos":83786}}},"contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":605,"ins":{"up_context":[{"change":6,"pos":109662}],"down_context":[{"change":6,"pos":110542}],"flag":"BLOCK","start":5498,"end":6569,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":109662},"to":{"change":6,"start":109662,"end":110542},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line > 1 do"},{"Add":" new_cursor_line = new_cursor_line-1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":"--? print('found previous text line')"},{"Add":" State.cursor1 = {line=State.cursor1.line-1, pos=nil}"},{"Add":" Text.populate_screen_line_starting_pos(State, State.cursor1.line)"},{"Add":" -- previous text line found, pick its final screen line"},{"Add":"--? print('has multiple screen lines')"},{"Add":" local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos"},{"Add":"--? print(#screen_line_starting_pos)"},{"Add":" screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]"},{"Add":" local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)"},{"Add":" local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)"},{"Add":" State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if State.cursor1.line > 1 then\n--? print('found previous text line')\n State.cursor1 = {line=State.cursor1.line-1, pos=nil}\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n -- previous text line found, pick its final screen line\n--? print('has multiple screen lines')\n local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos\n--? print(#screen_line_starting_pos)\n screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]\n local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)\n State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":645,"ins":{"up_context":[{"change":6,"pos":111691}],"down_context":[{"change":6,"pos":112426}],"flag":"BLOCK","start":6570,"end":7469,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":111691},"to":{"change":6,"start":111691,"end":112426},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line > 1 do"},{"Add":" new_cursor_line = new_cursor_line-1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {line=State.cursor1.line-1, posB=nil}"},{"Add":" Text.populate_screen_line_starting_pos(State, State.cursor1.line)"},{"Add":" local prev_line_cache = State.line_cache[State.cursor1.line]"},{"Add":" local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]"},{"Add":" local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)"},{"Add":" local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)"},{"Add":" State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if State.cursor1.line > 1 then\n State.cursor1.line = State.cursor1.line-1\n State.cursor1.posB = nil\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n local prev_line_cache = State.line_cache[State.cursor1.line]\n local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]\n local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)\n State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":696,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":114899}],"down_context":[{"change":6,"pos":114899}],"flag":"BLOCK","start":7470,"end":7527,"inode":{"change":6,"pos":83786}}},"contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":701,"ins":{"up_context":[{"change":6,"pos":115209}],"down_context":[{"change":6,"pos":115465}],"flag":"BLOCK","start":7528,"end":7954,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115209},"to":{"change":6,"start":115209,"end":115465},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line < #State.lines do"},{"Add":" new_cursor_line = new_cursor_line+1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {"},{"Add":" line = new_cursor_line,"},{"Add":" pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),"},{"Add":" }"},{"Add":"--? print(State.cursor1.pos)"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if State.cursor1.line < #State.lines then\n State.cursor1 = {\n line = State.cursor1.line+1,\n pos = Text.nearest_cursor_pos(State.lines[State.cursor1.line+1].data, State.cursor_x, State.left)\n }\n--? print(State.cursor1.pos)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":766,"ins":{"up_context":[{"change":6,"pos":118588}],"down_context":[{"change":6,"pos":118654}],"flag":"BLOCK","start":7955,"end":8062,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118588},"to":{"change":6,"start":118588,"end":118654},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB} -- copy"}],"del_contents":[{"Del":" State.screen_top1 = {line=State.cursor1.line, pos=1} -- copy\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":948,"ins":{"up_context":[{"change":6,"pos":123003}],"down_context":[{"change":6,"pos":123169}],"flag":"BLOCK","start":8063,"end":8417,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":123003},"to":{"change":6,"start":123003,"end":123169},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" else"},{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line > 1 do"},{"Add":" new_cursor_line = new_cursor_line-1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {"},{"Add":" line = new_cursor_line,"},{"Add":" pos = utf8.len(State.lines[new_cursor_line].data) + 1,"},{"Add":" }"},{"Add":" break"},{"Add":" end"},{"Add":" end"}],"del_contents":[{"Del":" elseif State.cursor1.line > 1 then\n State.cursor1 = {\n line = State.cursor1.line-1,\n pos = utf8.len(State.lines[State.cursor1.line-1].data) + 1,\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":991,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":124061}],"down_context":[{"change":6,"pos":124061}],"flag":"BLOCK","start":8418,"end":8475,"inode":{"change":6,"pos":83786}}},"contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1002,"ins":{"up_context":[{"change":6,"pos":124348}],"down_context":[{"change":6,"pos":124454}],"flag":"BLOCK","start":8476,"end":8763,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124348},"to":{"change":6,"start":124348,"end":124454},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" else"},{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line <= #State.lines-1 do"},{"Add":" new_cursor_line = new_cursor_line+1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {line=new_cursor_line, pos=1}"},{"Add":" break"},{"Add":" end"},{"Add":" end"}],"del_contents":[{"Del":" elseif State.cursor1.line <= #State.lines-1 then\n State.cursor1 = {line=State.cursor1.line+1, pos=1}\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1017,"ins":{"up_context":[{"change":6,"pos":124634}],"down_context":[{"change":6,"pos":124685}],"flag":"BLOCK","start":8764,"end":8771,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124634},"to":{"change":6,"start":124634,"end":124685},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" else"}],"del_contents":[{"Del":" elseif State.cursor1.line <= #State.lines-1 then\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1019,"ins":{"up_context":[{"change":6,"pos":124718}],"down_context":[{"change":6,"pos":124773}],"flag":"BLOCK","start":8772,"end":9052,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124718},"to":{"change":6,"start":124718,"end":124773},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line <= #State.lines-1 do"},{"Add":" new_cursor_line = new_cursor_line+1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {line=new_cursor_line, pos=1}"},{"Add":" break"},{"Add":" end"},{"Add":" end"}],"del_contents":[{"Del":" State.cursor1 = {line=State.cursor1.line+1, pos=1}\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1078,"ins":{"up_context":[{"change":6,"pos":126781}],"down_context":[{"change":6,"pos":126841}],"flag":"BLOCK","start":9053,"end":9780,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126781},"to":{"change":6,"start":126781,"end":126841},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" local y = State.top"},{"Add":" while State.cursor1.line <= #State.lines do"},{"Add":" if State.lines[State.cursor1.line].mode == 'text' then"},{"Add":" break"},{"Add":" end"},{"Add":"--? print('cursor skips', State.cursor1.line)"},{"Add":" y = y + Drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h, State.width)"},{"Add":" State.cursor1.line = State.cursor1.line + 1"},{"Add":" end"},{"Add":" -- hack: insert a text line at bottom of file if necessary"},{"Add":" if State.cursor1.line > #State.lines then"},{"Add":" assert(State.cursor1.line == #State.lines+1)"},{"Add":" table.insert(State.lines, {mode='text', data=''})"},{"Add":" table.insert(State.line_cache, {})"},{"Add":" end"},{"Add":"--? print(y, App.screen.height, App.screen.height-State.line_height)"},{"Add":" if y > App.screen.height - State.line_height then"}],"del_contents":[{"Del":" if State.top > App.screen.height - State.line_height then\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1119,"ins":{"up_context":[{"change":6,"pos":128059}],"down_context":[{"change":6,"pos":128133}],"flag":"BLOCK","start":9781,"end":10377,"inode":{"change":6,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":128059},"to":{"change":6,"start":128059,"end":128133},"introduced_by":6}],"inode":{"change":6,"pos":83786}},"ins_contents":[{"Add":" if top2.screen_line > 1 or State.lines[top2.line-1].mode == 'text' then"},{"Add":" local h = State.line_height"},{"Add":" if y - h < State.top then"},{"Add":" break"},{"Add":" end"},{"Add":" y = y - h"},{"Add":" else"},{"Add":" assert(top2.line > 1)"},{"Add":" assert(State.lines[top2.line-1].mode == 'drawing')"},{"Add":" -- We currently can't draw partial drawings, so either skip it entirely"},{"Add":" -- or not at all."},{"Add":" local h = Drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width)"},{"Add":" if y - h < State.top then"},{"Add":" break"},{"Add":" end"},{"Add":"--? print('skipping drawing of height', h)"},{"Add":" y = y - h"}],"del_contents":[{"Del":" local h = State.line_height\n if y - h < State.top then\n break\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1137,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":128141},"to":{"change":6,"start":128141,"end":128155},"introduced_by":6}],"inode":{"change":6,"pos":83786}}},"contents":[{"Del":" y = y - h\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1144,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":128732},"to":{"change":6,"start":128732,"end":128745},"introduced_by":6}],"inode":{"change":6,"pos":83786}}},"contents":[{"Del":" Foo = true\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1417,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":139954}],"down_context":[{"change":6,"pos":139954}],"flag":"BLOCK","start":10378,"end":10492,"inode":{"change":6,"pos":83786}}},"contents":[{"Add":" if State.lines[loc1.line].mode == 'drawing' then"},{"Add":" return {line=loc1.line, screen_line=1, screen_pos=1}"},{"Add":" end"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1530,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142698},"to":{"change":6,"start":142698,"end":142717},"introduced_by":6}],"inode":{"change":6,"pos":83786}}},"contents":[{"Del":"--? print('a')\n"}]}},{"Edit":{"inode":{"change":6,"pos":83786},"path":"source_text.lua","line":1532,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142820},"to":{"change":6,"start":142820,"end":142839},"introduced_by":6}],"inode":{"change":6,"pos":83786}}},"contents":[{"Del":"--? print('b')\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":28,"ins":{"up_context":[{"change":6,"pos":151025}],"down_context":[{"change":6,"pos":151186}],"flag":"BLOCK","start":10495,"end":10663,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151025},"to":{"change":6,"start":151025,"end":151186},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":" if line == '```lines' then -- inflexible with whitespace since these files are always autogenerated"},{"Add":" table.insert(result, load_drawing(infile_next_line))"}],"del_contents":[{"Del":" local line_info = {}\n if line:find(Fold) then\n _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":31,"ins":{"up_context":[{"change":6,"pos":151197}],"down_context":[{"change":6,"pos":151227}],"flag":"BLOCK","start":10664,"end":10939,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151197},"to":{"change":6,"start":151197,"end":151227},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":" local line_info = {mode='text'}"},{"Add":" if line:find(Fold) then"},{"Add":" _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')"},{"Add":" else"},{"Add":" line_info.data = line"},{"Add":" end"},{"Add":" table.insert(result, line_info)"}],"del_contents":[{"Del":" line_info.data = line\n"}]}},{"Edit":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":39,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151237},"to":{"change":6,"start":151237,"end":151275},"introduced_by":6}],"inode":{"change":6,"pos":150304}}},"contents":[{"Del":" table.insert(result, line_info)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":42,"ins":{"up_context":[{"change":6,"pos":151312}],"down_context":[{"change":6,"pos":151348}],"flag":"BLOCK","start":10940,"end":10989,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151312},"to":{"change":6,"start":151312,"end":151348},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":" table.insert(result, {mode='text', data=''})"}],"del_contents":[{"Del":" table.insert(result, {data=''})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":53,"ins":{"up_context":[{"change":6,"pos":151584}],"down_context":[{"change":6,"pos":151714}],"flag":"BLOCK","start":10990,"end":11243,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151584},"to":{"change":6,"start":151584,"end":151714},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":" if line.mode == 'drawing' then"},{"Add":" store_drawing(outfile, line)"},{"Add":" else"},{"Add":" outfile:write(line.data)"},{"Add":" if line.dataB and #line.dataB > 0 then"},{"Add":" outfile:write(Fold)"},{"Add":" outfile:write(line.dataB)"},{"Add":" end"},{"Add":" outfile:write('\\n')"}],"del_contents":[{"Del":" outfile:write(line.data)\n if line.dataB and #line.dataB > 0 then\n outfile:write(Fold)\n outfile:write(line.dataB)\n"}]}},{"Edit":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":63,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151722},"to":{"change":6,"start":151722,"end":151746},"introduced_by":6}],"inode":{"change":6,"pos":150304}}},"contents":[{"Del":" outfile:write('\\n')\n"}]}},{"Edit":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":65,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":151770}],"down_context":[{"change":6,"pos":151936}],"flag":"BLOCK","start":11244,"end":14107,"inode":{"change":6,"pos":150304}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function load_drawing(infile_next_line)"},{"Add":" local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}"},{"Add":" while true do"},{"Add":" local line = infile_next_line()"},{"Add":" assert(line)"},{"Add":" if line == '```' then break end"},{"Add":" local shape = json.decode(line)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" -- no changes needed"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local name = shape.p1.name"},{"Add":" shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p1].name = name"},{"Add":" name = shape.p2.name"},{"Add":" shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p2].name = name"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" for i,p in ipairs(shape.vertices) do"},{"Add":" local name = p.name"},{"Add":" shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.vertices[i]].name = name"},{"Add":" end"},{"Add":" elseif shape.mode == 'circle' or shape.mode == 'arc' then"},{"Add":" local name = shape.center.name"},{"Add":" shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.center].name = name"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" table.insert(drawing.shapes, shape)"},{"Add":" end"},{"Add":" return drawing"},{"Add":"end"},{"Add":""},{"Add":"function store_drawing(outfile, drawing)"},{"Add":" outfile:write('```lines\\n')"},{"Add":" for _,shape in ipairs(drawing.shapes) do"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" outfile:write(json.encode(shape), '\\n')"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})"},{"Add":" outfile:write(line, '\\n')"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" local obj = {mode=shape.mode, vertices={}}"},{"Add":" for _,p in ipairs(shape.vertices) do"},{"Add":" table.insert(obj.vertices, drawing.points[p])"},{"Add":" end"},{"Add":" local line = json.encode(obj)"},{"Add":" outfile:write(line, '\\n')"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}), '\\n')"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}), '\\n')"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" end"},{"Add":" outfile:write('```\\n')"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":141,"ins":{"up_context":[{"change":6,"pos":152134}],"down_context":[{"change":6,"pos":152289}],"flag":"BLOCK","start":14108,"end":14394,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152134},"to":{"change":6,"start":152134,"end":152289},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":"--? print(line)"},{"Add":" if line == '```lines' then -- inflexible with whitespace since these files are always autogenerated"},{"Add":"--? print('inserting drawing')"},{"Add":" i, drawing = load_drawing_from_array(next_line, a, i)"},{"Add":"--? print('i now', i)"},{"Add":" table.insert(result, drawing)"}],"del_contents":[{"Del":" local line_info = {}\n if line:find(Fold) then\n _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":148,"ins":{"up_context":[{"change":6,"pos":152298}],"down_context":[{"change":6,"pos":152326}],"flag":"BLOCK","start":14395,"end":14690,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152298},"to":{"change":6,"start":152298,"end":152326},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":"--? print('inserting text')"},{"Add":" local line_info = {mode='text'}"},{"Add":" if line:find(Fold) then"},{"Add":" _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')"},{"Add":" else"},{"Add":" line_info.data = line"},{"Add":" end"},{"Add":" table.insert(result, line_info)"}],"del_contents":[{"Del":" line_info.data = line\n"}]}},{"Edit":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":157,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152334},"to":{"change":6,"start":152334,"end":152370},"introduced_by":6}],"inode":{"change":6,"pos":150304}}},"contents":[{"Del":" table.insert(result, line_info)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":159,"ins":{"up_context":[{"change":6,"pos":152399}],"down_context":[{"change":6,"pos":152435}],"flag":"BLOCK","start":14691,"end":14740,"inode":{"change":6,"pos":150304}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152399},"to":{"change":6,"start":152399,"end":152435},"introduced_by":6}],"inode":{"change":6,"pos":150304}},"ins_contents":[{"Add":" table.insert(result, {mode='text', data=''})"}],"del_contents":[{"Del":" table.insert(result, {data=''})\n"}]}},{"Edit":{"inode":{"change":6,"pos":150304},"path":"source_file.lua","line":163,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152461}],"down_context":[],"flag":"BLOCK","start":14741,"end":16388,"inode":{"change":6,"pos":150304}}},"contents":[{"Add":""},{"Add":"function load_drawing_from_array(iter, a, i)"},{"Add":" local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}"},{"Add":" local line"},{"Add":" while true do"},{"Add":" i, line = iter(a, i)"},{"Add":" assert(i)"},{"Add":"--? print(i)"},{"Add":" if line == '```' then break end"},{"Add":" local shape = json.decode(line)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" -- no changes needed"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local name = shape.p1.name"},{"Add":" shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p1].name = name"},{"Add":" name = shape.p2.name"},{"Add":" shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p2].name = name"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" for i,p in ipairs(shape.vertices) do"},{"Add":" local name = p.name"},{"Add":" shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.vertices[i]].name = name"},{"Add":" end"},{"Add":" elseif shape.mode == 'circle' or shape.mode == 'arc' then"},{"Add":" local name = shape.center.name"},{"Add":" shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.center].name = name"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" table.insert(drawing.shapes, shape)"},{"Add":" end"},{"Add":" return i, drawing"},{"Add":"end"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":4,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152609}],"down_context":[{"change":6,"pos":152609}],"flag":"BLOCK","start":16390,"end":16583,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":"Stroke_color = {r=0, g=0, b=0}"},{"Add":"Current_stroke_color = {r=0.7, g=0.7, b=0.7} -- in process of being drawn"},{"Add":"Current_name_background_color = {r=1, g=0, b=0, a=0.1} -- name currently being edited"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":9,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152736}],"down_context":[{"change":6,"pos":152736}],"flag":"BLOCK","start":16584,"end":16742,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":"Icon_color = {r=0.7, g=0.7, b=0.7} -- color of current mode icon in drawings"},{"Add":"Help_color = {r=0, g=0.5, b=0}"},{"Add":"Help_background_color = {r=0, g=0.5, b=0, a=0.1}"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":18,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152861}],"down_context":[{"change":6,"pos":152861}],"flag":"BLOCK","start":16743,"end":16867,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":""},{"Add":"Drawing_padding_top = 10"},{"Add":"Drawing_padding_bottom = 10"},{"Add":"Drawing_padding_height = Drawing_padding_top + Drawing_padding_bottom"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":23,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152862}],"down_context":[{"change":6,"pos":152862}],"flag":"BLOCK","start":16868,"end":16956,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":"Same_point_distance = 4 -- pixel distance at which two points are considered the same"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":30,"ins":{"up_context":[{"change":6,"pos":153050}],"down_context":[{"change":6,"pos":153260}],"flag":"BLOCK","start":16957,"end":18126,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":153050},"to":{"change":6,"start":153050,"end":153260},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":" -- a line is either bifold text or a drawing"},{"Add":" -- a line of bifold text consists of an A side and an optional B side"},{"Add":" -- mode = 'text',"},{"Add":" -- string data,"},{"Add":" -- string dataB,"},{"Add":" -- expanded: whether to show B side"},{"Add":" -- a drawing is a table with:"},{"Add":" -- mode = 'drawing'"},{"Add":" -- a (y) coord in pixels (updated while painting screen),"},{"Add":" -- a (h)eight,"},{"Add":" -- an array of points, and"},{"Add":" -- an array of shapes"},{"Add":" -- a shape is a table containing:"},{"Add":" -- a mode"},{"Add":" -- an array points for mode 'freehand' (raw x,y coords; freehand drawings don't pollute the points array of a drawing)"},{"Add":" -- an array vertices for mode 'polygon', 'rectangle', 'square'"},{"Add":" -- p1, p2 for mode 'line'"},{"Add":" -- center, radius for mode 'circle'"},{"Add":" -- center, radius, start_angle, end_angle for mode 'arc'"},{"Add":" -- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide"},{"Add":" -- The field names are carefully chosen so that switching modes in midstream"},{"Add":" -- remembers previously entered points where that makes sense."},{"Add":" lines = {{mode='text', data='', dataB=nil, expanded=nil}}, -- array of lines"}],"del_contents":[{"Del":" -- a line of bifold text consists of an A side and an optional B side, each of which is a string\n -- expanded: whether to show B side\n lines = {{data='', dataB=nil, expanded=nil}}, -- array of lines\n"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":82,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":154867}],"down_context":[{"change":6,"pos":154867}],"flag":"BLOCK","start":18127,"end":18272,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" current_drawing_mode = 'line',"},{"Add":" previous_drawing_mode = nil, -- extra state for some ephemeral modes like moving/deleting/naming points"},{"Add":""}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":109,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":155413}],"down_context":[{"change":6,"pos":155413}],"flag":"BLOCK","start":18273,"end":18438,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":"function edit.fixup_cursor(State)"},{"Add":" for i,line in ipairs(State.lines) do"},{"Add":" if line.mode == 'text' then"},{"Add":" State.cursor1.line = i"},{"Add":" break"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":132,"ins":{"up_context":[{"change":6,"pos":155947}],"down_context":[{"change":6,"pos":155991}],"flag":"BLOCK","start":18439,"end":18494,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":155947},"to":{"change":6,"start":155947,"end":155991},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":"--? print('draw:', y, line_index, line, line.mode)"}],"del_contents":[{"Del":"--? print('draw:', y, line_index, line)\n"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":135,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156119}],"down_context":[{"change":6,"pos":156119}],"flag":"BLOCK","start":18495,"end":18527,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" if line.mode == 'text' then"}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":137,"ins":{"up_context":[{"change":6,"pos":156161}],"down_context":[{"change":6,"pos":156395}],"flag":"BLOCK","start":18528,"end":19646,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156161},"to":{"change":6,"start":156161,"end":156395},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":" local startpos, startposB = 1, nil"},{"Add":" if line_index == State.screen_top1.line then"},{"Add":" if State.screen_top1.pos then"},{"Add":" startpos = State.screen_top1.pos"},{"Add":" else"},{"Add":" startpos, startposB = nil, State.screen_top1.posB"},{"Add":" end"},{"Add":" end"},{"Add":" if line.data == '' then"},{"Add":" -- button to insert new drawing"},{"Add":" button(State, 'draw', {x=4,y=y+4, w=12,h=12, color={1,1,0},"},{"Add":" icon = icon.insert_drawing,"},{"Add":" onpress1 = function()"},{"Add":" Drawing.before = snapshot(State, line_index-1, line_index)"},{"Add":" table.insert(State.lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})"},{"Add":" table.insert(State.line_cache, line_index, {})"},{"Add":" if State.cursor1.line >= line_index then"},{"Add":" State.cursor1.line = State.cursor1.line+1"},{"Add":" end"},{"Add":" schedule_save(State)"},{"Add":" record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})"},{"Add":" end,"},{"Add":" })"}],"del_contents":[{"Del":" local startpos, startposB = 1, nil\n if line_index == State.screen_top1.line then\n if State.screen_top1.pos then\n startpos = State.screen_top1.pos\n else\n startpos, startposB = nil, State.screen_top1.posB\n"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":161,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156405}],"down_context":[{"change":6,"pos":156405}],"flag":"BLOCK","start":19647,"end":20061,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)"},{"Add":" y = y + State.line_height"},{"Add":"--? print('=> y', y)"},{"Add":" elseif line.mode == 'drawing' then"},{"Add":" y = y+Drawing_padding_top"},{"Add":" Drawing.draw(State, line_index, y)"},{"Add":" y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom"},{"Add":" else"},{"Add":" print(line.mode)"},{"Add":" assert(false)"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":172,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156413},"to":{"change":6,"start":156413,"end":156582},"introduced_by":6}],"inode":{"change":6,"pos":152503}}},"contents":[{"Del":" y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)\n y = y + State.line_height\n--? print('=> y', y)\n"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":179,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156691}],"down_context":[{"change":6,"pos":156691}],"flag":"BLOCK","start":20062,"end":20090,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" Drawing.update(State, dt)"}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":201,"ins":{"up_context":[{"change":6,"pos":157214}],"down_context":[{"change":6,"pos":157280}],"flag":"BLOCK","start":20091,"end":20112,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157214},"to":{"change":6,"start":157214,"end":157280},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":"--? print('press')"}],"del_contents":[{"Del":"--? print('press', State.selection1.line, State.selection1.pos)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":208,"ins":{"up_context":[{"change":6,"pos":157490}],"down_context":[{"change":6,"pos":157742}],"flag":"BLOCK","start":20113,"end":20834,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157490},"to":{"change":6,"start":157490,"end":157742},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":" if line.mode == 'text' then"},{"Add":" if Text.in_line(State, line_index, x,y) then"},{"Add":" local pos,posB = Text.to_pos_on_line(State, line_index, x, y)"},{"Add":" --? print(x,y, 'setting cursor:', line_index, pos, posB)"},{"Add":" State.cursor1 = {line=line_index, pos=pos, posB=posB}"},{"Add":" break"},{"Add":" end"},{"Add":" elseif line.mode == 'drawing' then"},{"Add":" local line_cache = State.line_cache[line_index]"},{"Add":" if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then"},{"Add":" State.lines.current_drawing_index = line_index"},{"Add":" State.lines.current_drawing = line"},{"Add":" Drawing.before = snapshot(State, line_index)"},{"Add":" Drawing.mouse_pressed(State, line_index, x,y, mouse_button)"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if Text.in_line(State, line_index, x,y) then\n local pos,posB = Text.to_pos_on_line(State, line_index, x, y)\n--? print(x,y, 'setting cursor:', line_index, pos, posB)\n State.cursor1 = {line=line_index, pos=pos, posB=posB}\n break\n"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":229,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":157816}],"down_context":[{"change":6,"pos":157816}],"flag":"BLOCK","start":20835,"end":21195,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" if State.search_term then return end"},{"Add":"--? print('release')"},{"Add":" if State.lines.current_drawing then"},{"Add":" Drawing.mouse_released(State, x,y, mouse_button)"},{"Add":" schedule_save(State)"},{"Add":" if Drawing.before then"},{"Add":" record_undo_event(State, {before=Drawing.before, after=snapshot(State, State.lines.current_drawing_index)})"},{"Add":" Drawing.before = nil"},{"Add":" end"},{"Add":" end"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":247,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":158089}],"down_context":[{"change":6,"pos":158089}],"flag":"BLOCK","start":21196,"end":21551,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" elseif State.current_drawing_mode == 'name' then"},{"Add":" local before = snapshot(State, State.lines.current_drawing_index)"},{"Add":" local drawing = State.lines.current_drawing"},{"Add":" local p = drawing.points[drawing.pending.target_point]"},{"Add":" p.name = p.name..t"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})"}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":305,"ins":{"up_context":[{"change":6,"pos":159838}],"down_context":[{"change":6,"pos":159867}],"flag":"BLOCK","start":21552,"end":21581,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":159838},"to":{"change":6,"start":159838,"end":159867},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":" elseif chord == 'C-i' then"}],"del_contents":[{"Del":" elseif chord == 'C-d' then\n"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":340,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":161237}],"down_context":[{"change":6,"pos":161237}],"flag":"BLOCK","start":21582,"end":21671,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" -- invalidate various cached bits of lines"},{"Add":" State.lines.current_drawing = nil"}]}},{"Edit":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":354,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":161740}],"down_context":[{"change":6,"pos":161740}],"flag":"BLOCK","start":21672,"end":21761,"inode":{"change":6,"pos":152503}}},"contents":[{"Add":" -- invalidate various cached bits of lines"},{"Add":" State.lines.current_drawing = nil"}]}},{"Replacement":{"inode":{"change":6,"pos":152503},"path":"source_edit.lua","line":393,"ins":{"up_context":[{"change":6,"pos":163162}],"down_context":[{"change":6,"pos":163184}],"flag":"BLOCK","start":21762,"end":23306,"inode":{"change":6,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":163162},"to":{"change":6,"start":163162,"end":163184},"introduced_by":6}],"inode":{"change":6,"pos":152503}},"ins_contents":[{"Add":" -- dispatch to drawing or text"},{"Add":" elseif App.mouse_down(1) or chord:sub(1,2) == 'C-' then"},{"Add":" -- DON'T reset line_cache.starty here"},{"Add":" local drawing_index, drawing = Drawing.current_drawing(State)"},{"Add":" if drawing_index then"},{"Add":" local before = snapshot(State, drawing_index)"},{"Add":" Drawing.keychord_pressed(State, chord)"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})"},{"Add":" schedule_save(State)"},{"Add":" end"},{"Add":" elseif chord == 'escape' and not App.mouse_down(1) then"},{"Add":" for _,line in ipairs(State.lines) do"},{"Add":" if line.mode == 'drawing' then"},{"Add":" line.show_help = false"},{"Add":" end"},{"Add":" end"},{"Add":" elseif State.current_drawing_mode == 'name' then"},{"Add":" if chord == 'return' then"},{"Add":" State.current_drawing_mode = State.previous_drawing_mode"},{"Add":" State.previous_drawing_mode = nil"},{"Add":" else"},{"Add":" local before = snapshot(State, State.lines.current_drawing_index)"},{"Add":" local drawing = State.lines.current_drawing"},{"Add":" local p = drawing.points[drawing.pending.target_point]"},{"Add":" if chord == 'escape' then"},{"Add":" p.name = nil"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})"},{"Add":" elseif chord == 'backspace' then"},{"Add":" local len = utf8.len(p.name)"},{"Add":" local byte_offset = Text.offset(p.name, len-1)"},{"Add":" if len == 1 then byte_offset = 0 end"},{"Add":" p.name = string.sub(p.name, 1, byte_offset)"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})"},{"Add":" end"},{"Add":" end"},{"Add":" schedule_save(State)"}],"del_contents":[{"Del":" -- dispatch to text\n"}]}},{"Edit":{"inode":{"change":6,"pos":165829},"path":"source.lua","line":18,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":166166}],"down_context":[{"change":6,"pos":166166}],"flag":"BLOCK","start":23308,"end":23339,"inode":{"change":6,"pos":165829}}},"contents":[{"Add":" 'drawing',"},{"Add":" 'help',"}]}},{"Edit":{"inode":{"change":6,"pos":165829},"path":"source.lua","line":25,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":166246}],"down_context":[{"change":6,"pos":166246}],"flag":"BLOCK","start":23340,"end":23377,"inode":{"change":6,"pos":165829}}},"contents":[{"Add":" 'geom',"},{"Add":" 'drawing_tests',"}]}},{"Replacement":{"inode":{"change":6,"pos":165829},"path":"source.lua","line":280,"ins":{"up_context":[{"change":6,"pos":174901}],"down_context":[{"change":6,"pos":174961}],"flag":"BLOCK","start":23378,"end":23426,"inode":{"change":6,"pos":165829}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":174901},"to":{"change":6,"start":174901,"end":174961},"introduced_by":6}],"inode":{"change":6,"pos":165829}},"ins_contents":[{"Add":" if x < Editor_state.right + Margin_right then"}],"del_contents":[{"Del":" if Editor_state.left <= x and x < Editor_state.right then\n"}]}},{"Edit":{"inode":{"change":6,"pos":2},"path":"main.lua","line":26,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":184680},"to":{"change":6,"start":27,"end":27},"introduced_by":6}],"inode":{"change":6,"pos":2}}},"contents":[{"Del":""}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":2},"path":"main.lua","line":26,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":184859},"to":{"change":5,"start":24812,"end":24813},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":184859},"to":{"change":5,"start":24812,"end":24813},"introduced_by":6}],"inode":{"change":6,"pos":2}}},"contents":[{"Add":"\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":2},"path":"main.lua","line":26,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":184680}],"down_context":[{"change":5,"pos":24812}],"flag":"","start":23433,"end":23433,"inode":{"change":6,"pos":2}}},"contents":[]}},{"Edit":{"inode":{"change":6,"pos":2},"path":"main.lua","line":27,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":24813},"to":{"change":5,"start":24813,"end":25117},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":5,"pos":24813},"to":{"change":5,"start":24813,"end":25117},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":27},"to":{"change":6,"start":162,"end":163},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":144},"to":{"change":6,"start":162,"end":163},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":5,"pos":25117},"to":{"change":6,"start":162,"end":163},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":6,"pos":184680},"to":{"change":6,"start":162,"end":163},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":184859},"to":{"change":6,"start":162,"end":163},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":455},"to":{"change":6,"start":162,"end":163},"introduced_by":6}],"inode":{"change":6,"pos":2}}},"contents":[{"Del":"-- both sides use drawings\nload_file_from_source_or_save_directory('icons.lua')\nload_file_from_source_or_save_directory('drawing.lua')\n load_file_from_source_or_save_directory('geom.lua')\n load_file_from_source_or_save_directory('help.lua')\nload_file_from_source_or_save_directory('drawing_tests.lua')\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":6,"pos":2},"path":"main.lua","line":60,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":186660}],"down_context":[{"change":6,"pos":186660}],"flag":"BLOCK","start":23434,"end":23741,"inode":{"change":6,"pos":2}}},"contents":[{"Add":" load_file_from_source_or_save_directory('icons.lua')"},{"Add":" load_file_from_source_or_save_directory('drawing.lua')"},{"Add":" load_file_from_source_or_save_directory('geom.lua')"},{"Add":" load_file_from_source_or_save_directory('help.lua')"},{"Add":" load_file_from_source_or_save_directory('drawing_tests.lua')"}]}},{"FileAdd":{"meta":{"basename":"icons.lua","metadata":0},"context":[{"change":6,"pos":2}],"contents":[{"Add":"icon = {}"},{"Add":""},{"Add":"function icon.insert_drawing(button_params)"},{"Add":" local x,y = button_params.x, button_params.y"},{"Add":" App.color(Icon_color)"},{"Add":" love.graphics.rectangle('line', x,y, 12,12)"},{"Add":" love.graphics.line(4,y+6, 16,y+6)"},{"Add":" love.graphics.line(10,y, 10,y+12)"},{"Add":"end"},{"Add":""},{"Add":"function icon.freehand(x, y)"},{"Add":" love.graphics.line(x+4,y+7,x+5,y+5)"},{"Add":" love.graphics.line(x+5,y+5,x+7,y+4)"},{"Add":" love.graphics.line(x+7,y+4,x+9,y+3)"},{"Add":" love.graphics.line(x+9,y+3,x+10,y+5)"},{"Add":" love.graphics.line(x+10,y+5,x+12,y+6)"},{"Add":" love.graphics.line(x+12,y+6,x+13,y+8)"},{"Add":" love.graphics.line(x+13,y+8,x+13,y+10)"},{"Add":" love.graphics.line(x+13,y+10,x+14,y+12)"},{"Add":" love.graphics.line(x+14,y+12,x+15,y+14)"},{"Add":" love.graphics.line(x+15,y+14,x+15,y+16)"},{"Add":"end"},{"Add":""},{"Add":"function icon.line(x, y)"},{"Add":" love.graphics.line(x+4,y+2, x+16,y+18)"},{"Add":"end"},{"Add":""},{"Add":"function icon.manhattan(x, y)"},{"Add":" love.graphics.line(x+4,y+20, x+4,y+2)"},{"Add":" love.graphics.line(x+4,y+2, x+10,y+2)"},{"Add":" love.graphics.line(x+10,y+2, x+10,y+10)"},{"Add":" love.graphics.line(x+10,y+10, x+18,y+10)"},{"Add":"end"},{"Add":""},{"Add":"function icon.polygon(x, y)"},{"Add":" love.graphics.line(x+8,y+2, x+14,y+2)"},{"Add":" love.graphics.line(x+14,y+2, x+18,y+10)"},{"Add":" love.graphics.line(x+18,y+10, x+10,y+18)"},{"Add":" love.graphics.line(x+10,y+18, x+4,y+12)"},{"Add":" love.graphics.line(x+4,y+12, x+8,y+2)"},{"Add":"end"},{"Add":""},{"Add":"function icon.rectangle(x, y)"},{"Add":" love.graphics.line(x+4,y+8, x+4,y+16)"},{"Add":" love.graphics.line(x+4,y+16, x+16,y+16)"},{"Add":" love.graphics.line(x+16,y+16, x+16,y+8)"},{"Add":" love.graphics.line(x+16,y+8, x+4,y+8)"},{"Add":"end"},{"Add":""},{"Add":"function icon.square(x, y)"},{"Add":" love.graphics.line(x+6,y+6, x+6,y+16)"},{"Add":" love.graphics.line(x+6,y+16, x+16,y+16)"},{"Add":" love.graphics.line(x+16,y+16, x+16,y+6)"},{"Add":" love.graphics.line(x+16,y+6, x+6,y+6)"},{"Add":"end"},{"Add":""},{"Add":"function icon.circle(x, y)"},{"Add":" love.graphics.circle('line', x+10,y+10, 8)"},{"Add":"end"}]}},{"FileAdd":{"meta":{"basename":"help.lua","metadata":0},"context":[{"change":6,"pos":2}],"contents":[{"Add":"function draw_help_without_mouse_pressed(State, drawing_index)"},{"Add":" local drawing = State.lines[drawing_index]"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" App.color(Help_color)"},{"Add":" local y = line_cache.starty+10"},{"Add":" love.graphics.print(\"Things you can do:\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Press the mouse button to start drawing a \"..current_shape(State), State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Hover on a point and press 'ctrl+u' to pick it up and start moving it,\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"then press the mouse button to drop it\", State.left+30+bullet_indent(),y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Hover on a point and press 'ctrl+n', type a name, then press 'enter'\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Hover on a point or shape and press 'ctrl+d' to delete it\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" if State.current_drawing_mode ~= 'freehand' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+p' to switch to drawing freehand strokes\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'line' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+l' to switch to drawing lines\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'manhattan' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+m' to switch to drawing horizontal/vertical lines\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'circle' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+o' to switch to drawing circles/arcs\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'polygon' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+g' to switch to drawing polygons\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'rectangle' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+r' to switch to drawing rectangles\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'square' then"},{"Add":" love.graphics.print(\"* Press 'ctrl+s' to switch to drawing squares\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" love.graphics.print(\"* Press 'ctrl+=' or 'ctrl+-' to zoom in or out, ctrl+0 to reset zoom\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"Press 'esc' now to hide this message\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" App.color(Help_background_color)"},{"Add":" love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))"},{"Add":"end"},{"Add":""},{"Add":"function draw_help_with_mouse_pressed(State, drawing_index)"},{"Add":" local drawing = State.lines[drawing_index]"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" App.color(Help_color)"},{"Add":" local y = line_cache.starty+10"},{"Add":" love.graphics.print(\"You're currently drawing a \"..current_shape(State, drawing.pending), State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print('Things you can do now:', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" if State.current_drawing_mode == 'freehand' then"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the stroke', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" elseif State.current_drawing_mode == 'line' or State.current_drawing_mode == 'manhattan' then"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the line', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" elseif State.current_drawing_mode == 'circle' then"},{"Add":" if drawing.pending.mode == 'circle' then"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the circle', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Press 'a' to draw just an arc of a circle\", State.left+30,y)"},{"Add":" else"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the arc', State.left+30,y)"},{"Add":" end"},{"Add":" y = y + State.line_height"},{"Add":" elseif State.current_drawing_mode == 'polygon' then"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the polygon', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Press 'p' to add a vertex to the polygon\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" elseif State.current_drawing_mode == 'rectangle' then"},{"Add":" if #drawing.pending.vertices < 2 then"},{"Add":" love.graphics.print(\"* Press 'p' to add a vertex to the rectangle\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" else"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the rectangle', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Press 'p' to replace the second vertex of the rectangle\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" elseif State.current_drawing_mode == 'square' then"},{"Add":" if #drawing.pending.vertices < 2 then"},{"Add":" love.graphics.print(\"* Press 'p' to add a vertex to the square\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" else"},{"Add":" love.graphics.print('* Release the mouse button to finish drawing the square', State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" love.graphics.print(\"* Press 'p' to replace the second vertex of the square\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" end"},{"Add":" love.graphics.print(\"* Press 'esc' then release the mouse button to cancel the current shape\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" y = y + State.line_height"},{"Add":" if State.current_drawing_mode ~= 'line' then"},{"Add":" love.graphics.print(\"* Press 'l' to switch to drawing lines\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'manhattan' then"},{"Add":" love.graphics.print(\"* Press 'm' to switch to drawing horizontal/vertical lines\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'circle' then"},{"Add":" love.graphics.print(\"* Press 'o' to switch to drawing circles/arcs\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'polygon' then"},{"Add":" love.graphics.print(\"* Press 'g' to switch to drawing polygons\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'rectangle' then"},{"Add":" love.graphics.print(\"* Press 'r' to switch to drawing rectangles\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" if State.current_drawing_mode ~= 'square' then"},{"Add":" love.graphics.print(\"* Press 's' to switch to drawing squares\", State.left+30,y)"},{"Add":" y = y + State.line_height"},{"Add":" end"},{"Add":" App.color(Help_background_color)"},{"Add":" love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))"},{"Add":"end"},{"Add":""},{"Add":"function current_shape(State, shape)"},{"Add":" if State.current_drawing_mode == 'freehand' then"},{"Add":" return 'freehand stroke'"},{"Add":" elseif State.current_drawing_mode == 'line' then"},{"Add":" return 'straight line'"},{"Add":" elseif State.current_drawing_mode == 'manhattan' then"},{"Add":" return 'horizontal/vertical line'"},{"Add":" elseif State.current_drawing_mode == 'circle' and shape and shape.start_angle then"},{"Add":" return 'arc'"},{"Add":" else"},{"Add":" return State.current_drawing_mode"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function bullet_indent()"},{"Add":" return App.width(to_text('* '))"},{"Add":"end"}]}},{"FileAdd":{"meta":{"basename":"geom.lua","metadata":0},"context":[{"change":6,"pos":2}],"contents":[{"Add":"geom = {}"},{"Add":""},{"Add":"function geom.on_shape(x,y, drawing, shape)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" return geom.on_freehand(x,y, drawing, shape)"},{"Add":" elseif shape.mode == 'line' then"},{"Add":" return geom.on_line(x,y, drawing, shape)"},{"Add":" elseif shape.mode == 'manhattan' then"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" local p2 = drawing.points[shape.p2]"},{"Add":" if p1.x == p2.x then"},{"Add":" if x ~= p1.x then return false end"},{"Add":" local y1,y2 = p1.y, p2.y"},{"Add":" if y1 > y2 then"},{"Add":" y1,y2 = y2,y1"},{"Add":" end"},{"Add":" return y >= y1-2 and y <= y2+2"},{"Add":" elseif p1.y == p2.y then"},{"Add":" if y ~= p1.y then return false end"},{"Add":" local x1,x2 = p1.x, p2.x"},{"Add":" if x1 > x2 then"},{"Add":" x1,x2 = x2,x1"},{"Add":" end"},{"Add":" return x >= x1-2 and x <= x2+2"},{"Add":" end"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" return geom.on_polygon(x,y, drawing, shape)"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" local dist = geom.dist(center.x,center.y, x,y)"},{"Add":" return dist > shape.radius*0.95 and dist < shape.radius*1.05"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" local dist = geom.dist(center.x,center.y, x,y)"},{"Add":" if dist < shape.radius*0.95 or dist > shape.radius*1.05 then"},{"Add":" return false"},{"Add":" end"},{"Add":" return geom.angle_between(center.x,center.y, x,y, shape.start_angle,shape.end_angle)"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function geom.on_freehand(x,y, drawing, shape)"},{"Add":" local prev"},{"Add":" for _,p in ipairs(shape.points) do"},{"Add":" if prev then"},{"Add":" if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then"},{"Add":" return true"},{"Add":" end"},{"Add":" end"},{"Add":" prev = p"},{"Add":" end"},{"Add":" return false"},{"Add":"end"},{"Add":""},{"Add":"function geom.on_line(x,y, drawing, shape)"},{"Add":" local p1,p2"},{"Add":" if type(shape.p1) == 'number' then"},{"Add":" p1 = drawing.points[shape.p1]"},{"Add":" p2 = drawing.points[shape.p2]"},{"Add":" else"},{"Add":" p1 = shape.p1"},{"Add":" p2 = shape.p2"},{"Add":" end"},{"Add":" if p1.x == p2.x then"},{"Add":" if math.abs(p1.x-x) > 2 then"},{"Add":" return false"},{"Add":" end"},{"Add":" local y1,y2 = p1.y,p2.y"},{"Add":" if y1 > y2 then"},{"Add":" y1,y2 = y2,y1"},{"Add":" end"},{"Add":" return y >= y1-2 and y <= y2+2"},{"Add":" end"},{"Add":" -- has the right slope and intercept"},{"Add":" local m = (p2.y - p1.y) / (p2.x - p1.x)"},{"Add":" local yp = p1.y + m*(x-p1.x)"},{"Add":" if yp < y-2 or yp > y+2 then"},{"Add":" return false"},{"Add":" end"},{"Add":" -- between endpoints"},{"Add":" local k = (x-p1.x) / (p2.x-p1.x)"},{"Add":" return k > -0.005 and k < 1.005"},{"Add":"end"},{"Add":""},{"Add":"function geom.on_polygon(x,y, drawing, shape)"},{"Add":" local prev"},{"Add":" for _,p in ipairs(shape.vertices) do"},{"Add":" if prev then"},{"Add":" if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then"},{"Add":" return true"},{"Add":" end"},{"Add":" end"},{"Add":" prev = p"},{"Add":" end"},{"Add":" return geom.on_line(x,y, drawing, {p1=shape.vertices[1], p2=shape.vertices[#shape.vertices]})"},{"Add":"end"},{"Add":""},{"Add":"-- are (x3,y3) and (x4,y4) on the same side of the line between (x1,y1) and (x2,y2)"},{"Add":"function geom.same_side(x1,y1, x2,y2, x3,y3, x4,y4)"},{"Add":" if x1 == x2 then"},{"Add":" return math.sign(x3-x1) == math.sign(x4-x1)"},{"Add":" end"},{"Add":" if y1 == y2 then"},{"Add":" return math.sign(y3-y1) == math.sign(y4-y1)"},{"Add":" end"},{"Add":" local m = (y2-y1)/(x2-x1)"},{"Add":" return math.sign(m*(x3-x1) + y1-y3) == math.sign(m*(x4-x1) + y1-y4)"},{"Add":"end"},{"Add":""},{"Add":"function math.sign(x)"},{"Add":" if x > 0 then"},{"Add":" return 1"},{"Add":" elseif x == 0 then"},{"Add":" return 0"},{"Add":" elseif x < 0 then"},{"Add":" return -1"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function geom.angle_with_hint(x1, y1, x2, y2, hint)"},{"Add":" local result = geom.angle(x1,y1, x2,y2)"},{"Add":" if hint then"},{"Add":" -- Smooth the discontinuity where angle goes from positive to negative."},{"Add":" -- The hint is a memory of which way we drew it last time."},{"Add":" while result > hint+math.pi/10 do"},{"Add":" result = result-math.pi*2"},{"Add":" end"},{"Add":" while result < hint-math.pi/10 do"},{"Add":" result = result+math.pi*2"},{"Add":" end"},{"Add":" end"},{"Add":" return result"},{"Add":"end"},{"Add":""},{"Add":"-- result is from -π/2 to 3π/2, approximately adding math.atan2 from Lua 5.3"},{"Add":"-- (LÖVE is Lua 5.1)"},{"Add":"function geom.angle(x1,y1, x2,y2)"},{"Add":" local result = math.atan((y2-y1)/(x2-x1))"},{"Add":" if x2 < x1 then"},{"Add":" result = result+math.pi"},{"Add":" end"},{"Add":" return result"},{"Add":"end"},{"Add":""},{"Add":"-- is the line between x,y and cx,cy at an angle between s and e?"},{"Add":"function geom.angle_between(ox,oy, x,y, s,e)"},{"Add":" local angle = geom.angle(ox,oy, x,y)"},{"Add":" if s > e then"},{"Add":" s,e = e,s"},{"Add":" end"},{"Add":" -- I'm not sure this is right or ideal.."},{"Add":" angle = angle-math.pi*2"},{"Add":" if s <= angle and angle <= e then"},{"Add":" return true"},{"Add":" end"},{"Add":" angle = angle+math.pi*2"},{"Add":" if s <= angle and angle <= e then"},{"Add":" return true"},{"Add":" end"},{"Add":" angle = angle+math.pi*2"},{"Add":" return s <= angle and angle <= e"},{"Add":"end"},{"Add":""},{"Add":"function geom.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end"}]}},{"Replacement":{"inode":{"change":6,"pos":15083},"path":"file.lua","line":40,"ins":{"up_context":[{"change":6,"pos":419}],"down_context":[{"change":6,"pos":16214}],"flag":"BLOCK","start":37220,"end":37273,"inode":{"change":6,"pos":15083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":419},"to":{"change":6,"start":7955,"end":7990},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16169},"to":{"change":5,"start":25126,"end":25183},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":16169},"to":{"change":5,"start":25126,"end":25183},"introduced_by":6}],"inode":{"change":6,"pos":15083}},"ins_contents":[{"Add":" outfile:write(line.data)"},{"Add":" outfile:write('\\n')"}],"del_contents":[{"Del":" outfile:write(line.data, '\\n')\n"},{"Del":" outfile:write(line.data)\n outfile:write('\\n')\n"}]}},{"ResurrectZombie":{"inode":{"change":6,"pos":413},"path":"edit.lua","line":93,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":3138},"to":{"change":6,"start":9505,"end":9658},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":3138},"to":{"change":6,"start":9505,"end":9658},"introduced_by":5}],"inode":{"change":6,"pos":413}}},"contents":[{"Add":"--? print('text.draw', y, line_index)\n local startpos = 1\n if line_index == State.screen_top1.line then\n startpos = State.screen_top1.pos\n"}]}},{"Edit":{"inode":{"change":6,"pos":413},"path":"edit.lua","line":93,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":3095}],"down_context":[{"change":6,"pos":9505}],"flag":"BLOCK","start":37275,"end":37329,"inode":{"change":6,"pos":413}}},"contents":[{"Add":" State.screen_bottom1 = {line=line_index, pos=nil}"}]}},{"Edit":{"inode":{"change":6,"pos":413},"path":"edit.lua","line":98,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":9658},"to":{"change":2,"start":13,"end":13},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3095},"to":{"change":5,"start":25185,"end":25239},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":3095},"to":{"change":5,"start":25185,"end":25239},"introduced_by":6}],"inode":{"change":6,"pos":413}}},"contents":[{"Del":""},{"Del":" State.screen_bottom1 = {line=line_index, pos=nil}\n"}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":413},"path":"edit.lua","line":98,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":9658}],"down_context":[{"change":6,"pos":5845}],"flag":"","start":37331,"end":37331,"inode":{"change":6,"pos":413}}},"contents":[]}},{"Edit":{"inode":{"change":6,"pos":413},"path":"edit.lua","line":103,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5923},"to":{"change":6,"start":8115,"end":8245},"introduced_by":6}],"inode":{"change":6,"pos":413}}},"contents":[{"Del":"--? print('screen bottom: '..tostring(State.screen_bottom1.pos)..' in '..tostring(State.lines[State.screen_bottom1.line].data))\n"}]}},{"FileAdd":{"meta":{"basename":"drawing_tests.lua","metadata":0},"context":[{"change":6,"pos":2}],"contents":[{"Add":"-- major tests for drawings"},{"Add":"-- We minimize assumptions about specific pixels, and try to test at the level"},{"Add":"-- of specific shapes. In particular, no tests of freehand drawings."},{"Add":""},{"Add":"function test_creating_drawing_saves()"},{"Add":" io.write('\\ntest_creating_drawing_saves')"},{"Add":" App.screen.init{width=120, height=60}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- click on button to create drawing"},{"Add":" edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)"},{"Add":" -- file not immediately saved"},{"Add":" edit.update(Editor_state, 0.01)"},{"Add":" check_nil(App.filesystem['foo'], 'F - test_creating_drawing_saves/early')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- filesystem contains drawing and an empty line of text"},{"Add":" check_eq(App.filesystem['foo'], '```lines\\n```\\n\\n', 'F - test_creating_drawing_saves')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_line()"},{"Add":" io.write('\\ntest_draw_line')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_line/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_line/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_line/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_line/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_line/baseline/#shapes')"},{"Add":" -- draw a line"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_line/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_draw_line/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_draw_line/shape:1')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_draw_line/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_draw_line/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_draw_line/p2:x')"},{"Add":" check_eq(p2.y, 36, 'F - test_draw_line/p2:y')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- The format on disk isn't perfectly stable. Table fields can be reordered."},{"Add":" -- So just reload from disk to verify."},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_line/save/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_draw_line/save/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_draw_line/save/shape:1')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_draw_line/save/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_draw_line/save/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_draw_line/save/p2:x')"},{"Add":" check_eq(p2.y, 36, 'F - test_draw_line/save/p2:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_horizontal_line()"},{"Add":" io.write('\\ntest_draw_horizontal_line')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'manhattan'"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_horizontal_line/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_horizontal_line/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_horizontal_line/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_horizontal_line/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_horizontal_line/baseline/#shapes')"},{"Add":" -- draw a line that is more horizontal than vertical"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_horizontal_line/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_draw_horizontal_line/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'manhattan', 'F - test_draw_horizontal_line/shape_mode')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_draw_horizontal_line/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_draw_horizontal_line/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_draw_horizontal_line/p2:x')"},{"Add":" check_eq(p2.y, p1.y, 'F - test_draw_horizontal_line/p2:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_circle()"},{"Add":" io.write('\\ntest_draw_circle')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_circle/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_circle/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_circle/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_circle/baseline/#shapes')"},{"Add":" -- draw a circle"},{"Add":" App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing"},{"Add":" edit.run_after_keychord(Editor_state, 'C-o')"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_circle/#shapes')"},{"Add":" check_eq(#drawing.points, 1, 'F - test_draw_circle/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'circle', 'F - test_draw_horizontal_line/shape_mode')"},{"Add":" check_eq(drawing.shapes[1].radius, 30, 'F - test_draw_circle/radius')"},{"Add":" local center = drawing.points[drawing.shapes[1].center]"},{"Add":" check_eq(center.x, 35, 'F - test_draw_circle/center:x')"},{"Add":" check_eq(center.y, 36, 'F - test_draw_circle/center:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_cancel_stroke()"},{"Add":" io.write('\\ntest_cancel_stroke')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_cancel_stroke/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_cancel_stroke/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_cancel_stroke/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_cancel_stroke/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_cancel_stroke/baseline/#shapes')"},{"Add":" -- start drawing a line"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" -- cancel"},{"Add":" edit.run_after_keychord(Editor_state, 'escape')"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 0, 'F - test_cancel_stroke/#shapes')"},{"Add":"end"},{"Add":""},{"Add":"function test_keys_do_not_affect_shape_when_mouse_up()"},{"Add":" io.write('\\ntest_keys_do_not_affect_shape_when_mouse_up')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- hover over drawing and press 'o' without holding mouse"},{"Add":" App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing"},{"Add":" edit.run_after_keychord(Editor_state, 'o')"},{"Add":" -- no change to drawing mode"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_keys_do_not_affect_shape_when_mouse_up/drawing_mode')"},{"Add":" -- no change to text either because we didn't run the textinput event"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_circle_mid_stroke()"},{"Add":" io.write('\\ntest_draw_circle_mid_stroke')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_circle_mid_stroke/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_circle_mid_stroke/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle_mid_stroke/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_circle_mid_stroke/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_circle_mid_stroke/baseline/#shapes')"},{"Add":" -- draw a circle"},{"Add":" App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 'o')"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_circle_mid_stroke/#shapes')"},{"Add":" check_eq(#drawing.points, 1, 'F - test_draw_circle_mid_stroke/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'circle', 'F - test_draw_horizontal_line/shape_mode')"},{"Add":" check_eq(drawing.shapes[1].radius, 30, 'F - test_draw_circle_mid_stroke/radius')"},{"Add":" local center = drawing.points[drawing.shapes[1].center]"},{"Add":" check_eq(center.x, 35, 'F - test_draw_circle_mid_stroke/center:x')"},{"Add":" check_eq(center.y, 36, 'F - test_draw_circle_mid_stroke/center:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_arc()"},{"Add":" io.write('\\ntest_draw_arc')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'circle'"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_arc/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_arc/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_arc/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_arc/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_arc/baseline/#shapes')"},{"Add":" -- draw an arc"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" App.mouse_move(Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'a') -- arc mode"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35+50, Editor_state.top+Drawing_padding_top+36+50, 1) -- 45°"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_arc/#shapes')"},{"Add":" check_eq(#drawing.points, 1, 'F - test_draw_arc/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'arc', 'F - test_draw_horizontal_line/shape_mode')"},{"Add":" local arc = drawing.shapes[1]"},{"Add":" check_eq(arc.radius, 30, 'F - test_draw_arc/radius')"},{"Add":" local center = drawing.points[arc.center]"},{"Add":" check_eq(center.x, 35, 'F - test_draw_arc/center:x')"},{"Add":" check_eq(center.y, 36, 'F - test_draw_arc/center:y')"},{"Add":" check_eq(arc.start_angle, 0, 'F - test_draw_arc/start:angle')"},{"Add":" check_eq(arc.end_angle, math.pi/4, 'F - test_draw_arc/end:angle')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_polygon()"},{"Add":" io.write('\\ntest_draw_polygon')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode')"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_polygon/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_polygon/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes')"},{"Add":" -- first point"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 'g') -- polygon mode"},{"Add":" -- second point"},{"Add":" App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'p') -- add point"},{"Add":" -- final point"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes')"},{"Add":" check_eq(#drawing.points, 3, 'F - test_draw_polygon/vertices')"},{"Add":" local shape = drawing.shapes[1]"},{"Add":" check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode')"},{"Add":" check_eq(#shape.vertices, 3, 'F - test_draw_polygon/vertices')"},{"Add":" local p = drawing.points[shape.vertices[1]]"},{"Add":" check_eq(p.x, 5, 'F - test_draw_polygon/p1:x')"},{"Add":" check_eq(p.y, 6, 'F - test_draw_polygon/p1:y')"},{"Add":" local p = drawing.points[shape.vertices[2]]"},{"Add":" check_eq(p.x, 65, 'F - test_draw_polygon/p2:x')"},{"Add":" check_eq(p.y, 36, 'F - test_draw_polygon/p2:y')"},{"Add":" local p = drawing.points[shape.vertices[3]]"},{"Add":" check_eq(p.x, 35, 'F - test_draw_polygon/p3:x')"},{"Add":" check_eq(p.y, 26, 'F - test_draw_polygon/p3:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_rectangle()"},{"Add":" io.write('\\ntest_draw_rectangle')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_rectangle/baseline/drawing_mode')"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_rectangle/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_rectangle/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_rectangle/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_rectangle/baseline/#shapes')"},{"Add":" -- first point"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 'r') -- rectangle mode"},{"Add":" -- second point/first edge"},{"Add":" App.mouse_move(Editor_state.left+42, Editor_state.top+Drawing_padding_top+45)"},{"Add":" edit.run_after_keychord(Editor_state, 'p')"},{"Add":" -- override second point/first edge"},{"Add":" App.mouse_move(Editor_state.left+75, Editor_state.top+Drawing_padding_top+76)"},{"Add":" edit.run_after_keychord(Editor_state, 'p')"},{"Add":" -- release (decides 'thickness' of rectangle perpendicular to first edge)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_rectangle/#shapes')"},{"Add":" check_eq(#drawing.points, 5, 'F - test_draw_rectangle/#points') -- currently includes every point added"},{"Add":" local shape = drawing.shapes[1]"},{"Add":" check_eq(shape.mode, 'rectangle', 'F - test_draw_rectangle/shape_mode')"},{"Add":" check_eq(#shape.vertices, 4, 'F - test_draw_rectangle/vertices')"},{"Add":" local p = drawing.points[shape.vertices[1]]"},{"Add":" check_eq(p.x, 35, 'F - test_draw_rectangle/p1:x')"},{"Add":" check_eq(p.y, 36, 'F - test_draw_rectangle/p1:y')"},{"Add":" local p = drawing.points[shape.vertices[2]]"},{"Add":" check_eq(p.x, 75, 'F - test_draw_rectangle/p2:x')"},{"Add":" check_eq(p.y, 76, 'F - test_draw_rectangle/p2:y')"},{"Add":" local p = drawing.points[shape.vertices[3]]"},{"Add":" check_eq(p.x, 70, 'F - test_draw_rectangle/p3:x')"},{"Add":" check_eq(p.y, 81, 'F - test_draw_rectangle/p3:y')"},{"Add":" local p = drawing.points[shape.vertices[4]]"},{"Add":" check_eq(p.x, 30, 'F - test_draw_rectangle/p4:x')"},{"Add":" check_eq(p.y, 41, 'F - test_draw_rectangle/p4:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_rectangle_intermediate()"},{"Add":" io.write('\\ntest_draw_rectangle_intermediate')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_rectangle_intermediate/baseline/drawing_mode')"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_rectangle_intermediate/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_rectangle_intermediate/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_rectangle_intermediate/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_rectangle_intermediate/baseline/#shapes')"},{"Add":" -- first point"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 'r') -- rectangle mode"},{"Add":" -- second point/first edge"},{"Add":" App.mouse_move(Editor_state.left+42, Editor_state.top+Drawing_padding_top+45)"},{"Add":" edit.run_after_keychord(Editor_state, 'p')"},{"Add":" -- override second point/first edge"},{"Add":" App.mouse_move(Editor_state.left+75, Editor_state.top+Drawing_padding_top+76)"},{"Add":" edit.run_after_keychord(Editor_state, 'p')"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.points, 3, 'F - test_draw_rectangle_intermediate/#points') -- currently includes every point added"},{"Add":" local pending = drawing.pending"},{"Add":" check_eq(pending.mode, 'rectangle', 'F - test_draw_rectangle_intermediate/shape_mode')"},{"Add":" check_eq(#pending.vertices, 2, 'F - test_draw_rectangle_intermediate/vertices')"},{"Add":" local p = drawing.points[pending.vertices[1]]"},{"Add":" check_eq(p.x, 35, 'F - test_draw_rectangle_intermediate/p1:x')"},{"Add":" check_eq(p.y, 36, 'F - test_draw_rectangle_intermediate/p1:y')"},{"Add":" local p = drawing.points[pending.vertices[2]]"},{"Add":" check_eq(p.x, 75, 'F - test_draw_rectangle_intermediate/p2:x')"},{"Add":" check_eq(p.y, 76, 'F - test_draw_rectangle_intermediate/p2:y')"},{"Add":" -- outline of rectangle is drawn based on where the mouse is, but we can't check that so far"},{"Add":"end"},{"Add":""},{"Add":"function test_draw_square()"},{"Add":" io.write('\\ntest_draw_square')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_square/baseline/drawing_mode')"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_draw_square/baseline/#lines')"},{"Add":" check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_square/baseline/mode')"},{"Add":" check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_square/baseline/y')"},{"Add":" check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_square/baseline/y')"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_square/baseline/#shapes')"},{"Add":" -- first point"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 's') -- square mode"},{"Add":" -- second point/first edge"},{"Add":" App.mouse_move(Editor_state.left+42, Editor_state.top+Drawing_padding_top+45)"},{"Add":" edit.run_after_keychord(Editor_state, 'p')"},{"Add":" -- override second point/first edge"},{"Add":" App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+66)"},{"Add":" edit.run_after_keychord(Editor_state, 'p')"},{"Add":" -- release (decides which side of first edge to draw square on)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_draw_square/#shapes')"},{"Add":" check_eq(#drawing.points, 5, 'F - test_draw_square/#points') -- currently includes every point added"},{"Add":" check_eq(drawing.shapes[1].mode, 'square', 'F - test_draw_square/shape_mode')"},{"Add":" check_eq(#drawing.shapes[1].vertices, 4, 'F - test_draw_square/vertices')"},{"Add":" local p = drawing.points[drawing.shapes[1].vertices[1]]"},{"Add":" check_eq(p.x, 35, 'F - test_draw_square/p1:x')"},{"Add":" check_eq(p.y, 36, 'F - test_draw_square/p1:y')"},{"Add":" local p = drawing.points[drawing.shapes[1].vertices[2]]"},{"Add":" check_eq(p.x, 65, 'F - test_draw_square/p2:x')"},{"Add":" check_eq(p.y, 66, 'F - test_draw_square/p2:y')"},{"Add":" local p = drawing.points[drawing.shapes[1].vertices[3]]"},{"Add":" check_eq(p.x, 35, 'F - test_draw_square/p3:x')"},{"Add":" check_eq(p.y, 96, 'F - test_draw_square/p3:y')"},{"Add":" local p = drawing.points[drawing.shapes[1].vertices[4]]"},{"Add":" check_eq(p.x, 5, 'F - test_draw_square/p4:x')"},{"Add":" check_eq(p.y, 66, 'F - test_draw_square/p4:y')"},{"Add":"end"},{"Add":""},{"Add":"function test_name_point()"},{"Add":" io.write('\\ntest_name_point')"},{"Add":" -- create a drawing with a line"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- draw a line"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_name_point/baseline/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_name_point/baseline/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_name_point/baseline/shape:1')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_name_point/baseline/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_name_point/baseline/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_name_point/baseline/p2:x')"},{"Add":" check_eq(p2.y, 36, 'F - test_name_point/baseline/p2:y')"},{"Add":" check_nil(p2.name, 'F - test_name_point/baseline/p2:name')"},{"Add":" -- enter 'name' mode without moving the mouse"},{"Add":" edit.run_after_keychord(Editor_state, 'C-n')"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'name', 'F - test_name_point/mode:1')"},{"Add":" edit.run_after_textinput(Editor_state, 'A')"},{"Add":" check_eq(p2.name, 'A', 'F - test_name_point')"},{"Add":" -- still in 'name' mode"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'name', 'F - test_name_point/mode:2')"},{"Add":" -- exit 'name' mode"},{"Add":" edit.run_after_keychord(Editor_state, 'return')"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_name_point/mode:3')"},{"Add":" check_eq(p2.name, 'A', 'F - test_name_point')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- change is saved"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.name, 'A', 'F - test_name_point/save')"},{"Add":"end"},{"Add":""},{"Add":"function test_move_point()"},{"Add":" io.write('\\ntest_move_point')"},{"Add":" -- create a drawing with a line"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_move_point/baseline/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_move_point/baseline/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point/baseline/shape:1')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_move_point/baseline/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_move_point/baseline/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_move_point/baseline/p2:x')"},{"Add":" check_eq(p2.y, 36, 'F - test_move_point/baseline/p2:y')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- line is saved to disk"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.x, 35, 'F - test_move_point/save/x')"},{"Add":" check_eq(p2.y, 36, 'F - test_move_point/save/y')"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- enter 'move' mode without moving the mouse"},{"Add":" edit.run_after_keychord(Editor_state, 'C-u')"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'move', 'F - test_move_point/mode:1')"},{"Add":" -- point is lifted"},{"Add":" check_eq(drawing.pending.mode, 'move', 'F - test_move_point/mode:2')"},{"Add":" check_eq(drawing.pending.target_point, p2, 'F - test_move_point/target')"},{"Add":" -- move point"},{"Add":" App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44)"},{"Add":" edit.update(Editor_state, 0.05)"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.x, 26, 'F - test_move_point/x')"},{"Add":" check_eq(p2.y, 44, 'F - test_move_point/y')"},{"Add":" -- exit 'move' mode"},{"Add":" edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Drawing_padding_top+44, 1)"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_move_point/mode:3')"},{"Add":" check_eq(drawing.pending, {}, 'F - test_move_point/pending')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- change is saved"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.x, 26, 'F - test_move_point/save/x')"},{"Add":" check_eq(p2.y, 44, 'F - test_move_point/save/y')"},{"Add":"end"},{"Add":""},{"Add":"function test_move_point_on_manhattan_line()"},{"Add":" io.write('\\ntest_move_point_on_manhattan_line')"},{"Add":" -- create a drawing with a manhattan line"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'manhattan'"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+46, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_move_point_on_manhattan_line/baseline/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_move_point_on_manhattan_line/baseline/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'manhattan', 'F - test_move_point_on_manhattan_line/baseline/shape:1')"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- enter 'move' mode"},{"Add":" edit.run_after_keychord(Editor_state, 'C-u')"},{"Add":" check_eq(Editor_state.current_drawing_mode, 'move', 'F - test_move_point_on_manhattan_line/mode:1')"},{"Add":" -- move point"},{"Add":" App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44)"},{"Add":" edit.update(Editor_state, 0.05)"},{"Add":" -- line is no longer manhattan"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point_on_manhattan_line/baseline/shape:1')"},{"Add":"end"},{"Add":""},{"Add":"function test_delete_lines_at_point()"},{"Add":" io.write('\\ntest_delete_lines_at_point')"},{"Add":" -- create a drawing with two lines connected at a point"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 2, 'F - test_delete_lines_at_point/baseline/#shapes')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_delete_lines_at_point/baseline/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_lines_at_point/baseline/shape:2')"},{"Add":" -- hover on the common point and delete"},{"Add":" App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'C-d')"},{"Add":" check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_lines_at_point/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'deleted', 'F - test_delete_lines_at_point/shape:2')"},{"Add":" -- wait for some time"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- deleted points disappear after file is reloaded"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_delete_lines_at_point/save')"},{"Add":"end"},{"Add":""},{"Add":"function test_delete_line_under_mouse_pointer()"},{"Add":" io.write('\\ntest_delete_line_under_mouse_pointer')"},{"Add":" -- create a drawing with two lines connected at a point"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 2, 'F - test_delete_line_under_mouse_pointer/baseline/#shapes')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_delete_line_under_mouse_pointer/baseline/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_line_under_mouse_pointer/baseline/shape:2')"},{"Add":" -- hover on one of the lines and delete"},{"Add":" App.mouse_move(Editor_state.left+25, Editor_state.top+Drawing_padding_top+26)"},{"Add":" edit.run_after_keychord(Editor_state, 'C-d')"},{"Add":" -- only that line is deleted"},{"Add":" check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_line_under_mouse_pointer/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_line_under_mouse_pointer/shape:2')"},{"Add":"end"},{"Add":""},{"Add":"function test_delete_point_from_polygon()"},{"Add":" io.write('\\ntest_delete_point_from_polygon')"},{"Add":" -- create a drawing with two lines connected at a point"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- first point"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 'g') -- polygon mode"},{"Add":" -- second point"},{"Add":" App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'p') -- add point"},{"Add":" -- third point"},{"Add":" App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26)"},{"Add":" edit.run_after_keychord(Editor_state, 'p') -- add point"},{"Add":" -- fourth point"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes')"},{"Add":" check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode')"},{"Add":" check_eq(#drawing.shapes[1].vertices, 4, 'F - test_delete_point_from_polygon/baseline/vertices')"},{"Add":" -- hover on a point and delete"},{"Add":" App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26)"},{"Add":" edit.run_after_keychord(Editor_state, 'C-d')"},{"Add":" -- just the one point is deleted"},{"Add":" check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/shape')"},{"Add":" check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/vertices')"},{"Add":"end"},{"Add":""},{"Add":"function test_delete_point_from_polygon()"},{"Add":" io.write('\\ntest_delete_point_from_polygon')"},{"Add":" -- create a drawing with two lines connected at a point"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- first point"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_keychord(Editor_state, 'g') -- polygon mode"},{"Add":" -- second point"},{"Add":" App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'p') -- add point"},{"Add":" -- third point"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes')"},{"Add":" check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode')"},{"Add":" check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/baseline/vertices')"},{"Add":" -- hover on a point and delete"},{"Add":" App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'C-d')"},{"Add":" -- there's < 3 points left, so the whole polygon is deleted"},{"Add":" check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_point_from_polygon')"},{"Add":"end"},{"Add":""},{"Add":"function test_undo_name_point()"},{"Add":" io.write('\\ntest_undo_name_point')"},{"Add":" -- create a drawing with a line"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" -- draw a line"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_undo_name_point/baseline/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_undo_name_point/baseline/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_name_point/baseline/shape:1')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_undo_name_point/baseline/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_undo_name_point/baseline/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_undo_name_point/baseline/p2:x')"},{"Add":" check_eq(p2.y, 36, 'F - test_undo_name_point/baseline/p2:y')"},{"Add":" check_nil(p2.name, 'F - test_undo_name_point/baseline/p2:name')"},{"Add":" check_eq(#Editor_state.history, 1, 'F - test_undo_name_point/baseline/history:1')"},{"Add":"--? print('a', Editor_state.lines.current_drawing)"},{"Add":" -- enter 'name' mode without moving the mouse"},{"Add":" edit.run_after_keychord(Editor_state, 'C-n')"},{"Add":" edit.run_after_textinput(Editor_state, 'A')"},{"Add":" edit.run_after_keychord(Editor_state, 'return')"},{"Add":" check_eq(p2.name, 'A', 'F - test_undo_name_point/baseline')"},{"Add":" check_eq(#Editor_state.history, 3, 'F - test_undo_name_point/baseline/history:2')"},{"Add":" check_eq(Editor_state.next_history, 4, 'F - test_undo_name_point/baseline/next_history')"},{"Add":"--? print('b', Editor_state.lines.current_drawing)"},{"Add":" -- undo"},{"Add":" edit.run_after_keychord(Editor_state, 'C-z')"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(Editor_state.next_history, 3, 'F - test_undo_name_point/next_history')"},{"Add":" check_eq(p2.name, '', 'F - test_undo_name_point') -- not quite what it was before, but close enough"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- undo is saved"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.name, '', 'F - test_undo_name_point/save')"},{"Add":"end"},{"Add":""},{"Add":"function test_undo_move_point()"},{"Add":" io.write('\\ntest_undo_move_point')"},{"Add":" -- create a drawing with a line"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 1, 'F - test_undo_move_point/baseline/#shapes')"},{"Add":" check_eq(#drawing.points, 2, 'F - test_undo_move_point/baseline/#points')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_move_point/baseline/shape:1')"},{"Add":" local p1 = drawing.points[drawing.shapes[1].p1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p1.x, 5, 'F - test_undo_move_point/baseline/p1:x')"},{"Add":" check_eq(p1.y, 6, 'F - test_undo_move_point/baseline/p1:y')"},{"Add":" check_eq(p2.x, 35, 'F - test_undo_move_point/baseline/p2:x')"},{"Add":" check_eq(p2.y, 36, 'F - test_undo_move_point/baseline/p2:y')"},{"Add":" check_nil(p2.name, 'F - test_undo_move_point/baseline/p2:name')"},{"Add":" -- move p2"},{"Add":" edit.run_after_keychord(Editor_state, 'C-u')"},{"Add":" App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44)"},{"Add":" edit.update(Editor_state, 0.05)"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.x, 26, 'F - test_undo_move_point/x')"},{"Add":" check_eq(p2.y, 44, 'F - test_undo_move_point/y')"},{"Add":" -- exit 'move' mode"},{"Add":" edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Drawing_padding_top+44, 1)"},{"Add":" check_eq(Editor_state.next_history, 4, 'F - test_undo_move_point/next_history')"},{"Add":" -- undo"},{"Add":" edit.run_after_keychord(Editor_state, 'C-z')"},{"Add":" edit.run_after_keychord(Editor_state, 'C-z') -- bug: need to undo twice"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(Editor_state.next_history, 2, 'F - test_undo_move_point/next_history')"},{"Add":" check_eq(p2.x, 35, 'F - test_undo_move_point/x')"},{"Add":" check_eq(p2.y, 36, 'F - test_undo_move_point/y')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- undo is saved"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]"},{"Add":" check_eq(p2.x, 35, 'F - test_undo_move_point/save/x')"},{"Add":" check_eq(p2.y, 36, 'F - test_undo_move_point/save/y')"},{"Add":"end"},{"Add":""},{"Add":"function test_undo_delete_point()"},{"Add":" io.write('\\ntest_undo_delete_point')"},{"Add":" -- create a drawing with two lines connected at a point"},{"Add":" App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.filename = 'foo'"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.current_drawing_mode = 'line'"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)"},{"Add":" edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" check_eq(#drawing.shapes, 2, 'F - test_undo_delete_point/baseline/#shapes')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_delete_point/baseline/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'line', 'F - test_undo_delete_point/baseline/shape:2')"},{"Add":" -- hover on the common point and delete"},{"Add":" App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+36)"},{"Add":" edit.run_after_keychord(Editor_state, 'C-d')"},{"Add":" check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_undo_delete_point/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'deleted', 'F - test_undo_delete_point/shape:2')"},{"Add":" -- undo"},{"Add":" edit.run_after_keychord(Editor_state, 'C-z')"},{"Add":" local drawing = Editor_state.lines[1]"},{"Add":" local p2 = drawing.points[drawing.shapes[1].p2]"},{"Add":" check_eq(Editor_state.next_history, 3, 'F - test_undo_move_point/next_history')"},{"Add":" check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_delete_point/shape:1')"},{"Add":" check_eq(drawing.shapes[2].mode, 'line', 'F - test_undo_delete_point/shape:2')"},{"Add":" -- wait until save"},{"Add":" App.wait_fake_time(3.1)"},{"Add":" edit.update(Editor_state, 0)"},{"Add":" -- undo is saved"},{"Add":" load_from_disk(Editor_state)"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" check_eq(#Editor_state.lines[1].shapes, 2, 'F - test_undo_delete_point/save')"},{"Add":"end"}]}},{"FileAdd":{"meta":{"basename":"drawing.lua","metadata":0},"context":[{"change":6,"pos":2}],"contents":[{"Add":"-- primitives for editing drawings"},{"Add":"Drawing = {}"},{"Add":"require 'drawing_tests'"},{"Add":""},{"Add":"-- All drawings span 100% of some conceptual 'page width' and divide it up"},{"Add":"-- into 256 parts."},{"Add":"function Drawing.draw(State, line_index, y)"},{"Add":" local line = State.lines[line_index]"},{"Add":" local line_cache = State.line_cache[line_index]"},{"Add":" line_cache.starty = y"},{"Add":" local pmx,pmy = App.mouse_x(), App.mouse_y()"},{"Add":" if pmx < State.right and pmy > line_cache.starty and pmy < line_cache.starty+Drawing.pixels(line.h, State.width) then"},{"Add":" App.color(Icon_color)"},{"Add":" love.graphics.rectangle('line', State.left,line_cache.starty, State.width,Drawing.pixels(line.h, State.width))"},{"Add":" if icon[State.current_drawing_mode] then"},{"Add":" icon[State.current_drawing_mode](State.right-22, line_cache.starty+4)"},{"Add":" else"},{"Add":" icon[State.previous_drawing_mode](State.right-22, line_cache.starty+4)"},{"Add":" end"},{"Add":""},{"Add":" if App.mouse_down(1) and love.keyboard.isDown('h') then"},{"Add":" draw_help_with_mouse_pressed(State, line_index)"},{"Add":" return"},{"Add":" end"},{"Add":" end"},{"Add":""},{"Add":" if line.show_help then"},{"Add":" draw_help_without_mouse_pressed(State, line_index)"},{"Add":" return"},{"Add":" end"},{"Add":""},{"Add":" local mx = Drawing.coord(pmx-State.left, State.width)"},{"Add":" local my = Drawing.coord(pmy-line_cache.starty, State.width)"},{"Add":""},{"Add":" for _,shape in ipairs(line.shapes) do"},{"Add":" assert(shape)"},{"Add":" if geom.on_shape(mx,my, line, shape) then"},{"Add":" App.color(Focus_stroke_color)"},{"Add":" else"},{"Add":" App.color(Stroke_color)"},{"Add":" end"},{"Add":" Drawing.draw_shape(line, shape, line_cache.starty, State.left,State.right)"},{"Add":" end"},{"Add":""},{"Add":" local function px(x) return Drawing.pixels(x, State.width)+State.left end"},{"Add":" local function py(y) return Drawing.pixels(y, State.width)+line_cache.starty end"},{"Add":" for i,p in ipairs(line.points) do"},{"Add":" if p.deleted == nil then"},{"Add":" if Drawing.near(p, mx,my, State.width) then"},{"Add":" App.color(Focus_stroke_color)"},{"Add":" love.graphics.circle('line', px(p.x),py(p.y), Same_point_distance)"},{"Add":" else"},{"Add":" App.color(Stroke_color)"},{"Add":" love.graphics.circle('fill', px(p.x),py(p.y), 2)"},{"Add":" end"},{"Add":" if p.name then"},{"Add":" -- TODO: clip"},{"Add":" local x,y = px(p.x)+5, py(p.y)+5"},{"Add":" love.graphics.print(p.name, x,y)"},{"Add":" if State.current_drawing_mode == 'name' and i == line.pending.target_point then"},{"Add":" -- create a faint red box for the name"},{"Add":" App.color(Current_name_background_color)"},{"Add":" local name_text"},{"Add":" -- TODO: avoid computing name width on every repaint"},{"Add":" if p.name == '' then"},{"Add":" name_text = State.em"},{"Add":" else"},{"Add":" name_text = App.newText(love.graphics.getFont(), p.name)"},{"Add":" end"},{"Add":" love.graphics.rectangle('fill', x,y, App.width(name_text), State.line_height)"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" App.color(Current_stroke_color)"},{"Add":" Drawing.draw_pending_shape(line, line_cache.starty, State.left,State.right)"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.draw_shape(drawing, shape, top, left,right)"},{"Add":" local width = right-left"},{"Add":" local function px(x) return Drawing.pixels(x, width)+left end"},{"Add":" local function py(y) return Drawing.pixels(y, width)+top end"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" local prev = nil"},{"Add":" for _,point in ipairs(shape.points) do"},{"Add":" if prev then"},{"Add":" love.graphics.line(px(prev.x),py(prev.y), px(point.x),py(point.y))"},{"Add":" end"},{"Add":" prev = point"},{"Add":" end"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" local p2 = drawing.points[shape.p2]"},{"Add":" love.graphics.line(px(p1.x),py(p1.y), px(p2.x),py(p2.y))"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" local prev = nil"},{"Add":" for _,point in ipairs(shape.vertices) do"},{"Add":" local curr = drawing.points[point]"},{"Add":" if prev then"},{"Add":" love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))"},{"Add":" end"},{"Add":" prev = curr"},{"Add":" end"},{"Add":" -- close the loop"},{"Add":" local curr = drawing.points[shape.vertices[1]]"},{"Add":" love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" -- TODO: clip"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" love.graphics.circle('line', px(center.x),py(center.y), Drawing.pixels(shape.radius, width))"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" love.graphics.arc('line', 'open', px(center.x),py(center.y), Drawing.pixels(shape.radius, width), shape.start_angle, shape.end_angle, 360)"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.draw_pending_shape(drawing, top, left,right)"},{"Add":" local width = right-left"},{"Add":" local pmx,pmy = App.mouse_x(), App.mouse_y()"},{"Add":" local function px(x) return Drawing.pixels(x, width)+left end"},{"Add":" local function py(y) return Drawing.pixels(y, width)+top end"},{"Add":" local mx = Drawing.coord(pmx-left, width)"},{"Add":" local my = Drawing.coord(pmy-top, width)"},{"Add":" -- recreate pixels from coords to precisely mimic how the drawing will look"},{"Add":" -- after mouse_released"},{"Add":" pmx,pmy = px(mx), py(my)"},{"Add":" local shape = drawing.pending"},{"Add":" if shape.mode == nil then"},{"Add":" -- nothing pending"},{"Add":" elseif shape.mode == 'freehand' then"},{"Add":" local shape_copy = deepcopy(shape)"},{"Add":" Drawing.smoothen(shape_copy)"},{"Add":" Drawing.draw_shape(drawing, shape_copy, top, left,right)"},{"Add":" elseif shape.mode == 'line' then"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" love.graphics.line(px(p1.x),py(p1.y), pmx,pmy)"},{"Add":" elseif shape.mode == 'manhattan' then"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" if math.abs(mx-p1.x) > math.abs(my-p1.y) then"},{"Add":" love.graphics.line(px(p1.x),py(p1.y), pmx, py(p1.y))"},{"Add":" else"},{"Add":" love.graphics.line(px(p1.x),py(p1.y), px(p1.x),pmy)"},{"Add":" end"},{"Add":" elseif shape.mode == 'polygon' then"},{"Add":" -- don't close the loop on a pending polygon"},{"Add":" local prev = nil"},{"Add":" for _,point in ipairs(shape.vertices) do"},{"Add":" local curr = drawing.points[point]"},{"Add":" if prev then"},{"Add":" love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))"},{"Add":" end"},{"Add":" prev = curr"},{"Add":" end"},{"Add":" love.graphics.line(px(prev.x),py(prev.y), pmx,pmy)"},{"Add":" elseif shape.mode == 'rectangle' then"},{"Add":" local first = drawing.points[shape.vertices[1]]"},{"Add":" if #shape.vertices == 1 then"},{"Add":" love.graphics.line(px(first.x),py(first.y), pmx,pmy)"},{"Add":" return"},{"Add":" end"},{"Add":" local second = drawing.points[shape.vertices[2]]"},{"Add":" local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)"},{"Add":" love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))"},{"Add":" love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))"},{"Add":" love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))"},{"Add":" love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))"},{"Add":" elseif shape.mode == 'square' then"},{"Add":" local first = drawing.points[shape.vertices[1]]"},{"Add":" if #shape.vertices == 1 then"},{"Add":" love.graphics.line(px(first.x),py(first.y), pmx,pmy)"},{"Add":" return"},{"Add":" end"},{"Add":" local second = drawing.points[shape.vertices[2]]"},{"Add":" local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)"},{"Add":" love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))"},{"Add":" love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))"},{"Add":" love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))"},{"Add":" love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" local cx,cy = px(center.x), py(center.y)"},{"Add":" love.graphics.circle('line', cx,cy, geom.dist(cx,cy, App.mouse_x(),App.mouse_y()))"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" shape.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, shape.end_angle)"},{"Add":" local cx,cy = px(center.x), py(center.y)"},{"Add":" love.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius, width), shape.start_angle, shape.end_angle, 360)"},{"Add":" elseif shape.mode == 'move' then"},{"Add":" -- nothing pending; changes are immediately committed"},{"Add":" elseif shape.mode == 'name' then"},{"Add":" -- nothing pending; changes are immediately committed"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.in_drawing(drawing, line_cache, x,y, left,right)"},{"Add":" if line_cache.starty == nil then return false end -- outside current page"},{"Add":" local width = right-left"},{"Add":" return y >= line_cache.starty and y < line_cache.starty + Drawing.pixels(drawing.h, width) and x >= left and x < right"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.mouse_pressed(State, drawing_index, x,y, mouse_button)"},{"Add":" local drawing = State.lines[drawing_index]"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" local cx = Drawing.coord(x-State.left, State.width)"},{"Add":" local cy = Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if State.current_drawing_mode == 'freehand' then"},{"Add":" drawing.pending = {mode=State.current_drawing_mode, points={{x=cx, y=cy}}}"},{"Add":" elseif State.current_drawing_mode == 'line' or State.current_drawing_mode == 'manhattan' then"},{"Add":" local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)"},{"Add":" drawing.pending = {mode=State.current_drawing_mode, p1=j}"},{"Add":" elseif State.current_drawing_mode == 'polygon' or State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square' then"},{"Add":" local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)"},{"Add":" drawing.pending = {mode=State.current_drawing_mode, vertices={j}}"},{"Add":" elseif State.current_drawing_mode == 'circle' then"},{"Add":" local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)"},{"Add":" drawing.pending = {mode=State.current_drawing_mode, center=j}"},{"Add":" elseif State.current_drawing_mode == 'move' then"},{"Add":" -- all the action is in mouse_released"},{"Add":" elseif State.current_drawing_mode == 'name' then"},{"Add":" -- nothing"},{"Add":" else"},{"Add":" print(State.current_drawing_mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"-- a couple of operations on drawings need to constantly check the state of the mouse"},{"Add":"function Drawing.update(State)"},{"Add":" if State.lines.current_drawing == nil then return end"},{"Add":" local drawing = State.lines.current_drawing"},{"Add":" local line_cache = State.line_cache[State.lines.current_drawing_index]"},{"Add":" assert(drawing.mode == 'drawing')"},{"Add":" local pmx, pmy = App.mouse_x(), App.mouse_y()"},{"Add":" local mx = Drawing.coord(pmx-State.left, State.width)"},{"Add":" local my = Drawing.coord(pmy-line_cache.starty, State.width)"},{"Add":" if App.mouse_down(1) then"},{"Add":" if Drawing.in_drawing(drawing, line_cache, pmx,pmy, State.left,State.right) then"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" table.insert(drawing.pending.points, {x=mx, y=my})"},{"Add":" elseif drawing.pending.mode == 'move' then"},{"Add":" drawing.pending.target_point.x = mx"},{"Add":" drawing.pending.target_point.y = my"},{"Add":" Drawing.relax_constraints(drawing, drawing.pending.target_point_index)"},{"Add":" end"},{"Add":" end"},{"Add":" elseif State.current_drawing_mode == 'move' then"},{"Add":" if Drawing.in_drawing(drawing, line_cache, pmx, pmy, State.left,State.right) then"},{"Add":" drawing.pending.target_point.x = mx"},{"Add":" drawing.pending.target_point.y = my"},{"Add":" Drawing.relax_constraints(drawing, drawing.pending.target_point_index)"},{"Add":" end"},{"Add":" else"},{"Add":" -- do nothing"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.relax_constraints(drawing, p)"},{"Add":" for _,shape in ipairs(drawing.shapes) do"},{"Add":" if shape.mode == 'manhattan' then"},{"Add":" if shape.p1 == p then"},{"Add":" shape.mode = 'line'"},{"Add":" elseif shape.p2 == p then"},{"Add":" shape.mode = 'line'"},{"Add":" end"},{"Add":" elseif shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" for _,v in ipairs(shape.vertices) do"},{"Add":" if v == p then"},{"Add":" shape.mode = 'polygon'"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.mouse_released(State, x,y, mouse_button)"},{"Add":" if State.current_drawing_mode == 'move' then"},{"Add":" State.current_drawing_mode = State.previous_drawing_mode"},{"Add":" State.previous_drawing_mode = nil"},{"Add":" if State.lines.current_drawing then"},{"Add":" State.lines.current_drawing.pending = {}"},{"Add":" State.lines.current_drawing = nil"},{"Add":" end"},{"Add":" elseif State.lines.current_drawing then"},{"Add":" local drawing = State.lines.current_drawing"},{"Add":" local line_cache = State.line_cache[State.lines.current_drawing_index]"},{"Add":" if drawing.pending then"},{"Add":" if drawing.pending.mode == nil then"},{"Add":" -- nothing pending"},{"Add":" elseif drawing.pending.mode == 'freehand' then"},{"Add":" -- the last point added during update is good enough"},{"Add":" Drawing.smoothen(drawing.pending)"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" elseif drawing.pending.mode == 'line' then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'manhattan' then"},{"Add":" local p1 = drawing.points[drawing.pending.p1]"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" if math.abs(mx-p1.x) > math.abs(my-p1.y) then"},{"Add":" drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx, p1.y, State.width)"},{"Add":" else"},{"Add":" drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, p1.x, my, State.width)"},{"Add":" end"},{"Add":" local p2 = drawing.points[drawing.pending.p2]"},{"Add":" App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), line_cache.starty+Drawing.pixels(p2.y, State.width))"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'polygon' then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, mx,my, State.width))"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'rectangle' then"},{"Add":" assert(#drawing.pending.vertices <= 2)"},{"Add":" if #drawing.pending.vertices == 2 then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" local first = drawing.points[drawing.pending.vertices[1]]"},{"Add":" local second = drawing.points[drawing.pending.vertices[2]]"},{"Add":" local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)"},{"Add":" table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))"},{"Add":" table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" else"},{"Add":" -- too few points; draw nothing"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'square' then"},{"Add":" assert(#drawing.pending.vertices <= 2)"},{"Add":" if #drawing.pending.vertices == 2 then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" local first = drawing.points[drawing.pending.vertices[1]]"},{"Add":" local second = drawing.points[drawing.pending.vertices[2]]"},{"Add":" local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)"},{"Add":" table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))"},{"Add":" table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'circle' then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" local center = drawing.points[drawing.pending.center]"},{"Add":" drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'arc' then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then"},{"Add":" local center = drawing.points[drawing.pending.center]"},{"Add":" drawing.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, drawing.pending.end_angle)"},{"Add":" table.insert(drawing.shapes, drawing.pending)"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'name' then"},{"Add":" -- drop it"},{"Add":" else"},{"Add":" print(drawing.pending.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" State.lines.current_drawing.pending = {}"},{"Add":" State.lines.current_drawing = nil"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.keychord_pressed(State, chord)"},{"Add":" if chord == 'C-p' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'freehand'"},{"Add":" elseif App.mouse_down(1) and chord == 'l' then"},{"Add":" State.current_drawing_mode = 'line'"},{"Add":" local _,drawing = Drawing.current_drawing(State)"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)"},{"Add":" elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then"},{"Add":" drawing.pending.p1 = drawing.pending.vertices[1]"},{"Add":" elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then"},{"Add":" drawing.pending.p1 = drawing.pending.center"},{"Add":" end"},{"Add":" drawing.pending.mode = 'line'"},{"Add":" elseif chord == 'C-l' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'line'"},{"Add":" elseif App.mouse_down(1) and chord == 'm' then"},{"Add":" State.current_drawing_mode = 'manhattan'"},{"Add":" local drawing = Drawing.select_drawing_at_mouse(State)"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)"},{"Add":" elseif drawing.pending.mode == 'line' then"},{"Add":" -- do nothing"},{"Add":" elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then"},{"Add":" drawing.pending.p1 = drawing.pending.vertices[1]"},{"Add":" elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then"},{"Add":" drawing.pending.p1 = drawing.pending.center"},{"Add":" end"},{"Add":" drawing.pending.mode = 'manhattan'"},{"Add":" elseif chord == 'C-m' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'manhattan'"},{"Add":" elseif chord == 'C-g' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'polygon'"},{"Add":" elseif App.mouse_down(1) and chord == 'g' then"},{"Add":" State.current_drawing_mode = 'polygon'"},{"Add":" local _,drawing = Drawing.current_drawing(State)"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}"},{"Add":" elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then"},{"Add":" if drawing.pending.vertices == nil then"},{"Add":" drawing.pending.vertices = {drawing.pending.p1}"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then"},{"Add":" -- reuse existing vertices"},{"Add":" elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then"},{"Add":" drawing.pending.vertices = {drawing.pending.center}"},{"Add":" end"},{"Add":" drawing.pending.mode = 'polygon'"},{"Add":" elseif chord == 'C-r' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'rectangle'"},{"Add":" elseif App.mouse_down(1) and chord == 'r' then"},{"Add":" State.current_drawing_mode = 'rectangle'"},{"Add":" local _,drawing = Drawing.current_drawing(State)"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}"},{"Add":" elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then"},{"Add":" if drawing.pending.vertices == nil then"},{"Add":" drawing.pending.vertices = {drawing.pending.p1}"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'square' then"},{"Add":" -- reuse existing (1-2) vertices"},{"Add":" elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then"},{"Add":" drawing.pending.vertices = {drawing.pending.center}"},{"Add":" end"},{"Add":" drawing.pending.mode = 'rectangle'"},{"Add":" elseif chord == 'C-s' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'square'"},{"Add":" elseif App.mouse_down(1) and chord == 's' then"},{"Add":" State.current_drawing_mode = 'square'"},{"Add":" local _,drawing = Drawing.current_drawing(State)"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}"},{"Add":" elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then"},{"Add":" if drawing.pending.vertices == nil then"},{"Add":" drawing.pending.vertices = {drawing.pending.p1}"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'polygon' then"},{"Add":" while #drawing.pending.vertices > 2 do"},{"Add":" table.remove(drawing.pending.vertices)"},{"Add":" end"},{"Add":" elseif drawing.pending.mode == 'rectangle' then"},{"Add":" -- reuse existing (1-2) vertices"},{"Add":" elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then"},{"Add":" drawing.pending.vertices = {drawing.pending.center}"},{"Add":" end"},{"Add":" drawing.pending.mode = 'square'"},{"Add":" elseif App.mouse_down(1) and chord == 'p' and State.current_drawing_mode == 'polygon' then"},{"Add":" local _,drawing,line_cache = Drawing.current_drawing(State)"},{"Add":" local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)"},{"Add":" local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)"},{"Add":" table.insert(drawing.pending.vertices, j)"},{"Add":" elseif App.mouse_down(1) and chord == 'p' and (State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square') then"},{"Add":" local _,drawing,line_cache = Drawing.current_drawing(State)"},{"Add":" local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)"},{"Add":" local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)"},{"Add":" while #drawing.pending.vertices >= 2 do"},{"Add":" table.remove(drawing.pending.vertices)"},{"Add":" end"},{"Add":" table.insert(drawing.pending.vertices, j)"},{"Add":" elseif chord == 'C-o' and not App.mouse_down(1) then"},{"Add":" State.current_drawing_mode = 'circle'"},{"Add":" elseif App.mouse_down(1) and chord == 'a' and State.current_drawing_mode == 'circle' then"},{"Add":" local _,drawing,line_cache = Drawing.current_drawing(State)"},{"Add":" drawing.pending.mode = 'arc'"},{"Add":" local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)"},{"Add":" local center = drawing.points[drawing.pending.center]"},{"Add":" drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))"},{"Add":" drawing.pending.start_angle = geom.angle(center.x,center.y, mx,my)"},{"Add":" elseif App.mouse_down(1) and chord == 'o' then"},{"Add":" State.current_drawing_mode = 'circle'"},{"Add":" local _,drawing = Drawing.current_drawing(State)"},{"Add":" if drawing.pending.mode == 'freehand' then"},{"Add":" drawing.pending.center = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)"},{"Add":" elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then"},{"Add":" drawing.pending.center = drawing.pending.p1"},{"Add":" elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then"},{"Add":" drawing.pending.center = drawing.pending.vertices[1]"},{"Add":" end"},{"Add":" drawing.pending.mode = 'circle'"},{"Add":" elseif chord == 'C-u' and not App.mouse_down(1) then"},{"Add":" local drawing_index,drawing,line_cache,i,p = Drawing.select_point_at_mouse(State)"},{"Add":" if drawing then"},{"Add":" if State.previous_drawing_mode == nil then"},{"Add":" State.previous_drawing_mode = State.current_drawing_mode"},{"Add":" end"},{"Add":" State.current_drawing_mode = 'move'"},{"Add":" drawing.pending = {mode=State.current_drawing_mode, target_point=p, target_point_index=i}"},{"Add":" State.lines.current_drawing_index = drawing_index"},{"Add":" State.lines.current_drawing = drawing"},{"Add":" end"},{"Add":" elseif chord == 'C-n' and not App.mouse_down(1) then"},{"Add":" local drawing_index,drawing,line_cache,point_index,p = Drawing.select_point_at_mouse(State)"},{"Add":" if drawing then"},{"Add":" if State.previous_drawing_mode == nil then"},{"Add":" -- don't clobber"},{"Add":" State.previous_drawing_mode = State.current_drawing_mode"},{"Add":" end"},{"Add":" State.current_drawing_mode = 'name'"},{"Add":" p.name = ''"},{"Add":" drawing.pending = {mode=State.current_drawing_mode, target_point=point_index}"},{"Add":" State.lines.current_drawing_index = drawing_index"},{"Add":" State.lines.current_drawing = drawing"},{"Add":" end"},{"Add":" elseif chord == 'C-d' and not App.mouse_down(1) then"},{"Add":" local _,drawing,_,i,p = Drawing.select_point_at_mouse(State)"},{"Add":" if drawing then"},{"Add":" for _,shape in ipairs(drawing.shapes) do"},{"Add":" if Drawing.contains_point(shape, i) then"},{"Add":" if shape.mode == 'polygon' then"},{"Add":" local idx = table.find(shape.vertices, i)"},{"Add":" assert(idx)"},{"Add":" table.remove(shape.vertices, idx)"},{"Add":" if #shape.vertices < 3 then"},{"Add":" shape.mode = 'deleted'"},{"Add":" end"},{"Add":" else"},{"Add":" shape.mode = 'deleted'"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" drawing.points[i].deleted = true"},{"Add":" end"},{"Add":" local drawing,_,_,shape = Drawing.select_shape_at_mouse(State)"},{"Add":" if drawing then"},{"Add":" shape.mode = 'deleted'"},{"Add":" end"},{"Add":" elseif chord == 'C-h' and not App.mouse_down(1) then"},{"Add":" local drawing = Drawing.select_drawing_at_mouse(State)"},{"Add":" if drawing then"},{"Add":" drawing.show_help = true"},{"Add":" end"},{"Add":" elseif chord == 'escape' and App.mouse_down(1) then"},{"Add":" local _,drawing = Drawing.current_drawing(State)"},{"Add":" drawing.pending = {}"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.complete_rectangle(firstx,firsty, secondx,secondy, x,y)"},{"Add":" if firstx == secondx then"},{"Add":" return x,secondy, x,firsty"},{"Add":" end"},{"Add":" if firsty == secondy then"},{"Add":" return secondx,y, firstx,y"},{"Add":" end"},{"Add":" local first_slope = (secondy-firsty)/(secondx-firstx)"},{"Add":" -- slope of second edge:"},{"Add":" -- -1/first_slope"},{"Add":" -- equation of line containing the second edge:"},{"Add":" -- y-secondy = -1/first_slope*(x-secondx)"},{"Add":" -- => 1/first_slope*x + y + (- secondy - secondx/first_slope) = 0"},{"Add":" -- now we want to find the point on this line that's closest to the mouse pointer."},{"Add":" -- https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line#Line_defined_by_an_equation"},{"Add":" local a = 1/first_slope"},{"Add":" local c = -secondy - secondx/first_slope"},{"Add":" local thirdx = round(((x-a*y) - a*c) / (a*a + 1))"},{"Add":" local thirdy = round((a*(-x + a*y) - c) / (a*a + 1))"},{"Add":" -- slope of third edge = first_slope"},{"Add":" -- equation of line containing third edge:"},{"Add":" -- y - thirdy = first_slope*(x-thirdx)"},{"Add":" -- => -first_slope*x + y + (-thirdy + thirdx*first_slope) = 0"},{"Add":" -- now we want to find the point on this line that's closest to the first point"},{"Add":" local a = -first_slope"},{"Add":" local c = -thirdy + thirdx*first_slope"},{"Add":" local fourthx = round(((firstx-a*firsty) - a*c) / (a*a + 1))"},{"Add":" local fourthy = round((a*(-firstx + a*firsty) - c) / (a*a + 1))"},{"Add":" return thirdx,thirdy, fourthx,fourthy"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.complete_square(firstx,firsty, secondx,secondy, x,y)"},{"Add":" -- use x,y only to decide which side of the first edge to complete the square on"},{"Add":" local deltax = secondx-firstx"},{"Add":" local deltay = secondy-firsty"},{"Add":" local thirdx = secondx+deltay"},{"Add":" local thirdy = secondy-deltax"},{"Add":" if not geom.same_side(firstx,firsty, secondx,secondy, thirdx,thirdy, x,y) then"},{"Add":" deltax = -deltax"},{"Add":" deltay = -deltay"},{"Add":" thirdx = secondx+deltay"},{"Add":" thirdy = secondy-deltax"},{"Add":" end"},{"Add":" local fourthx = firstx+deltay"},{"Add":" local fourthy = firsty-deltax"},{"Add":" return thirdx,thirdy, fourthx,fourthy"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.current_drawing(State)"},{"Add":" local x, y = App.mouse_x(), App.mouse_y()"},{"Add":" for drawing_index,drawing in ipairs(State.lines) do"},{"Add":" if drawing.mode == 'drawing' then"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then"},{"Add":" return drawing_index,drawing,line_cache"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" return nil"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.select_shape_at_mouse(State)"},{"Add":" for drawing_index,drawing in ipairs(State.lines) do"},{"Add":" if drawing.mode == 'drawing' then"},{"Add":" local x, y = App.mouse_x(), App.mouse_y()"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" for i,shape in ipairs(drawing.shapes) do"},{"Add":" assert(shape)"},{"Add":" if geom.on_shape(mx,my, drawing, shape) then"},{"Add":" return drawing,line_cache,i,shape"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.select_point_at_mouse(State)"},{"Add":" for drawing_index,drawing in ipairs(State.lines) do"},{"Add":" if drawing.mode == 'drawing' then"},{"Add":" local x, y = App.mouse_x(), App.mouse_y()"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then"},{"Add":" local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)"},{"Add":" for i,point in ipairs(drawing.points) do"},{"Add":" assert(point)"},{"Add":" if Drawing.near(point, mx,my, State.width) then"},{"Add":" return drawing_index,drawing,line_cache,i,point"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.select_drawing_at_mouse(State)"},{"Add":" for drawing_index,drawing in ipairs(State.lines) do"},{"Add":" if drawing.mode == 'drawing' then"},{"Add":" local x, y = App.mouse_x(), App.mouse_y()"},{"Add":" local line_cache = State.line_cache[drawing_index]"},{"Add":" if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then"},{"Add":" return drawing"},{"Add":" end"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.contains_point(shape, p)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" -- not supported"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" return shape.p1 == p or shape.p2 == p"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" return table.find(shape.vertices, p)"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" return shape.center == p"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" return shape.center == p"},{"Add":" -- ugh, how to support angles"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- already done"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.smoothen(shape)"},{"Add":" assert(shape.mode == 'freehand')"},{"Add":" for _=1,7 do"},{"Add":" for i=2,#shape.points-1 do"},{"Add":" local a = shape.points[i-1]"},{"Add":" local b = shape.points[i]"},{"Add":" local c = shape.points[i+1]"},{"Add":" b.x = round((a.x + b.x + c.x)/3)"},{"Add":" b.y = round((a.y + b.y + c.y)/3)"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function round(num)"},{"Add":" return math.floor(num+.5)"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.find_or_insert_point(points, x,y, width)"},{"Add":" -- check if UI would snap the two points together"},{"Add":" for i,point in ipairs(points) do"},{"Add":" if Drawing.near(point, x,y, width) then"},{"Add":" return i"},{"Add":" end"},{"Add":" end"},{"Add":" table.insert(points, {x=x, y=y})"},{"Add":" return #points"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.near(point, x,y, width)"},{"Add":" local px,py = Drawing.pixels(x, width),Drawing.pixels(y, width)"},{"Add":" local cx,cy = Drawing.pixels(point.x, width), Drawing.pixels(point.y, width)"},{"Add":" return (cx-px)*(cx-px) + (cy-py)*(cy-py) < Same_point_distance*Same_point_distance"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.pixels(n, width) -- parts to pixels"},{"Add":" return math.floor(n*width/256)"},{"Add":"end"},{"Add":"function Drawing.coord(n, width) -- pixels to parts"},{"Add":" return math.floor(n*256/width)"},{"Add":"end"},{"Add":""},{"Add":"function table.find(h, x)"},{"Add":" for k,v in pairs(h) do"},{"Add":" if v == x then"},{"Add":" return k"},{"Add":" end"},{"Add":" end"},{"Add":"end"}]}},{"Replacement":{"inode":{"change":6,"pos":203826},"path":"commands.lua","line":31,"ins":{"up_context":[{"change":6,"pos":204880}],"down_context":[{"change":6,"pos":204938}],"flag":"BLOCK","start":113930,"end":113988,"inode":{"change":6,"pos":203826}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":204880},"to":{"change":6,"start":204880,"end":204938},"introduced_by":6}],"inode":{"change":6,"pos":203826}},"ins_contents":[{"Add":" add_hotkey_to_menu('ctrl+i: create/edit debug print')"}],"del_contents":[{"Del":" add_hotkey_to_menu('ctrl+d: create/edit debug print')\n"}]}}],"owner":"akkartik","repo":"wardley.love","token":"/7Nj0JTUYw5TYqhIbN+OfTunYyJomkOWPsDue17S6sw=","login":null}

…

Dependencies

Change contents