{"header":{"message":"Merge lines.love","description":null,"timestamp":"2023-03-18T05:29:41Z","authors":[{"email":"vc@akkartik.com","name":"Kartik K. Agaram"}]},"hash":"DMRE7ZAC6FWH7NNZDYNUWOCU77LHN7MJRPSXL24JKG6HTRAS3J3AC","authors":[],"deps":{"hashes":[["DMRE7ZAC6FWH7NNZDYNUWOCU77LHN7MJRPSXL24JKG6HTRAS3J3AC","Merge lines.love"],["AA",null],["PYHMES4Z6NKRSUTY53EH5I5S553CLWCTILN3QHJX6WWRL5IHJXUQC","Merge lines.love"],["HESBC35LBCNFWDFRAO6Z4EJ67BCBHCRETCPEJCV2BDPHUJJFY3WQC","Merge lines.love"],["O4RRXNOK7GKGZB2AH3FULDJDQLVSQCQFWZLBMCDGNIRA63OSSMCAC","bugfix: disallow font size of 0"],["LDFXFRUOUESGMZ7Z6BCZUQFRFFRIAB67GSGN2BR2VLT2ONZPUV3QC","bring a few things in sync between run and source"],["LK4ZW4BBDD5LC4JK4XK5DJESSDFAIRVFPDM324S7SCAUXEXYVTLQC","bugfix"],["3TI67SEJNOSADDEHRTI5FSRD7WVNRTXQ5LC77LBSWLXXZK3MCONQC","more bugfix"],["2VEIMUQXG6S776NS77WTIFFIPSA27XDTWJZZ7FW3MTS2OHLHT56AC","Merge lines.love"],["JCFM5TELMGMNL4YYKBRFGP764MVVLZ2WEMC6GQWKFRHD3GEZW6PAC","Merge lines.love"],["LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC","extract a couple of files"],["76XOJEND6OWBWA7V6YXTQV2NP5SVVMLVZCCINBWKOBJARSUWNJJQC","Merge lines.love"],["ORRSP7FVCHI2TF5GXBRGQYYJAA3JFYXZBM3T663BKSBV22FCZVCAC","deduce test names on failures"],["UN7GKYV5YP5DQRKDYNYJTGX3CPXQYBVFJ7SLW44NWCN53VEZ3GAAC","support hyperlinks in the source editor"],["TLOAPLBJPPBAROMWGXUK6JIFEIR222YAB4JOYCARGAYDIOZDXSBQC","add a license"],["VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","several more modules"],["ZJOSQFN6CH475MQZ5EXWSWILKNC77RVFEN44KQ2Y4EQJ2BC5YFCAC","bugfix: path munging on Windows"],["OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","love2d scaffold"],["6LJZN727CRPYR34LV75CQF55YZI3E7MGESYZSFSYAE73SNEZE3FAC","handle chords"],["5R2LPB3UGD6S6YTJKRFA7FOCTZERZW5ACCPP46KQWY7K3FZ7ASQAC","Merge lines.love"],["2CK5QI7WA7M4IVSACFGOJYAIDKRUTZVMMPSFWEJTUNMWTN7AX4NAC","make love event names consistent"],["7VGDIPLCFDG3PVE4JH3WDKZ4A7PG5UYW7TLFFFOWN2JEUZYYTFJQC","more robust state validation"],["D2GCFTTT2RNUBFB243YTA4F2H5ZXFTFHBSKHLZ2CX4JSKRZFTUUQC","clean up repl functionality"],["BH7BT36LM3D7HF3GOHXUPVNKLJ5LFJHOHRLD3KTC5HA627M3II4AC","ctrl+a: select entire buffer"],["KMSL74GAMFNTAKGDKZFP2AMQXUMOC3XH373BO4IABZWBEP3YAXKAC","support selections in the source editor"],["7P6XKA2DCFG5YJAVTCAZMQNNDJ6K6OO5AILBBCVYV37XKZNYKHPAC","Merge lines.love"],["G54H3YG2NEZPW2F6OYT5JPV7KSKVMNW5D3QT3FBCXTJHAQYTV5UAC","get rid of all bifold text"],["RNDKROV3B4W7AAJUB65JGHZZ66OX6KVBGHVWVZGIITBNZH2UE3CAC","Merge lines.love"],["66X36NZNEHWWURKSZ6G3XSC4CKQ7NTR4HYGDJGLHAUELMUAQC34AC","a little more prose describing manual_tests"],["JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC","editing source code from within the app"],["KYNGDE2CKNOKUC2XMAS5MEU6YT2C3IW5SIZLOJE64G3ERT7BSWFAC","consistent names in a few more places"],["5H4AYUTPES2K7HSLFHHATH64RKVNMCH5SZWHRCL27D2GXSHQ5JDAC","Merge lines.love"],["UCQXSJU7J6MRHRQ2HDCSNYD7CYU246FGW3T2IDJMVHSPWGCMICVAC","Merge lines.love"],["QEXZHD2VPCM4TAPP7PR2K2PIR4BVES5IZWC3T6ZRNJWKWOXFILNQC","Merge lines.love"],["VYAIL5M4DLB7L3L34JX4XBBX6LZJKQDNC4TVNALP5L5XLUBM7TIQC","Merge lines.love"],["4VQGE7RAC2B4NWCCKDCUZMMRDRMXLN6357YY4OPFIK6BZBGRWDHQC","new test"],["VXORMHME4X64HL6AC7BVYMSYEAYASG6RENGUZ7PEIZ4YQJ7ZHBIQC","delete experimental REPL"],["4SR3Z4Y3GAXFND3TENHV66Q4WD4KODNYL6PAVLSAEQ3WHLOX37HQC","document the version of LÖVE I've been using"],["YRJFJNUDVPX2OAK7OKRYCVYDGMJI4XL4JASN4JJ7QGIPCVQI22TAC","bugfix"],["AVTNUQYRBW7IX2YQ3KDLVQ23RGW3BAKTAE7P73ASBYNKOHMQMH5AC","basic test-enabled framework"],["2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","experiment: new edit namespace"],["APX2PY6GAMJSUH7SFSMBFOQJBSAWLLOCKH4L4ZQP2VLHNEXJPREAC","stop tracking wallclock time"],["3QNOKBFMKBGXBVJIRHR2444JRRMBTABHE4674NR3DT67RRM2X6GAC","beginnings of a test harness"],["RSZD5A7GI5MISRTDFFJ63VUSFUFF3R7SXA66J64CBHWHNEUBMICQC","forgot to add json.lua"],["T4FRZSYLUWDA4K3URU4MI33EGD4XWSM7FPSIRNMAEYQAFEDFGPZAC","delete an ancient, unused file"],["BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","extract a module"],["ME7WBLF56X2WYKJODY47NDN4FELKIL5MYRT2MXCMZZLFKHOJMC2QC","bugfix: log filenames can have 2 formats"],["BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC","let's prevent the text cursor from ever getting on a drawing"],["LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC","group all editor globals"],["N7VXEGLGP4T4BQXWBTTSWKA4BUM72DV4QVNFSETCJIF2QIG4BPHAC","yet another bugfix in log parsing"],["B4JEWKWIFIOJ7MIWNDPR3L34NIH4WORBELAWFOPAMWL32SVIJ4YQC","hide editor cursor while in file navigator"],["L2FWWEQLZPZLGTI34PWW2V6BU5PRDHFTZPTJJQYGG4R6WOFJ273QC","source: remember cursor position of multiple files"],["OGUV4HSA7XGSQLUVWBAE3AE263Z7Z6G3BZOB4CN2AOYD2DEJMOZAC","remove some memory leaks from rendered fragments"],["C7CQOQ6ZDF3O66KAPNWO4QZWXGCYY6VKU3J7RUQKQTF46JTATRGAC","Merge lines.love"],["CE4LZV4TNXJT54CVGM3QANCBP42TMLMZWF2DBSMUYKAHILXIZEMQC","drop last couple of manual tests"],["X3CQLBTR7ICDAVFZZRLAWWJZI2SNZAMRUWW7O4R25DIKDUHL75CQC","set window title within each app"],["AOZX2G5FVANPHTV74V6YR7SNTMUD4F4IYN53OGKYHUWBCCWF5S4QC","source: no commandline args"],["TVCPXAAU4P3K5MFYINH2MWDK3KGTQ2GE74TUNERYOONG2G5EYKMQC","rename"],["GUOQRUL75BMNH7UOZIQ7EYXKK2TMQAIU6HAKMZ75TZYB7NWSZAVQC","Merge lines.love"],["KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","editing source code from within the app"],["LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC","start passing in Editor_state explicitly"],["4YDBYBA4H77LGAJHWRKVQSUGSYFNXKINO3VHFSQLU2XE36EIGO5AC","clean up memory leak experiments"],["XX7G2FFJ4QCGQGD4REAW5QFHVYAKCFUPGZCK7L6DFGS5ISVBYBQQC","intermingle freehand line drawings with text"],["OI4FPFINEROK6GNDEMOBTGSPYIULCLRGGT5W3H7VLM7VFH22GMWQC","support drawings in the source editor"],["6DYSB5DYWZJ2MRV3O7EZHMDWJFD5QN2TECWJFSRQESMKFDXSPLCAC","bugfix: perform matches in the right order"],["FS2ITYYHBLFT66YUC3ENPFYI2HOYHOVEPQIN7NQR6KF5MEK4NKZAC","record a known issue"],["N7LKWLNBOJU4JM23NOZRR4TQNRYMVJBXD6GAFZIKKMMEGGGXXGPQC","Merge lines.love"],["R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC","somebody stop me"],["MD3W5IRAC6UQALQE4LJC52VQNDO3I3HXF3XE2XHDABXBYJBUVAXQC","new fork: rip out drawing support"],["73OCE2MCBJJZZMN2KYPJTBOUCKBZAOQ2QIAMTGCNOOJ2AJAXFT2AC","after much struggle, a brute-force undo"],["34QHL4KCLCWXMXY7CBWZIEMKL6BX62DACWANNPQPYUHSV2INSE2QC","Merge lines.love"],["BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","beginnings of a module for the text editor"],["ECUKZUSFVKW6Z4GOE3G4CEZRIOJR5XF5OWZSDNEHOJVYHTG24DLAC","Merge lines.love"],["CLZLK7WKE3IKXV6M3PNCDNYQRWO3Y72PEOJYPFAQ7EUJTOWOMA6AC","Merge lines.love"],["K2X6G75Z6XBC4DVIRWC5HC7XA3A2SKOM3MWSQTCFEYWIJL7LME2QC","start writing some tests for drawings"],["B7YJ2CUAB44WIRBN63VKZFCPU47FKCYBNCOFCMBGA5XVG4MFHK6QC","Merge lines.love"],["GBSRQUT4QF5WCFVSTGSOU3BM6VCGPNBBG5WKDEGDGGCOUWTPEC2AC","Merge lines.love"]],"deps":["PYHMES4Z6NKRSUTY53EH5I5S553CLWCTILN3QHJX6WWRL5IHJXUQC","HESBC35LBCNFWDFRAO6Z4EJ67BCBHCRETCPEJCV2BDPHUJJFY3WQC","O4RRXNOK7GKGZB2AH3FULDJDQLVSQCQFWZLBMCDGNIRA63OSSMCAC","LDFXFRUOUESGMZ7Z6BCZUQFRFFRIAB67GSGN2BR2VLT2ONZPUV3QC","LK4ZW4BBDD5LC4JK4XK5DJESSDFAIRVFPDM324S7SCAUXEXYVTLQC","3TI67SEJNOSADDEHRTI5FSRD7WVNRTXQ5LC77LBSWLXXZK3MCONQC"],"known":["R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC","OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","6LJZN727CRPYR34LV75CQF55YZI3E7MGESYZSFSYAE73SNEZE3FAC","XX7G2FFJ4QCGQGD4REAW5QFHVYAKCFUPGZCK7L6DFGS5ISVBYBQQC","D2GCFTTT2RNUBFB243YTA4F2H5ZXFTFHBSKHLZ2CX4JSKRZFTUUQC","RSZD5A7GI5MISRTDFFJ63VUSFUFF3R7SXA66J64CBHWHNEUBMICQC","T4FRZSYLUWDA4K3URU4MI33EGD4XWSM7FPSIRNMAEYQAFEDFGPZAC","VXORMHME4X64HL6AC7BVYMSYEAYASG6RENGUZ7PEIZ4YQJ7ZHBIQC","TLOAPLBJPPBAROMWGXUK6JIFEIR222YAB4JOYCARGAYDIOZDXSBQC","BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC","FS2ITYYHBLFT66YUC3ENPFYI2HOYHOVEPQIN7NQR6KF5MEK4NKZAC","BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","3QNOKBFMKBGXBVJIRHR2444JRRMBTABHE4674NR3DT67RRM2X6GAC","TVCPXAAU4P3K5MFYINH2MWDK3KGTQ2GE74TUNERYOONG2G5EYKMQC","AVTNUQYRBW7IX2YQ3KDLVQ23RGW3BAKTAE7P73ASBYNKOHMQMH5AC","73OCE2MCBJJZZMN2KYPJTBOUCKBZAOQ2QIAMTGCNOOJ2AJAXFT2AC","LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC","OGUV4HSA7XGSQLUVWBAE3AE263Z7Z6G3BZOB4CN2AOYD2DEJMOZAC","4YDBYBA4H77LGAJHWRKVQSUGSYFNXKINO3VHFSQLU2XE36EIGO5AC","K2X6G75Z6XBC4DVIRWC5HC7XA3A2SKOM3MWSQTCFEYWIJL7LME2QC","66X36NZNEHWWURKSZ6G3XSC4CKQ7NTR4HYGDJGLHAUELMUAQC34AC","CE4LZV4TNXJT54CVGM3QANCBP42TMLMZWF2DBSMUYKAHILXIZEMQC","2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC","LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC","MD3W5IRAC6UQALQE4LJC52VQNDO3I3HXF3XE2XHDABXBYJBUVAXQC","GUOQRUL75BMNH7UOZIQ7EYXKK2TMQAIU6HAKMZ75TZYB7NWSZAVQC","JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC","KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","GBSRQUT4QF5WCFVSTGSOU3BM6VCGPNBBG5WKDEGDGGCOUWTPEC2AC","X3CQLBTR7ICDAVFZZRLAWWJZI2SNZAMRUWW7O4R25DIKDUHL75CQC","2VEIMUQXG6S776NS77WTIFFIPSA27XDTWJZZ7FW3MTS2OHLHT56AC","OI4FPFINEROK6GNDEMOBTGSPYIULCLRGGT5W3H7VLM7VFH22GMWQC","QEXZHD2VPCM4TAPP7PR2K2PIR4BVES5IZWC3T6ZRNJWKWOXFILNQC","UN7GKYV5YP5DQRKDYNYJTGX3CPXQYBVFJ7SLW44NWCN53VEZ3GAAC","VYAIL5M4DLB7L3L34JX4XBBX6LZJKQDNC4TVNALP5L5XLUBM7TIQC","KMSL74GAMFNTAKGDKZFP2AMQXUMOC3XH373BO4IABZWBEP3YAXKAC","C7CQOQ6ZDF3O66KAPNWO4QZWXGCYY6VKU3J7RUQKQTF46JTATRGAC","ZJOSQFN6CH475MQZ5EXWSWILKNC77RVFEN44KQ2Y4EQJ2BC5YFCAC","5R2LPB3UGD6S6YTJKRFA7FOCTZERZW5ACCPP46KQWY7K3FZ7ASQAC","4VQGE7RAC2B4NWCCKDCUZMMRDRMXLN6357YY4OPFIK6BZBGRWDHQC","34QHL4KCLCWXMXY7CBWZIEMKL6BX62DACWANNPQPYUHSV2INSE2QC","ME7WBLF56X2WYKJODY47NDN4FELKIL5MYRT2MXCMZZLFKHOJMC2QC","6DYSB5DYWZJ2MRV3O7EZHMDWJFD5QN2TECWJFSRQESMKFDXSPLCAC","N7VXEGLGP4T4BQXWBTTSWKA4BUM72DV4QVNFSETCJIF2QIG4BPHAC","B4JEWKWIFIOJ7MIWNDPR3L34NIH4WORBELAWFOPAMWL32SVIJ4YQC","7P6XKA2DCFG5YJAVTCAZMQNNDJ6K6OO5AILBBCVYV37XKZNYKHPAC","L2FWWEQLZPZLGTI34PWW2V6BU5PRDHFTZPTJJQYGG4R6WOFJ273QC","AOZX2G5FVANPHTV74V6YR7SNTMUD4F4IYN53OGKYHUWBCCWF5S4QC","ECUKZUSFVKW6Z4GOE3G4CEZRIOJR5XF5OWZSDNEHOJVYHTG24DLAC","B7YJ2CUAB44WIRBN63VKZFCPU47FKCYBNCOFCMBGA5XVG4MFHK6QC","APX2PY6GAMJSUH7SFSMBFOQJBSAWLLOCKH4L4ZQP2VLHNEXJPREAC","JCFM5TELMGMNL4YYKBRFGP764MVVLZ2WEMC6GQWKFRHD3GEZW6PAC","BH7BT36LM3D7HF3GOHXUPVNKLJ5LFJHOHRLD3KTC5HA627M3II4AC","5H4AYUTPES2K7HSLFHHATH64RKVNMCH5SZWHRCL27D2GXSHQ5JDAC","2CK5QI7WA7M4IVSACFGOJYAIDKRUTZVMMPSFWEJTUNMWTN7AX4NAC","KYNGDE2CKNOKUC2XMAS5MEU6YT2C3IW5SIZLOJE64G3ERT7BSWFAC","RNDKROV3B4W7AAJUB65JGHZZ66OX6KVBGHVWVZGIITBNZH2UE3CAC","UCQXSJU7J6MRHRQ2HDCSNYD7CYU246FGW3T2IDJMVHSPWGCMICVAC","ORRSP7FVCHI2TF5GXBRGQYYJAA3JFYXZBM3T663BKSBV22FCZVCAC","76XOJEND6OWBWA7V6YXTQV2NP5SVVMLVZCCINBWKOBJARSUWNJJQC","CLZLK7WKE3IKXV6M3PNCDNYQRWO3Y72PEOJYPFAQ7EUJTOWOMA6AC","4SR3Z4Y3GAXFND3TENHV66Q4WD4KODNYL6PAVLSAEQ3WHLOX37HQC","YRJFJNUDVPX2OAK7OKRYCVYDGMJI4XL4JASN4JJ7QGIPCVQI22TAC","N7LKWLNBOJU4JM23NOZRR4TQNRYMVJBXD6GAFZIKKMMEGGGXXGPQC","7VGDIPLCFDG3PVE4JH3WDKZ4A7PG5UYW7TLFFFOWN2JEUZYYTFJQC","G54H3YG2NEZPW2F6OYT5JPV7KSKVMNW5D3QT3FBCXTJHAQYTV5UAC"]},"hunks":[{"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":8,"pos":2},"to":{"change":8,"start":83676,"end":83721},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":2},"to":{"change":8,"start":83676,"end":83721},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":83721},"to":{"change":8,"start":3498,"end":3498},"introduced_by":2}],"inode":{"change":8,"pos":3498}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":35050},"to":{"change":6,"start":1558,"end":2521},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2521},"to":{"change":8,"start":49007,"end":49067},"introduced_by":6}],"inode":{"change":8,"pos":3498}},"content":[{"Del":"end\n\nfunction test_up_arrow_scrolls_up_by_one_line_skipping_drawing()\n -- display lines 3/4/5 with a drawing just off screen at line 2\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', '```lines', '```', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=3, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'def', 'baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'baseline/screen:3')\n -- after hitting the up arrow the screen scrolls up to previous text line\n edit.run_after_keychord(Editor_state, 'up')\n check_eq(Editor_state.screen_top1.line, 1, 'screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'cursor')\n"},{"Del":"end\n\nfunction test_up_arrow_scrolls_up_by_one_screen_line()\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":8,"pos":2},"to":{"change":8,"start":147062,"end":147101},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":2},"to":{"change":8,"start":147062,"end":147101},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":147101},"to":{"change":8,"start":83723,"end":83723},"introduced_by":2}],"inode":{"change":8,"pos":83723}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":83964},"to":{"change":8,"start":7,"end":143},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":84244},"to":{"change":8,"start":144,"end":204},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":88027},"to":{"change":8,"start":205,"end":250},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":88263},"to":{"change":8,"start":251,"end":298},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":89103},"to":{"change":8,"start":299,"end":484},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":103074},"to":{"change":8,"start":924,"end":1004},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":103317},"to":{"change":8,"start":1005,"end":1085},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":106716},"to":{"change":8,"start":1836,"end":2338},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":107782},"to":{"change":8,"start":2339,"end":2420},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108019},"to":{"change":8,"start":2421,"end":2496},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108390},"to":{"change":8,"start":2497,"end":2660},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108443},"to":{"change":8,"start":2661,"end":2754},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108572},"to":{"change":8,"start":2755,"end":2842},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108742},"to":{"change":8,"start":2843,"end":2918},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118378},"to":{"change":8,"start":2976,"end":3000},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118525},"to":{"change":8,"start":3001,"end":3083},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118635},"to":{"change":8,"start":3084,"end":3157},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118961},"to":{"change":8,"start":3158,"end":3184},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120000},"to":{"change":8,"start":3185,"end":3215},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":122138},"to":{"change":8,"start":3275,"end":3366},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":122747},"to":{"change":8,"start":3367,"end":3424},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":126954},"to":{"change":8,"start":3484,"end":3543},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127079},"to":{"change":8,"start":3544,"end":3613},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127220},"to":{"change":8,"start":3614,"end":3661},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127795},"to":{"change":8,"start":3845,"end":3917},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":130990},"to":{"change":8,"start":4319,"end":4837},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":134599},"to":{"change":8,"start":4838,"end":4992},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":134915},"to":{"change":8,"start":4993,"end":5067},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":135006},"to":{"change":8,"start":5068,"end":5382},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":141509},"to":{"change":8,"start":5383,"end":5452},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":141892},"to":{"change":8,"start":5453,"end":5531},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":141965},"to":{"change":8,"start":5532,"end":5558},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142018},"to":{"change":8,"start":5559,"end":5583},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142792},"to":{"change":8,"start":5584,"end":5700},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142799},"to":{"change":8,"start":5701,"end":5740},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142862},"to":{"change":8,"start":5741,"end":5854},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":145797},"to":{"change":8,"start":5855,"end":6034},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6034},"to":{"change":8,"start":145985,"end":146455},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5854},"to":{"change":8,"start":144205,"end":144216},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5740},"to":{"change":8,"start":142799,"end":142862},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5700},"to":{"change":8,"start":142792,"end":142799},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5583},"to":{"change":8,"start":142099,"end":142104},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5558},"to":{"change":8,"start":141995,"end":142018},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5531},"to":{"change":8,"start":141943,"end":141965},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5452},"to":{"change":8,"start":141766,"end":141892},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5382},"to":{"change":8,"start":135329,"end":136095},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5067},"to":{"change":8,"start":134996,"end":135006},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4992},"to":{"change":8,"start":134859,"end":134915},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4837},"to":{"change":8,"start":134318,"end":134599},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":128948},"to":{"change":8,"start":4081,"end":4318},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4318},"to":{"change":8,"start":130218,"end":130274},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":128343},"to":{"change":8,"start":3918,"end":4080},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4080},"to":{"change":8,"start":128576,"end":128669},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3917},"to":{"change":8,"start":127933,"end":127996},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3661},"to":{"change":7,"start":167,"end":326},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":326},"to":{"change":8,"start":127567,"end":127795},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3844},"to":{"change":8,"start":127567,"end":127795},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3613},"to":{"change":8,"start":127185,"end":127220},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3543},"to":{"change":8,"start":127033,"end":127079},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":125930},"to":{"change":8,"start":3425,"end":3483},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3483},"to":{"change":8,"start":126622,"end":126718},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":123165},"to":{"change":6,"start":2886,"end":3110},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3110},"to":{"change":8,"start":123313,"end":123324},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3424},"to":{"change":8,"start":122864,"end":122940},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3366},"to":{"change":8,"start":122453,"end":122747},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":121196},"to":{"change":8,"start":3216,"end":3274},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3274},"to":{"change":8,"start":121240,"end":121504},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3215},"to":{"change":8,"start":120048,"end":120064},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3184},"to":{"change":8,"start":119794,"end":120000},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3157},"to":{"change":8,"start":118828,"end":118961},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3083},"to":{"change":8,"start":118591,"end":118635},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3000},"to":{"change":8,"start":118472,"end":118525},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":115743},"to":{"change":8,"start":2919,"end":2975},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2975},"to":{"change":8,"start":115833,"end":117041},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":111167},"to":{"change":6,"start":2661,"end":2885},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2885},"to":{"change":8,"start":111315,"end":111326},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2918},"to":{"change":8,"start":108846,"end":109127},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2842},"to":{"change":8,"start":108659,"end":108742},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2754},"to":{"change":8,"start":108443,"end":108572},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2660},"to":{"change":8,"start":108390,"end":108443},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2496},"to":{"change":8,"start":108123,"end":108390},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2420},"to":{"change":8,"start":6490,"end":6769},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2338},"to":{"change":8,"start":107466,"end":107782},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":23178},"to":{"change":8,"start":1761,"end":1835},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1835},"to":{"change":8,"start":23277,"end":23285},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":23029},"to":{"change":8,"start":1686,"end":1760},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1760},"to":{"change":8,"start":23128,"end":23136},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22826},"to":{"change":8,"start":1611,"end":1685},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1685},"to":{"change":8,"start":22925,"end":22933},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22677},"to":{"change":8,"start":1536,"end":1610},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1610},"to":{"change":8,"start":22776,"end":22784},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22474},"to":{"change":8,"start":1461,"end":1535},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1535},"to":{"change":8,"start":22573,"end":22581},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22325},"to":{"change":8,"start":1386,"end":1460},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1460},"to":{"change":8,"start":22424,"end":22432},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22122},"to":{"change":8,"start":1311,"end":1385},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1385},"to":{"change":8,"start":22221,"end":22229},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21973},"to":{"change":8,"start":1236,"end":1310},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1310},"to":{"change":8,"start":22072,"end":22080},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21770},"to":{"change":8,"start":1161,"end":1235},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1235},"to":{"change":8,"start":21869,"end":21877},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21621},"to":{"change":8,"start":1086,"end":1160},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1160},"to":{"change":8,"start":21720,"end":21728},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1085},"to":{"change":8,"start":103419,"end":104024},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1004},"to":{"change":8,"start":103176,"end":103317},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":100094},"to":{"change":8,"start":889,"end":923},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":102512},"to":{"change":6,"start":2523,"end":2660},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2660},"to":{"change":8,"start":102691,"end":103057},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":8,"pos":923},"to":{"change":8,"start":100150,"end":100802},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":97835},"to":{"change":8,"start":523,"end":888},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":888},"to":{"change":8,"start":98660,"end":98665},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":91058},"to":{"change":8,"start":485,"end":522},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":522},"to":{"change":8,"start":91109,"end":91485},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":484},"to":{"change":8,"start":91019,"end":91027},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":298},"to":{"change":8,"start":88332,"end":89103},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":250},"to":{"change":8,"start":88105,"end":88179},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":204},"to":{"change":8,"start":87305,"end":88027},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":143},"to":{"change":8,"start":84098,"end":84244},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1068},"to":{"change":5,"start":7,"end":195},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1154},"to":{"change":5,"start":196,"end":406},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":406},"to":{"change":8,"start":147057,"end":147061},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":195},"to":{"change":8,"start":1149,"end":1154},"introduced_by":5}],"inode":{"change":8,"pos":83723}},"content":[{"Del":"-- return the final y, and position of start of final screen line drawn\nfunction Text.draw(State, line_index, y, startpos, hide_cursor)\n"},{"Del":" -- wrap long lines\n local x = State.left\n local pos = 1\n"},{"Del":" return y, screen_line_starting_pos\n"},{"Del":" if line_index == State.cursor1.line then\n"},{"Del":" if Focus == 'edit' and not hide_cursor and State.search_term == nil then\n if line_index == State.cursor1.line and State.cursor1.pos == pos then\n Text.draw_cursor(State, x, y)\n"},{"Del":" if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n"},{"Del":" if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n"},{"Del":" local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)\n table.insert(State.lines, State.cursor1.line+1, {mode='text', data=string.sub(State.lines[State.cursor1.line].data, byte_offset)})\n 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 Text.clear_screen_line_cache(State, State.cursor1.line)\n State.cursor1 = {line=State.cursor1.line+1, pos=1}\n"},{"Del":" if State.screen_top1.line == 1 and State.screen_top1.pos == 1 then break end\n"},{"Del":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}\n"},{"Del":" -- If a line/paragraph gets to a page boundary, I often want to scroll\n -- before I get to the bottom.\n -- However, only do this if it makes forward progress.\n"},{"Del":" if bot2.screen_line > 1 then\n bot2.screen_line = math.max(bot2.screen_line-10, 1)\n end\n"},{"Del":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}\n"},{"Del":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}\n"},{"Del":" State.cursor1.pos = 1\n"},{"Del":" State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos} -- copy\n"},{"Del":" State.cursor1.pos = utf8.len(State.lines[State.cursor1.line].data) + 1\n"},{"Del":" -- skip some whitespace\n"},{"Del":" -- skip some non-whitespace\n"},{"Del":" if Text.cursor_out_of_screen(State) then\n Text.snap_cursor_to_bottom_of_screen(State)\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text')\n"},{"Del":"--? print('to2:', State.cursor1.line, State.cursor1.pos)\n"},{"Del":"--? print('to2: =>', top2.line, top2.screen_line, top2.screen_pos)\n"},{"Del":" top2.screen_pos = 1 -- start of screen line\n"},{"Del":"--? print(y, 'top2:', top2.line, top2.screen_line, top2.screen_pos)\n"},{"Del":" local start_screen_line_index = Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos)\n for screen_line_index = start_screen_line_index,#line_cache.screen_line_starting_pos do\n local screen_line_starting_pos = line_cache.screen_line_starting_pos[screen_line_index]\n local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)\n--? print('iter', y, screen_line_index, screen_line_starting_pos, string.sub(line.data, screen_line_starting_byte_offset))\n"},{"Del":" if screen_line_index < #line_cache.screen_line_starting_pos and mx > State.left + Text.screen_line_width(State, line_index, screen_line_index) then\n"},{"Del":" return line_cache.screen_line_starting_pos[screen_line_index+1]-1\n"},{"Del":" local s = string.sub(line.data, screen_line_starting_byte_offset)\n--? print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1)\n return screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1\n"},{"Del":"function Text.eq1(a, b)\n return a.line == b.line and a.pos == b.pos\n"},{"Del":" return a.pos < b.pos\nend\n\nfunction Text.le1(a, b)\n if a.line < b.line then\n"},{"Del":" if a.line > b.line then\n"},{"Del":" return a.pos <= b.pos\n"},{"Del":" elseif State.lines[loc2.line-1].mode == 'drawing' then\n return {line=loc2.line-1, screen_line=1, screen_pos=1}\n"},{"Del":" local l = State.lines[loc2.line-1]\n"},{"Del":" return {line=loc2.line-1, screen_line=#State.line_cache[loc2.line-1].screen_line_starting_pos, screen_pos=1}\n"},{"Del":" State.cursor1 = {\n line=State.screen_bottom1.line,\n pos=Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, App.screen.height-5),\n }\n"},{"Del":" end\n end\nend\n\n-- slightly expensive since it redraws the screen\nfunction Text.cursor_out_of_screen(State)\n App.draw()\n return State.cursor_y == nil\n -- this approach is cheaper and almost works, except on the final screen\n -- where file ends above bottom of screen\n--? local botpos = Text.pos_at_start_of_screen_line(State, State.cursor1)\n--? local botline1 = {line=State.cursor1.line, pos=botpos}\n--? return Text.lt1(State.screen_bottom1, botline1)\nend\n\n"},{"Del":" end\nend\n\n"},{"Del":" Text.populate_screen_line_starting_pos(State, loc2.line-1)\n"},{"Del":" else\n"},{"Del":"end\n\n"},{"Del":" return false\n end\n"},{"Del":" return true\n end\n"},{"Del":"end\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"},{"Del":" end\n y = nexty\n end\n assert(false)\nend\n\nfunction Text.screen_line_width(State, line_index, i)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n local start_pos = line_cache.screen_line_starting_pos[i]\n local start_offset = Text.offset(line.data, start_pos)\n local screen_line\n if i < #line_cache.screen_line_starting_pos then\n local past_end_pos = line_cache.screen_line_starting_pos[i+1]\n local past_end_offset = Text.offset(line.data, past_end_pos)\n screen_line = string.sub(line.data, start_offset, past_end_offset-1)\n else\n screen_line = string.sub(line.data, start_pos)\n end\n local screen_line_text = App.newText(love.graphics.getFont(), screen_line)\n return App.width(screen_line_text)\nend\n\n"},{"Del":" end\n"},{"Del":"--? print('past end of non-final line; return')\n"},{"Del":" local nexty = y + State.line_height\n if my < nexty then\n -- On all wrapped screen lines but the final one, clicks past end of\n -- line position cursor on final character of screen line.\n -- (The final screen line positions past end of screen line as always.)\n"},{"Del":" Text.populate_screen_line_starting_pos(State, line_index)\n return y < line_cache.starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)\n"},{"Del":"end\n\n-- convert mx,my in pixels to schema-1 coordinates\n"},{"Del":"--? print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n"},{"Del":" Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks\n"},{"Del":" if top2.line == 1 and top2.screen_line == 1 then break end\n"},{"Del":"--? print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n"},{"Del":"--? 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"},{"Del":" -- slide to start of screen line\n"},{"Del":" local top2 = Text.to2(State, State.cursor1)\n"},{"Del":" return screen_lines[#screen_lines] <= State.cursor1.pos\n"},{"Del":"end\n\nfunction Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)\n"},{"Del":" State.screen_top1 = {\n line=State.cursor1.line,\n pos=Text.pos_at_start_of_screen_line(State, State.cursor1),\n }\n Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks\n"},{"Del":" end\nend\n\n"},{"Del":" if State.cursor1.pos > 1 then\n State.cursor1.pos = State.cursor1.pos-1\n"},{"Del":" 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"},{"Del":"function Text.word_right(State)\n -- skip some whitespace\n"},{"Del":" 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\n"},{"Del":" while true do\n"},{"Del":" 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\n"},{"Del":" 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"},{"Del":" end\nend\n\nfunction Text.end_of_line(State)\n"},{"Del":" if Text.lt1(State.cursor1, State.screen_top1) then\n"},{"Del":" else\n -- move down one screen line in current line\n"},{"Del":" 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"},{"Del":" State.screen_top1 = {\n line=State.cursor1.line,\n pos=Text.pos_at_start_of_screen_line(State, State.cursor1),\n }\n Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks\n"},{"Del":" end\nend\n\n"},{"Del":" 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":" end\n--? print('setting top to', State.screen_top1.line, State.screen_top1.pos)\n"},{"Del":" 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":" local bot2 = Text.to2(State, State.screen_bottom1)\n"},{"Del":" 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"},{"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":"end\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"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}\n"},{"Del":" end\n"},{"Del":" 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"},{"Del":" before = snapshot(State, State.cursor1.line)\n else\n before = snapshot(State, State.cursor1.line, State.cursor1.line+1)\n end\n"},{"Del":" if State.cursor1.pos > 1 then\n"},{"Del":" State.screen_top1 = {\n line=State.cursor1.line,\n pos=Text.pos_at_start_of_screen_line(State, State.cursor1),\n }\n"},{"Del":" 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"},{"Del":" 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"},{"Del":" 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"},{"Del":"end\n\n"},{"Del":" return y, screen_line_starting_pos\n"},{"Del":"end\n\nfunction Text.draw_cursor(State, x, y)\n -- blink every 0.5s\n if math.floor(Cursor_time*2)%2 == 0 then\n App.color(Cursor_color)\n love.graphics.rectangle('fill', x,y, 3,State.line_height)\n end\n State.cursor_x = x\n State.cursor_y = y+State.line_height\nend\n\nfunction Text.populate_screen_line_starting_pos(State, line_index)\n local line = State.lines[line_index]\n"},{"Del":" end\n"},{"Del":" if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then\n if State.search_term then\n if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then\n local lo_px = Text.draw_highlight(State, line, x,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))\n App.color(Text_color)\n love.graphics.print(State.search_term, x+lo_px,y)\n end\n elseif Focus == 'edit' then\n Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y)\n App.color(Text_color)\n end\n end\n end\n x = x + frag_width\n end\n pos = pos + frag_len\n end\n"},{"Del":" end\n screen_line_starting_pos = pos\n x = State.left\n"},{"Del":" local screen_line_starting_pos = startpos\n Text.compute_fragments(State, line_index)\n local pos = 1\n initialize_color()\n for _, f in ipairs(line_cache.fragments) do\n App.color(Text_color)\n local frag, frag_text = f.data, f.text\n select_color(frag)\n local frag_len = utf8.len(frag)\n--? print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)\n if pos < startpos then\n -- render nothing\n--? print('skipping', frag)\n else\n -- render fragment\n local frag_width = App.width(frag_text)\n if x + frag_width > State.right then\n assert(x > State.left) -- no overfull lines\n y = y + State.line_height\n if y + State.line_height > App.screen.height then\n"},{"Del":" local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n line_cache.starty = y\n line_cache.startpos = startpos\n"},{"Del":"function starts_with(s, prefix)\n if #s < #prefix then\n return false\n end\n for i=1,#prefix do\n if s:sub(i,i) ~= prefix:sub(i,i) then\n return false\n end\n end\n return true\n"},{"Del":"function ends_with(s, suffix)\n if #s < #suffix then\n return false\n end\n for i=0,#suffix-1 do\n if s:sub(#s-i,#s-i) ~= suffix:sub(#suffix-i,#suffix-i) then\n return false\n end\n end\n return true\n"},{"Del":"end\n"},{"Del":"end\n\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":8,"pos":2},"to":{"change":8,"start":165725,"end":165764},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":2},"to":{"change":8,"start":165725,"end":165764},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":165764},"to":{"change":8,"start":152440,"end":152440},"introduced_by":3}],"inode":{"change":8,"pos":152440}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":154462},"to":{"change":8,"start":6171,"end":6409},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":155530},"to":{"change":8,"start":6410,"end":6506},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":155884},"to":{"change":8,"start":6507,"end":6551},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":155992},"to":{"change":8,"start":6552,"end":6606},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":19977},"to":{"change":8,"start":6607,"end":6676},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":20070},"to":{"change":8,"start":6677,"end":6718},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":158906},"to":{"change":8,"start":7223,"end":7269},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159254},"to":{"change":8,"start":7270,"end":7408},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":233},"to":{"change":8,"start":7409,"end":7497},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7497},"to":{"change":8,"start":161829,"end":163099},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7408},"to":{"change":8,"start":159446,"end":159489},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7269},"to":{"change":8,"start":159057,"end":159254},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":31387},"to":{"change":8,"start":7018,"end":7222},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7222},"to":{"change":8,"start":31612,"end":32159},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":31038},"to":{"change":8,"start":6811,"end":7017},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7017},"to":{"change":8,"start":21843,"end":22192},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":156342},"to":{"change":8,"start":6719,"end":6810},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6810},"to":{"change":8,"start":21213,"end":21511},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6718},"to":{"change":8,"start":20236,"end":21096},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6676},"to":{"change":8,"start":20019,"end":20070},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6606},"to":{"change":8,"start":19945,"end":19977},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6551},"to":{"change":8,"start":155928,"end":155992},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6506},"to":{"change":8,"start":155670,"end":155884},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6409},"to":{"change":8,"start":30094,"end":30372},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":19494},"to":{"change":8,"start":6113,"end":6170},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6170},"to":{"change":8,"start":153197,"end":154135},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":152987},"to":{"change":8,"start":6039,"end":6112},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":6112},"to":{"change":8,"start":18530,"end":18578},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":157151},"to":{"change":5,"start":560,"end":626},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":626},"to":{"change":8,"start":157217,"end":157427},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":157047},"to":{"change":5,"start":472,"end":559},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":559},"to":{"change":8,"start":157047,"end":157058},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":154970},"to":{"change":5,"start":411,"end":471},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":471},"to":{"change":8,"start":155006,"end":155031},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":160545},"to":{"change":4,"start":11,"end":142},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":142},"to":{"change":8,"start":160630,"end":161052},"introduced_by":4}],"inode":{"change":8,"pos":152440}},"content":[{"Del":" screen_top1 = {line=1, pos=1}, -- position of start of screen line at top of screen\n cursor1 = {line=1, pos=1}, -- position of cursor\n screen_bottom1 = {line=1, pos=1}, -- position of start of screen line at bottom of screen\n"},{"Del":" print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)\n"},{"Del":"--? print('draw:', y, line_index, line)\n"},{"Del":" State.screen_bottom1 = {line=line_index, pos=nil}\n"},{"Del":"--? print('text.draw', y, line_index)\n local startpos = 1\n"},{"Del":" startpos = State.screen_top1.pos\n"},{"Del":" State.cursor1.pos = State.cursor1.pos+1\n"},{"Del":" cursor={line=State.cursor1.line, pos=State.cursor1.pos},\n screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},\n"},{"Del":" State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1}\n"},{"Del":" 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":" }\n assert(State.search_text == nil)\n"},{"Del":" 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"},{"Del":" State.cursor1 = {\n line=line_index,\n pos=Text.to_pos_on_line(State, line_index, x, y),\n }\n--? print('cursor', State.cursor1.line, State.cursor1.pos)\n"},{"Del":" if State.mousepress_shift then\n if State.old_selection1.line == nil then\n State.selection1 = State.old_cursor1\n else\n State.selection1 = State.old_selection1\n end\n end\n State.old_cursor1, State.old_selection1, State.mousepress_shift = nil\n if eq(State.cursor1, State.selection1) then\n State.selection1 = {}\n end\n break\n end\n end\n end\n--? print('selection:', State.selection1.line, State.selection1.pos)\n"},{"Del":" State.selection1 = {\n line=line_index,\n pos=Text.to_pos_on_line(State, line_index, x, y),\n }\n--? print('selection', State.selection1.line, State.selection1.pos)\n"},{"Del":" 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"},{"Del":" y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)\n"},{"Del":" 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":" 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":" if line_index == State.screen_top1.line then\n"},{"Del":" if line.mode == 'text' then\n"},{"Del":" if y + State.line_height > App.screen.height then break end\n"},{"Del":" 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":"\n selection1 = {},\n -- some extra state to compute selection between mouse press and release\n old_cursor1 = nil,\n old_selection1 = nil,\n mousepress_shift = nil,\n -- when selecting text, avoid recomputing some state on every single frame\n recent_mouse = {},\n"},{"Del":" lines = {{mode='text', data=''}}, -- array of lines\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"},{"Del":" -- a line is either text or a drawing\n -- a text is a table with:\n"},{"Del":" -- mode = 'text',\n -- string data,\n"},{"Del":"--? print('press', State.selection1.line, State.selection1.pos)\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":" -- give some time for the OS to flush everything to disk\n love.timer.sleep(0.1)\n"},{"Del":" end\nend\n\n"},{"Del":" left = math.floor(left),\n right = math.floor(right),\n"},{"Del":" width = right-left,\n\n"},{"Del":" if State.font_height > 2 then\n edit.update_font_settings(State, State.font_height-2)\n Text.redraw_all(State)\n end\n"},{"Del":" 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"}]}},{"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":8,"pos":2},"to":{"change":8,"start":177652,"end":177686},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":2},"to":{"change":8,"start":177652,"end":177686},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":177686},"to":{"change":8,"start":165766,"end":165766},"introduced_by":3}],"inode":{"change":8,"pos":165766}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":167321},"to":{"change":8,"start":7499,"end":7533},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7533},"to":{"change":8,"start":167372,"end":167480},"introduced_by":8}],"inode":{"change":8,"pos":165766}},"content":[{"Del":"-- environment for a mutable file\n"},{"Del":"-- TODO: some initialization is also happening in load_settings/initialize_default_settings. Clean that up.\n"}]}},{"FileDel":{"deleted_names":[{"basename":"log_browser.lua","metadata":0},{"basename":"log_browser.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":2},"to":{"change":8,"start":203223,"end":203262},"introduced_by":8},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":2},"to":{"change":8,"start":203223,"end":203262},"introduced_by":8},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":8,"pos":203262},"to":{"change":8,"start":191782,"end":191782},"introduced_by":8}],"inode":{"change":8,"pos":191782}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":200648},"to":{"change":7,"start":385,"end":441},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":441},"to":{"change":8,"start":200714,"end":200890},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":192603},"to":{"change":7,"start":338,"end":384},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":384},"to":{"change":8,"start":192651,"end":193112},"introduced_by":7}],"inode":{"change":8,"pos":191782}},"content":[{"Del":" Editor_state.cursor1 = {line=line.line_number, pos=1}\n"},{"Del":" -- make sure it's visible\n -- TODO: handle extremely long lines\n Editor_state.screen_top1.line = math.max(0, Editor_state.cursor1.line-5)\n -- show cursor\n Focus = 'edit'\n"},{"Del":" Log_browser_state.cursor1 = {line=1, pos=1}\n"},{"Del":"end\n\nSection_stack = {}\nSection_border_color = {r=0.7, g=0.7, b=0.7}\nCursor_line_background_color = {r=0.7, g=0.7, b=0, a=0.1}\n\nSection_border_padding_horizontal = 30 -- TODO: adjust this based on font height (because we draw text vertically along the borders\nSection_border_padding_vertical = 15 -- TODO: adjust this based on font height\n\nlog_browser = {}\n\nfunction log_browser.parse(State)\n for _,line in ipairs(State.lines) do\n if line.data ~= '' then\n"}]}},{"Edit":{"inode":{"change":8,"pos":2},"path":"text_tests.lua","line":1177,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":12204},"to":{"change":6,"start":2,"end":965},"introduced_by":6}],"inode":{"change":8,"pos":2}}},"contents":[{"Del":"end\n\nfunction test_up_arrow_scrolls_up_by_one_line_skipping_drawing()\n -- display lines 3/4/5 with a drawing just off screen at line 2\n App.screen.init{width=120, height=60}\n Editor_state = edit.initialize_test_state()\n Editor_state.lines = load_array{'abc', '```lines', '```', 'def', 'ghi', 'jkl'}\n Text.redraw_all(Editor_state)\n Editor_state.cursor1 = {line=3, pos=1}\n Editor_state.screen_top1 = {line=3, pos=1}\n Editor_state.screen_bottom1 = {}\n edit.draw(Editor_state)\n local y = Editor_state.top\n App.screen.check(y, 'def', 'baseline/screen:1')\n y = y + Editor_state.line_height\n App.screen.check(y, 'ghi', 'baseline/screen:2')\n y = y + Editor_state.line_height\n App.screen.check(y, 'jkl', 'baseline/screen:3')\n -- after hitting the up arrow the screen scrolls up to previous text line\n edit.run_after_keychord(Editor_state, 'up')\n check_eq(Editor_state.screen_top1.line, 1, 'screen_top')\n check_eq(Editor_state.cursor1.line, 1, 'cursor')\n"}]}},{"Edit":{"inode":{"change":8,"pos":3561},"path":"source_text_tests.lua","line":1252,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":11690}],"down_context":[{"change":8,"pos":49070}],"flag":"BLOCK","start":6,"end":969,"inode":{"change":8,"pos":3561}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function test_up_arrow_scrolls_up_by_one_line_skipping_drawing()"},{"Add":" -- display lines 3/4/5 with a drawing just off screen at line 2"},{"Add":" App.screen.init{width=120, height=60}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'abc', '```lines', '```', 'def', 'ghi', 'jkl'}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" Editor_state.cursor1 = {line=3, pos=1}"},{"Add":" Editor_state.screen_top1 = {line=3, pos=1}"},{"Add":" Editor_state.screen_bottom1 = {}"},{"Add":" edit.draw(Editor_state)"},{"Add":" local y = Editor_state.top"},{"Add":" App.screen.check(y, 'def', 'baseline/screen:1')"},{"Add":" y = y + Editor_state.line_height"},{"Add":" App.screen.check(y, 'ghi', 'baseline/screen:2')"},{"Add":" y = y + Editor_state.line_height"},{"Add":" App.screen.check(y, 'jkl', 'baseline/screen:3')"},{"Add":" -- after hitting the up arrow the screen scrolls up to previous text line"},{"Add":" edit.run_after_keychord(Editor_state, 'up')"},{"Add":" check_eq(Editor_state.screen_top1.line, 1, 'screen_top')"},{"Add":" check_eq(Editor_state.cursor1.line, 1, 'cursor')"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":83876},"to":{"change":8,"start":83876,"end":83938},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"AB_padding = 20 -- space in pixels between A side and B side\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":5,"ins":{"up_context":[{"change":8,"pos":84027}],"down_context":[{"change":8,"pos":84161}],"flag":"BLOCK","start":971,"end":1107,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":84027},"to":{"change":8,"start":84027,"end":84099},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":84099},"to":{"change":8,"start":7,"end":82},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"-- return the final y, and position of start of final screen line drawn"},{"Add":"function Text.draw(State, line_index, y, startpos, hide_cursor)"}],"del_contents":[{"Del":"-- return the final y, and pos,posB of start of final screen line drawn\n"},{"Del":"function Text.draw(State, line_index, y, startpos, startposB, hide_cursor)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":11,"ins":{"up_context":[{"change":8,"pos":84307}],"down_context":[{"change":8,"pos":87368}],"flag":"BLOCK","start":1108,"end":1168,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":84307},"to":{"change":8,"start":84307,"end":84693},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":84693},"to":{"change":8,"start":83,"end":139},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":139},"to":{"change":8,"start":84732,"end":85916},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":84732},"to":{"change":8,"start":84732,"end":85916},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":86070},"to":{"change":8,"start":86070,"end":86564},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":86564},"to":{"change":8,"start":140,"end":194},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":194},"to":{"change":8,"start":86601,"end":87368},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":86601},"to":{"change":8,"start":86601,"end":87368},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" -- wrap long lines"},{"Add":" local x = State.left"},{"Add":" local pos = 1"}],"del_contents":[{"Del":" line_cache.startposB = startposB\n -- draw A side\n local overflows_screen, x, pos, screen_line_starting_pos\n if startpos then\n overflows_screen, x, y, pos, screen_line_starting_pos = Text.draw_wrapping_line(State, line_index, State.left, y, startpos)\n if overflows_screen then\n return y, screen_line_starting_pos\n end\n if Focus == 'edit' and State.cursor1.pos then\n"},{"Del":" if not hide_cursor and not State.search_term then\n"},{"Del":" if line_index == State.cursor1.line and State.cursor1.pos == pos then\n Text.draw_cursor(State, x, y)\n end\n end\n end\n else\n x = State.left\n end\n -- check for B side\n--? if line_index == 8 then print('checking for B side') end\n if line.dataB == nil then\n assert(y)\n assert(screen_line_starting_pos)\n--? if line_index == 8 then print('return 1') end\n return y, screen_line_starting_pos\n end\n if not State.expanded and not line.expanded then\n assert(y)\n assert(screen_line_starting_pos)\n--? if line_index == 8 then print('return 2') end\n button(State, 'expand', {x=x+AB_padding, y=y+2, w=App.width(State.em), h=State.line_height-4, color={1,1,1},\n icon = function(button_params)\n App.color(Fold_background_color)\n love.graphics.rectangle('fill', button_params.x, button_params.y, App.width(State.em), State.line_height-4, 2,2)\n end,\n onpress1 = function()\n line.expanded = true\n end,\n })\n return y, screen_line_starting_pos\n end\n -- draw B side\n--? if line_index == 8 then print('drawing B side') end\n App.color(Fold_color)\n"},{"Del":" if startposB then\n overflows_screen, x, y, pos, screen_line_starting_pos = Text.draw_wrapping_lineB(State, line_index, x,y, startposB)\n else\n overflows_screen, x, y, pos, screen_line_starting_pos = Text.draw_wrapping_lineB(State, line_index, x+AB_padding,y, 1)\n end\n if overflows_screen then\n return y, nil, screen_line_starting_pos\n end\n--? if line_index == 8 then print('a') end\n if Focus == 'edit' and State.cursor1.posB then\n--? if line_index == 8 then print('b') end\n"},{"Del":" if not hide_cursor and not State.search_term then\n"},{"Del":"--? if line_index == 8 then print('c', State.cursor1.line, State.cursor1.posB, line_index, pos) end\n if line_index == State.cursor1.line and State.cursor1.posB == pos then\n Text.draw_cursor(State, x, y)\n end\n end\n end\n return y, nil, screen_line_starting_pos\nend\n\n-- Given an array of fragments, draw the subset starting from pos to screen\n-- starting from (x,y).\n-- Return:\n-- - whether we got to bottom of screen before end of line\n-- - the final (x,y)\n-- - the final pos\n-- - starting pos of the final screen line drawn\nfunction Text.draw_wrapping_line(State, line_index, x,y, startpos)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n--? print('== line', line_index, '^'..line.data..'$')\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":34,"ins":{"up_context":[{"change":8,"pos":88090}],"down_context":[{"change":8,"pos":88168}],"flag":"BLOCK","start":1169,"end":1214,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":88090},"to":{"change":8,"start":88090,"end":88168},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return y, screen_line_starting_pos"}],"del_contents":[{"Del":" return --[[screen filled]] true, x,y, pos, screen_line_starting_pos\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":59,"ins":{"up_context":[{"change":8,"pos":88326}],"down_context":[{"change":8,"pos":88395}],"flag":"BLOCK","start":1215,"end":1262,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":88326},"to":{"change":8,"start":88326,"end":88395},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if line_index == State.cursor1.line then"}],"del_contents":[{"Del":" if State.cursor1.pos and line_index == State.cursor1.line then\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":77,"ins":{"up_context":[{"change":8,"pos":89166}],"down_context":[{"change":8,"pos":91082}],"flag":"BLOCK","start":1263,"end":1448,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":89166},"to":{"change":8,"start":89166,"end":90188},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":90188},"to":{"change":8,"start":20953,"end":21138},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":21138},"to":{"change":8,"start":90188,"end":91082},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":90188},"to":{"change":8,"start":90188,"end":91082},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if Focus == 'edit' and not hide_cursor and State.search_term == nil then"},{"Add":" if line_index == State.cursor1.line and State.cursor1.pos == pos then"},{"Add":" Text.draw_cursor(State, x, y)"}],"del_contents":[{"Del":" return false, x,y, pos, screen_line_starting_pos\nend\n\nfunction Text.draw_wrapping_lineB(State, line_index, x,y, startpos)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n local screen_line_starting_pos = startpos\n Text.compute_fragmentsB(State, line_index, x)\n local pos = 1\n for _, f in ipairs(line_cache.fragmentsB) do\n local frag, frag_text = f.data, f.text\n local frag_len = utf8.len(frag)\n--? print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)\n if pos < startpos then\n -- render nothing\n--? print('skipping', frag)\n else\n -- render fragment\n local frag_width = App.width(frag_text)\n if x + frag_width > State.right then\n assert(x > State.left) -- no overfull lines\n y = y + State.line_height\n if y + State.line_height > App.screen.height then\n return --[[screen filled]] true, x,y, pos, screen_line_starting_pos\n end\n screen_line_starting_pos = pos\n x = State.left\n"},{"Del":" end\n if State.selection1.line then\n local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)\n Text.draw_highlight(State, line, x,y, pos, lo,hi)\n"},{"Del":" end\n App.screen.draw(frag_text, x,y)\n -- render cursor if necessary\n if State.cursor1.posB and line_index == State.cursor1.line then\n if pos <= State.cursor1.posB and pos + frag_len > State.cursor1.posB then\n if State.search_term then\n if State.lines[State.cursor1.line].dataB:sub(State.cursor1.posB, State.cursor1.posB+utf8.len(State.search_term)-1) == State.search_term then\n local lo_px = Text.draw_highlight(State, line, x,y, pos, State.cursor1.posB, State.cursor1.posB+utf8.len(State.search_term))\n App.color(Fold_color)\n love.graphics.print(State.search_term, x+lo_px,y)\n end\n elseif Focus == 'edit' then\n Text.draw_cursor(State, x+Text.x(frag, State.cursor1.posB-pos+1), y)\n App.color(Fold_color)\n end\n end\n end\n x = x + frag_width\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":81,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":91090},"to":{"change":8,"start":91090,"end":91115},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" pos = pos + frag_len\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":82,"ins":{"up_context":[{"change":8,"pos":91121}],"down_context":[{"change":8,"pos":91172}],"flag":"BLOCK","start":1449,"end":1486,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":91121},"to":{"change":8,"start":91121,"end":91172},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return y, screen_line_starting_pos"}],"del_contents":[{"Del":" return false, x,y, pos, screen_line_starting_pos\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":162,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":94299},"to":{"change":8,"start":94299,"end":94996},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":164,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":95027},"to":{"change":8,"start":95027,"end":95088},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" local frag_len = utf8.len(frag)\n pos = pos + frag_len\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":167,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":95099},"to":{"change":8,"start":95099,"end":97167},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":181,"ins":{"up_context":[{"change":8,"pos":97898}],"down_context":[{"change":8,"pos":98723}],"flag":"BLOCK","start":1487,"end":1852,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":97898},"to":{"change":8,"start":97898,"end":98723},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)"},{"Add":" 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)"},{"Add":" Text.clear_screen_line_cache(State, State.cursor1.line)"},{"Add":" State.cursor1.pos = State.cursor1.pos+1"}],"del_contents":[{"Del":" 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":219,"ins":{"up_context":[{"change":8,"pos":100157}],"down_context":[{"change":8,"pos":100213}],"flag":"BLOCK","start":1853,"end":1887,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":100157},"to":{"change":8,"start":100157,"end":100213},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if State.cursor1.pos > 1 then"}],"del_contents":[{"Del":" if State.cursor1.pos and State.cursor1.pos > 1 then\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":230,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":100865},"to":{"change":8,"start":100865,"end":101706},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":250,"ins":{"up_context":[{"change":8,"pos":102575}],"down_context":[{"change":8,"pos":102754}],"flag":"BLOCK","start":1888,"end":2025,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":102575},"to":{"change":8,"start":102575,"end":102754},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {"},{"Add":" line=State.cursor1.line,"},{"Add":" pos=Text.pos_at_start_of_screen_line(State, State.cursor1),"},{"Add":" }"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":267,"ins":{"up_context":[{"change":8,"pos":103137}],"down_context":[{"change":8,"pos":103239}],"flag":"BLOCK","start":2026,"end":2106,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":103137},"to":{"change":8,"start":103137,"end":103239},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then"}],"del_contents":[{"Del":" if State.cursor1.posB or State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":272,"ins":{"up_context":[{"change":8,"pos":103380}],"down_context":[{"change":8,"pos":103482}],"flag":"BLOCK","start":2107,"end":2187,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":103380},"to":{"change":8,"start":103380,"end":103482},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then"}],"del_contents":[{"Del":" if State.cursor1.pos and State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":282,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":104077},"to":{"change":8,"start":104077,"end":104898},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":287,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":4721},"to":{"change":8,"start":4721,"end":4848},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" -- delete side B on first line\n State.lines[State.cursor1.line].dataB = State.lines[State.cursor1.line+1].dataB\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":303,"ins":{"up_context":[{"change":8,"pos":21621}],"down_context":[{"change":8,"pos":21720}],"flag":"BLOCK","start":2188,"end":2262,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21621},"to":{"change":8,"start":21621,"end":21720},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":308,"ins":{"up_context":[{"change":8,"pos":21770}],"down_context":[{"change":8,"pos":21869}],"flag":"BLOCK","start":2263,"end":2337,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21770},"to":{"change":8,"start":21770,"end":21869},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":320,"ins":{"up_context":[{"change":8,"pos":21973}],"down_context":[{"change":8,"pos":22072}],"flag":"BLOCK","start":2338,"end":2412,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21973},"to":{"change":8,"start":21973,"end":22072},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":325,"ins":{"up_context":[{"change":8,"pos":22122}],"down_context":[{"change":8,"pos":22221}],"flag":"BLOCK","start":2413,"end":2487,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22122},"to":{"change":8,"start":22122,"end":22221},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":336,"ins":{"up_context":[{"change":8,"pos":22325}],"down_context":[{"change":8,"pos":22424}],"flag":"BLOCK","start":2488,"end":2562,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22325},"to":{"change":8,"start":22325,"end":22424},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":341,"ins":{"up_context":[{"change":8,"pos":22474}],"down_context":[{"change":8,"pos":22573}],"flag":"BLOCK","start":2563,"end":2637,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22474},"to":{"change":8,"start":22474,"end":22573},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":352,"ins":{"up_context":[{"change":8,"pos":22677}],"down_context":[{"change":8,"pos":22776}],"flag":"BLOCK","start":2638,"end":2712,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22677},"to":{"change":8,"start":22677,"end":22776},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":357,"ins":{"up_context":[{"change":8,"pos":22826}],"down_context":[{"change":8,"pos":22925}],"flag":"BLOCK","start":2713,"end":2787,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":22826},"to":{"change":8,"start":22826,"end":22925},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":368,"ins":{"up_context":[{"change":8,"pos":23029}],"down_context":[{"change":8,"pos":23128}],"flag":"BLOCK","start":2788,"end":2862,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":23029},"to":{"change":8,"start":23029,"end":23128},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":373,"ins":{"up_context":[{"change":8,"pos":23178}],"down_context":[{"change":8,"pos":23277}],"flag":"BLOCK","start":2863,"end":2937,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":23178},"to":{"change":8,"start":23178,"end":23277},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}"}],"del_contents":[{"Del":" State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":380,"ins":{"up_context":[{"change":8,"pos":106779}],"down_context":[{"change":8,"pos":107529}],"flag":"BLOCK","start":2938,"end":3440,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":106779},"to":{"change":8,"start":106779,"end":106965},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":106965},"to":{"change":8,"start":4859,"end":5039},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":5039},"to":{"change":8,"start":107132,"end":107529},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":107132},"to":{"change":8,"start":107132,"end":107529},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)"},{"Add":" table.insert(State.lines, State.cursor1.line+1, {mode='text', data=string.sub(State.lines[State.cursor1.line].data, byte_offset)})"},{"Add":" table.insert(State.line_cache, State.cursor1.line+1, {})"},{"Add":" State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_offset-1)"},{"Add":" Text.clear_screen_line_cache(State, State.cursor1.line)"},{"Add":" State.cursor1 = {line=State.cursor1.line+1, pos=1}"}],"del_contents":[{"Del":" 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":" 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":" 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":396,"ins":{"up_context":[{"change":8,"pos":107845}],"down_context":[{"change":8,"pos":5040}],"flag":"BLOCK","start":3441,"end":3522,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":107845},"to":{"change":8,"start":107845,"end":107952},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if State.screen_top1.line == 1 and State.screen_top1.pos == 1 then break end"}],"del_contents":[{"Del":" if State.screen_top1.line == 1 and State.screen_top1.pos and State.screen_top1.pos == 1 then break end\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":405,"ins":{"up_context":[{"change":8,"pos":108082}],"down_context":[{"change":8,"pos":108186}],"flag":"BLOCK","start":3523,"end":3598,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108082},"to":{"change":8,"start":108082,"end":108186},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}"}],"del_contents":[{"Del":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos, posB=State.screen_top1.posB}\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":413,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":108453}],"down_context":[{"change":8,"pos":108453}],"flag":"BLOCK","start":3599,"end":3762,"inode":{"change":8,"pos":83786}}},"contents":[{"Add":" -- If a line/paragraph gets to a page boundary, I often want to scroll"},{"Add":" -- before I get to the bottom."},{"Add":" -- However, only do this if it makes forward progress."}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":417,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":108506}],"down_context":[{"change":8,"pos":108506}],"flag":"BLOCK","start":3763,"end":3856,"inode":{"change":8,"pos":83786}}},"contents":[{"Add":" if bot2.screen_line > 1 then"},{"Add":" bot2.screen_line = math.max(bot2.screen_line-10, 1)"},{"Add":" end"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":424,"ins":{"up_context":[{"change":8,"pos":108635}],"down_context":[{"change":8,"pos":108722}],"flag":"BLOCK","start":3857,"end":3944,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108635},"to":{"change":8,"start":5320,"end":5439},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}"}],"del_contents":[{"Del":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos, posB=State.screen_bottom1.posB}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":427,"ins":{"up_context":[{"change":8,"pos":108805}],"down_context":[{"change":8,"pos":108909}],"flag":"BLOCK","start":3945,"end":4020,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":108805},"to":{"change":8,"start":108805,"end":108909},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}"}],"del_contents":[{"Del":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos, posB=State.screen_top1.posB}\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":436,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":5497},"to":{"change":8,"start":109190,"end":109301},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":109190},"to":{"change":8,"start":109190,"end":109301},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":469,"ins":{"up_context":[{"change":8,"pos":111230}],"down_context":[{"change":8,"pos":111378}],"flag":"BLOCK","start":4021,"end":4245,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":111230},"to":{"change":8,"start":111230,"end":111378},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {"},{"Add":" line=State.cursor1.line,"},{"Add":" pos=Text.pos_at_start_of_screen_line(State, State.cursor1),"},{"Add":" }"},{"Add":" Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks"}],"del_contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":477,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":111389},"to":{"change":8,"start":111389,"end":111691},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":111691},"to":{"change":8,"start":6570,"end":6750},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":6750},"to":{"change":2,"start":2317,"end":2374},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":2374},"to":{"change":8,"start":6812,"end":7469},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":6812},"to":{"change":8,"start":6812,"end":7469},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":7469},"to":{"change":8,"start":112426,"end":114873},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":112426},"to":{"change":8,"start":112426,"end":114873},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function 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":" 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"},{"Del":" State.cursor1 = {line=new_cursor_line, posB=nil}\n"},{"Del":" 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":" 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":501,"ins":{"up_context":[{"change":8,"pos":115806}],"down_context":[{"change":8,"pos":115896}],"flag":"BLOCK","start":4246,"end":4302,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":115806},"to":{"change":8,"start":115806,"end":115896},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" else"},{"Add":" -- move down one screen line in current line"}],"del_contents":[{"Del":" elseif State.cursor1.pos then\n -- move down one screen line (A side) in current line\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":518,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":117112},"to":{"change":8,"start":117112,"end":118238},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":523,"ins":{"up_context":[{"change":8,"pos":118441}],"down_context":[{"change":8,"pos":118535}],"flag":"BLOCK","start":4303,"end":4327,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118441},"to":{"change":8,"start":118441,"end":118535},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.cursor1.pos = 1"}],"del_contents":[{"Del":" if State.cursor1.pos then\n State.cursor1.pos = 1\n else\n State.cursor1.posB = 1\n end\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":525,"ins":{"up_context":[{"change":8,"pos":118588}],"down_context":[{"change":8,"pos":118654}],"flag":"BLOCK","start":4328,"end":4410,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118588},"to":{"change":8,"start":7955,"end":8062},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos} -- copy"}],"del_contents":[{"Del":" State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB} -- copy\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":530,"ins":{"up_context":[{"change":8,"pos":118698}],"down_context":[{"change":8,"pos":118891}],"flag":"BLOCK","start":4411,"end":4484,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":118698},"to":{"change":8,"start":118698,"end":118891},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.cursor1.pos = utf8.len(State.lines[State.cursor1.line].data) + 1"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":537,"ins":{"up_context":[{"change":8,"pos":119024}],"down_context":[{"change":8,"pos":119857}],"flag":"BLOCK","start":4485,"end":4511,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":119024},"to":{"change":8,"start":119024,"end":119857},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" -- skip some whitespace"}],"del_contents":[{"Del":" -- 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":547,"ins":{"up_context":[{"change":8,"pos":120063}],"down_context":[{"change":8,"pos":120111}],"flag":"BLOCK","start":4512,"end":4542,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120063},"to":{"change":8,"start":120063,"end":120111},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" -- skip some non-whitespace"}],"del_contents":[{"Del":"end\n\nfunction Text.skip_whitespace_leftB(State)\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":549,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120127},"to":{"change":8,"start":120127,"end":120293},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":550,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120314},"to":{"change":8,"start":120314,"end":120388},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" end\nend\n\nfunction Text.skip_non_whitespace_leftA(State)\n while true do\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":555,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120565},"to":{"change":8,"start":120565,"end":120861},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":557,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120881},"to":{"change":8,"start":120881,"end":120902},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" Text.left(State)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":560,"ins":{"up_context":[{"change":8,"pos":120913}],"down_context":[{"change":8,"pos":121303}],"flag":"BLOCK","start":4543,"end":4601,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":120913},"to":{"change":8,"start":120913,"end":121303},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"function Text.word_right(State)"},{"Add":" -- skip some whitespace"}],"del_contents":[{"Del":"function 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":571,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":121567},"to":{"change":8,"start":121567,"end":121616},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"end\n\nfunction Text.skip_whitespace_rightB(State)\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":572,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":121632},"to":{"change":8,"start":121632,"end":121841},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":573,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":121878},"to":{"change":8,"start":121878,"end":121953},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" end\nend\n\nfunction Text.skip_non_whitespace_rightA(State)\n while true do\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":579,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":122158},"to":{"change":8,"start":122158,"end":122195},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" Text.right_without_scroll(State)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":580,"ins":{"up_context":[{"change":8,"pos":122201}],"down_context":[{"change":8,"pos":122516}],"flag":"BLOCK","start":4602,"end":4693,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":122201},"to":{"change":8,"start":122201,"end":122516},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if Text.cursor_out_of_screen(State) then"},{"Add":" Text.snap_cursor_to_bottom_of_screen(State)"}],"del_contents":[{"Del":"end\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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":595,"ins":{"up_context":[{"change":8,"pos":122810}],"down_context":[{"change":8,"pos":122927}],"flag":"BLOCK","start":4694,"end":4751,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":122810},"to":{"change":8,"start":122810,"end":122927},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}],"del_contents":[{"Del":" if State.cursor1.pos then\n Text.leftA(State)\n else\n Text.leftB(State)\n end\nend\n\nfunction Text.leftA(State)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":612,"ins":{"up_context":[{"change":8,"pos":123228}],"down_context":[{"change":8,"pos":123376}],"flag":"BLOCK","start":4752,"end":4976,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":123228},"to":{"change":8,"start":123228,"end":123376},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.screen_top1 = {"},{"Add":" line=State.cursor1.line,"},{"Add":" pos=Text.pos_at_start_of_screen_line(State, State.cursor1),"},{"Add":" }"},{"Add":" Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks"}],"del_contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":620,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":123387},"to":{"change":8,"start":123387,"end":123855},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function 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\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":629,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":8475},"to":{"change":8,"start":124061,"end":124226},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":124061},"to":{"change":8,"start":124061,"end":124226},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":643,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":124465},"to":{"change":8,"start":124465,"end":124634},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":124634},"to":{"change":8,"start":8764,"end":8771},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":8771},"to":{"change":8,"start":124685,"end":124718},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":124685},"to":{"change":8,"start":124685,"end":124718},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":124718},"to":{"change":8,"start":8772,"end":9052},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":9052},"to":{"change":8,"start":124773,"end":124784},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":124773},"to":{"change":8,"start":124773,"end":124784},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function 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":" else\n"},{"Del":" -- overflow back into A side\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":" end\nend\n\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":650,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":125105},"to":{"change":8,"start":125105,"end":125649},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":657,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":125801},"to":{"change":8,"start":125801,"end":125848},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" local line = State.lines[State.cursor1.line]\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":659,"ins":{"up_context":[{"change":8,"pos":125993}],"down_context":[{"change":8,"pos":126685}],"flag":"BLOCK","start":4977,"end":5035,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":125993},"to":{"change":8,"start":125993,"end":126685},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return screen_lines[#screen_lines] <= State.cursor1.pos"}],"del_contents":[{"Del":" 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":687,"ins":{"up_context":[{"change":8,"pos":127017}],"down_context":[{"change":8,"pos":127096}],"flag":"BLOCK","start":5036,"end":5095,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127017},"to":{"change":8,"start":127017,"end":127096},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"--? print('to2:', State.cursor1.line, State.cursor1.pos)"}],"del_contents":[{"Del":"--? print('to2:', State.cursor1.line, State.cursor1.pos, State.cursor1.posB)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":689,"ins":{"up_context":[{"change":8,"pos":127142}],"down_context":[{"change":8,"pos":127248}],"flag":"BLOCK","start":5096,"end":5165,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127142},"to":{"change":8,"start":127142,"end":127248},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"--? print('to2: =>', top2.line, top2.screen_line, top2.screen_pos)"}],"del_contents":[{"Del":"--? print('to2: =>', top2.line, top2.screen_line, top2.screen_pos, top2.screen_lineB, top2.screen_posB)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":691,"ins":{"up_context":[{"change":8,"pos":127283}],"down_context":[{"change":8,"pos":127630}],"flag":"BLOCK","start":5166,"end":5372,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127283},"to":{"change":8,"start":127283,"end":127630},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" top2.screen_pos = 1 -- start of screen line"},{"Add":"--? print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":697,"ins":{"up_context":[{"change":8,"pos":127858}],"down_context":[{"change":8,"pos":127996}],"flag":"BLOCK","start":5373,"end":5445,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":127858},"to":{"change":8,"start":127858,"end":127996},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"--? print(y, 'top2:', top2.line, top2.screen_line, top2.screen_pos)"}],"del_contents":[{"Del":"--? print(y, 'top2:', State.lines[top2.line].data, top2.line, top2.screen_line, top2.screen_pos, top2.screen_lineB, top2.screen_posB)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":722,"ins":{"up_context":[{"change":8,"pos":128406}],"down_context":[{"change":8,"pos":128639}],"flag":"BLOCK","start":5446,"end":5608,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":128406},"to":{"change":8,"start":128406,"end":128639},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"--? print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)"}],"del_contents":[{"Del":"--? 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":731,"ins":{"up_context":[{"change":8,"pos":129011}],"down_context":[{"change":8,"pos":130281}],"flag":"BLOCK","start":5609,"end":5846,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":129011},"to":{"change":8,"start":129011,"end":130281},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" Text.populate_screen_line_starting_pos(State, line_index)"},{"Add":" return y < line_cache.starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)"}],"del_contents":[{"Del":" local num_screen_lines = 0\n if line_cache.startpos then\n Text.populate_screen_line_starting_pos(State, line_index)\n num_screen_lines = num_screen_lines + #line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1\n end\n--? print('#screenlines after A', num_screen_lines)\n if line.dataB and (State.expanded or line.expanded) then\n local x = Margin_left + Text.screen_line_width(State, line_index, #line_cache.screen_line_starting_pos) + AB_padding\n Text.populate_screen_line_starting_posB(State, line_index, x)\n--? print('B:', x, #line_cache.screen_line_starting_posB)\n if line_cache.startposB then\n num_screen_lines = num_screen_lines + #line_cache.screen_line_starting_posB - Text.screen_line_indexB(line_cache.screen_line_starting_posB, line_cache.startposB) -- no +1; first screen line of B side overlaps with A side\n else\n num_screen_lines = num_screen_lines + #line_cache.screen_line_starting_posB - Text.screen_line_indexB(line_cache.screen_line_starting_posB, 1) -- no +1; first screen line of B side overlaps with A side\n end\n end\n--? print('#screenlines after B', num_screen_lines)\n return y < line_cache.starty + State.line_height*num_screen_lines\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":736,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":130337},"to":{"change":8,"start":130337,"end":130803},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"-- returns: pos, posB\n-- scenarios:\n-- line without B side\n-- line with B side collapsed\n-- line with B side expanded\n-- line starting rendering in A side (startpos ~= nil)\n-- line starting rendering in B side (startposB ~= nil)\n-- my on final screen line of A side\n-- mx to right of A side with no B side\n-- mx to right of A side but left of B side\n-- mx to right of B side\n-- preconditions:\n-- startpos xor startposB\n-- expanded -> dataB\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":742,"ins":{"up_context":[{"change":8,"pos":131053}],"down_context":[{"change":8,"pos":134381}],"flag":"BLOCK","start":5847,"end":6365,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":131053},"to":{"change":8,"start":131053,"end":134381},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" local start_screen_line_index = Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos)"},{"Add":" for screen_line_index = start_screen_line_index,#line_cache.screen_line_starting_pos do"},{"Add":" local screen_line_starting_pos = line_cache.screen_line_starting_pos[screen_line_index]"},{"Add":" local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)"},{"Add":"--? print('iter', y, screen_line_index, screen_line_starting_pos, string.sub(line.data, screen_line_starting_byte_offset))"}],"del_contents":[{"Del":"--? print('click', line_index, my, 'with line starting at', y, #line_cache.screen_line_starting_pos) -- , #line_cache.screen_line_starting_posB)\n if line_cache.startpos then\n local start_screen_line_index = Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos)\n for screen_line_index = start_screen_line_index,#line_cache.screen_line_starting_pos do\n local screen_line_starting_pos = line_cache.screen_line_starting_pos[screen_line_index]\n local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)\n--? print('iter', y, screen_line_index, screen_line_starting_pos, string.sub(line.data, screen_line_starting_byte_offset))\n local nexty = y + State.line_height\n if my < nexty then\n -- On all wrapped screen lines but the final one, clicks past end of\n -- line position cursor on final character of screen line.\n -- (The final screen line positions past end of screen line as always.)\n if screen_line_index < #line_cache.screen_line_starting_pos and mx > State.left + Text.screen_line_width(State, line_index, screen_line_index) then\n--? print('past end of non-final line; return')\n return line_cache.screen_line_starting_pos[screen_line_index+1]-1\n end\n local s = string.sub(line.data, screen_line_starting_byte_offset)\n--? print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1)\n local screen_line_posA = Text.nearest_cursor_pos(s, mx, State.left)\n if line.dataB == nil then\n -- no B side\n return screen_line_starting_pos + screen_line_posA - 1\n end\n if not State.expanded and not line.expanded then\n -- B side is not expanded\n return screen_line_starting_pos + screen_line_posA - 1\n end\n local lenA = utf8.len(s)\n if screen_line_posA < lenA then\n -- mx is within A side\n return screen_line_starting_pos + screen_line_posA - 1\n end\n local max_xA = State.left+Text.x(s, lenA+1)\n if mx < max_xA + AB_padding then\n -- mx is in the space between A and B side\n return screen_line_starting_pos + screen_line_posA - 1\n end\n mx = mx - max_xA - AB_padding\n local screen_line_posB = Text.nearest_cursor_pos(line.dataB, mx, --[[no left margin]] 0)\n return nil, screen_line_posB\n end\n y = nexty\n end\n end\n -- look in screen lines composed entirely of the B side\n assert(State.expanded or line.expanded)\n local start_screen_line_indexB\n if line_cache.startposB then\n start_screen_line_indexB = Text.screen_line_indexB(line_cache.screen_line_starting_posB, line_cache.startposB)\n else\n start_screen_line_indexB = 2 -- skip the first line of side B, which we checked above\n end\n for screen_line_indexB = start_screen_line_indexB,#line_cache.screen_line_starting_posB do\n local screen_line_starting_posB = line_cache.screen_line_starting_posB[screen_line_indexB]\n local screen_line_starting_byte_offsetB = Text.offset(line.dataB, screen_line_starting_posB)\n--? print('iter2', y, screen_line_indexB, screen_line_starting_posB, string.sub(line.dataB, screen_line_starting_byte_offsetB))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":752,"ins":{"up_context":[{"change":8,"pos":134662}],"down_context":[{"change":8,"pos":134922}],"flag":"BLOCK","start":6366,"end":6520,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":134662},"to":{"change":8,"start":134662,"end":134922},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if screen_line_index < #line_cache.screen_line_starting_pos and mx > State.left + Text.screen_line_width(State, line_index, screen_line_index) then"}],"del_contents":[{"Del":"--? print('aa', mx, State.left, Text.screen_line_widthB(State, line_index, screen_line_indexB))\n if screen_line_indexB < #line_cache.screen_line_starting_posB and mx > State.left + Text.screen_line_widthB(State, line_index, screen_line_indexB) then\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":754,"ins":{"up_context":[{"change":8,"pos":134978}],"down_context":[{"change":8,"pos":135059}],"flag":"BLOCK","start":6521,"end":6595,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":134978},"to":{"change":8,"start":134978,"end":135059},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return line_cache.screen_line_starting_pos[screen_line_index+1]-1"}],"del_contents":[{"Del":" return nil, line_cache.screen_line_starting_posB[screen_line_indexB+1]-1\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":756,"ins":{"up_context":[{"change":8,"pos":135069}],"down_context":[{"change":8,"pos":135392}],"flag":"BLOCK","start":6596,"end":6910,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":135069},"to":{"change":8,"start":135069,"end":135392},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" local s = string.sub(line.data, screen_line_starting_byte_offset)"},{"Add":"--? print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1)"},{"Add":" return screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1"}],"del_contents":[{"Del":" local s = string.sub(line.dataB, screen_line_starting_byte_offsetB)\n--? print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_posB + Text.nearest_cursor_pos(s, mx, State.left) - 1)\n return nil, screen_line_starting_posB + Text.nearest_cursor_pos(s, mx, State.left) - 1\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":782,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":136158},"to":{"change":8,"start":136158,"end":137142},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function Text.screen_line_widthB(State, line_index, i)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n local start_posB = line_cache.screen_line_starting_posB[i]\n local start_offsetB = Text.offset(line.dataB, start_posB)\n local screen_line\n if i < #line_cache.screen_line_starting_posB then\n--? print('non-final', i)\n local past_end_posB = line_cache.screen_line_starting_posB[i+1]\n local past_end_offsetB = Text.offset(line.dataB, past_end_posB)\n--? print('between', start_offsetB, past_end_offsetB)\n screen_line = string.sub(line.dataB, start_offsetB, past_end_offsetB-1)\n else\n--? print('final', i)\n--? print('after', start_offsetB)\n screen_line = string.sub(line.dataB, start_offsetB)\n end\n local screen_line_text = App.newText(love.graphics.getFont(), screen_line)\n--? local result = App.width(screen_line_text)\n--? print('=>', result)\n--? return result\n return App.width(screen_line_text)\nend\n\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":790,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":137330},"to":{"change":8,"start":137330,"end":137601},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function Text.screen_line_indexB(screen_line_starting_posB, posB)\n if posB == nil then\n return 0\n end\n assert(screen_line_starting_posB)\n for i = #screen_line_starting_posB,1,-1 do\n if screen_line_starting_posB[i] <= posB then\n return i\n end\n end\nend\n\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":881,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":10486},"to":{"change":8,"start":10486,"end":10492},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":10492},"to":{"change":8,"start":139954,"end":140048},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":139954},"to":{"change":8,"start":139954,"end":140048},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" end\n"},{"Del":" if loc1.pos then\n return Text.to2A(State, loc1)\n else\n return Text.to2B(State, loc1)\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":882,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":140054},"to":{"change":8,"start":140054,"end":140091},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"end\n\nfunction Text.to2A(State, loc1)\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":894,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":140500},"to":{"change":8,"start":140500,"end":141153},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":898,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":141205},"to":{"change":8,"start":141205,"end":141349},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":905,"ins":{"up_context":[{"change":8,"pos":141572}],"down_context":[{"change":8,"pos":141829}],"flag":"BLOCK","start":6911,"end":6980,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":141572},"to":{"change":8,"start":141572,"end":141829},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"function Text.eq1(a, b)"},{"Add":" return a.line == b.line and a.pos == b.pos"}],"del_contents":[{"Del":"function 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":916,"ins":{"up_context":[{"change":8,"pos":141955}],"down_context":[{"change":8,"pos":142006}],"flag":"BLOCK","start":6981,"end":7059,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":141955},"to":{"change":8,"start":141955,"end":142006},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return a.pos < b.pos"},{"Add":"end"},{"Add":""},{"Add":"function Text.le1(a, b)"},{"Add":" if a.line < b.line then"}],"del_contents":[{"Del":" -- A side < B side\n if a.pos and not b.pos then\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":923,"ins":{"up_context":[{"change":8,"pos":142028}],"down_context":[{"change":8,"pos":142058}],"flag":"BLOCK","start":7060,"end":7086,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142028},"to":{"change":8,"start":142028,"end":142058},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" if a.line > b.line then"}],"del_contents":[{"Del":" if not a.pos and b.pos then\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":926,"ins":{"up_context":[{"change":8,"pos":142081}],"down_context":[{"change":8,"pos":142162}],"flag":"BLOCK","start":7087,"end":7111,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142081},"to":{"change":8,"start":142081,"end":142162},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return a.pos <= b.pos"}],"del_contents":[{"Del":" if a.pos then\n return a.pos < b.pos\n else\n return a.posB < b.posB\n end\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":929,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142167},"to":{"change":8,"start":142167,"end":142232},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function Text.le1(a, b)\n return eq(a, b) or Text.lt1(a, b)\nend\n\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":940,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142472},"to":{"change":8,"start":142472,"end":142667},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":944,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":142855}],"down_context":[{"change":8,"pos":142855}],"flag":"BLOCK","start":7112,"end":7228,"inode":{"change":8,"pos":83786}}},"contents":[{"Add":" elseif State.lines[loc2.line-1].mode == 'drawing' then"},{"Add":" return {line=loc2.line-1, screen_line=1, screen_pos=1}"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":947,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":142862}],"down_context":[{"change":8,"pos":142862}],"flag":"BLOCK","start":7229,"end":7268,"inode":{"change":8,"pos":83786}}},"contents":[{"Add":" local l = State.lines[loc2.line-1]"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":949,"ins":{"up_context":[{"change":8,"pos":142925}],"down_context":[{"change":8,"pos":144268}],"flag":"BLOCK","start":7269,"end":7382,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142925},"to":{"change":8,"start":142925,"end":144268},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" return {line=loc2.line-1, screen_line=#State.line_cache[loc2.line-1].screen_line_starting_pos, screen_pos=1}"}],"del_contents":[{"Del":" if State.lines[loc2.line-1].dataB == nil or\n (not State.expanded and not State.lines[loc2.line-1].expanded) then\n--? print('c1', loc2.line-1, State.lines[loc2.line-1].data, '==', State.lines[loc2.line-1].dataB, State.line_cache[loc2.line-1].fragmentsB)\n return {line=loc2.line-1, screen_line=#State.line_cache[loc2.line-1].screen_line_starting_pos, screen_pos=1}\n end\n -- try to switch to B\n local prev_line_cache = State.line_cache[loc2.line-1]\n local x = Margin_left + Text.screen_line_width(State, loc2.line-1, #prev_line_cache.screen_line_starting_pos) + AB_padding\n Text.populate_screen_line_starting_posB(State, loc2.line-1, x)\n local screen_line_starting_posB = State.line_cache[loc2.line-1].screen_line_starting_posB\n--? print('c', loc2.line-1, State.lines[loc2.line-1].data, '==', State.lines[loc2.line-1].dataB, '==', #screen_line_starting_posB, 'starting from x', x)\n if #screen_line_starting_posB > 1 then\n--? print('c2')\n return {line=loc2.line-1, screen_lineB=#State.line_cache[loc2.line-1].screen_line_starting_posB, screen_posB=1}\n else\n--? print('c3')\n -- if there's only one screen line, assume it overlaps with A, so remain in A\n return {line=loc2.line-1, screen_line=#State.line_cache[loc2.line-1].screen_line_starting_pos, screen_pos=1}\n end\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":953,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":144279},"to":{"change":8,"start":144279,"end":144721},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":"function Text.previous_screen_lineB(State, loc2)\n if loc2.screen_lineB > 2 then -- first screen line of B side overlaps with A side\n return {line=loc2.line, screen_lineB=loc2.screen_lineB-1, screen_posB=1}\n else\n -- switch to A side\n -- TODO: handle case where fold lands precisely at end of a new screen-line\n return {line=loc2.line, screen_line=#State.line_cache[loc2.line].screen_line_starting_pos, screen_pos=1}\n end\nend\n\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":982,"ins":{"up_context":[{"change":8,"pos":145860}],"down_context":[{"change":8,"pos":146048}],"flag":"BLOCK","start":7383,"end":7562,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":145860},"to":{"change":8,"start":145860,"end":146048},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":" State.cursor1 = {"},{"Add":" line=State.screen_bottom1.line,"},{"Add":" pos=Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, App.screen.height-5),"},{"Add":" }"}],"del_contents":[{"Del":" local pos,posB = Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, App.screen.height-5)\n State.cursor1 = {line=State.screen_bottom1.line, pos=pos, posB=posB}\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":1022,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":146778},"to":{"change":8,"start":146778,"end":146826},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" State.line_cache[line_index].fragmentsB = nil\n"}]}},{"Edit":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":1023,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":146888},"to":{"change":8,"start":146888,"end":146951},"introduced_by":8}],"inode":{"change":8,"pos":83786}}},"contents":[{"Del":" State.line_cache[line_index].screen_line_starting_posB = nil\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":1037,"ins":{"up_context":[{"change":8,"pos":1068}],"down_context":[{"change":8,"pos":1149}],"flag":"BLOCK","start":7563,"end":7751,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1068},"to":{"change":8,"start":1068,"end":1149},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"function starts_with(s, prefix)"},{"Add":" if #s < #prefix then"},{"Add":" return false"},{"Add":" end"},{"Add":" for i=1,#prefix do"},{"Add":" if s:sub(i,i) ~= prefix:sub(i,i) then"},{"Add":" return false"},{"Add":" end"},{"Add":" end"},{"Add":" return true"}],"del_contents":[{"Del":"function starts_with(s, sub)\n return s:find(sub, 1, --[[no escapes]] true) == 1\n"}]}},{"Replacement":{"inode":{"change":8,"pos":83786},"path":"source_text.lua","line":1049,"ins":{"up_context":[{"change":8,"pos":1154}],"down_context":[{"change":8,"pos":147120}],"flag":"BLOCK","start":7752,"end":7962,"inode":{"change":8,"pos":83786}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1154},"to":{"change":8,"start":1154,"end":1253},"introduced_by":8}],"inode":{"change":8,"pos":83786}},"ins_contents":[{"Add":"function ends_with(s, suffix)"},{"Add":" if #s < #suffix then"},{"Add":" return false"},{"Add":" end"},{"Add":" for i=0,#suffix-1 do"},{"Add":" if s:sub(#s-i,#s-i) ~= suffix:sub(#suffix-i,#suffix-i) then"},{"Add":" return false"},{"Add":" end"},{"Add":" end"},{"Add":" return true"}],"del_contents":[{"Del":"function ends_with(s, sub)\n return s:reverse():find(sub:reverse(), 1, --[[no escapes]] true) == 1\n"}]}},{"Edit":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":13,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":16742},"to":{"change":8,"start":152736,"end":152809},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":152736},"to":{"change":8,"start":152736,"end":152809},"introduced_by":8}],"inode":{"change":8,"pos":152503}}},"contents":[{"Del":"Fold_color = {r=0, g=0.6, b=0}\nFold_background_color = {r=0, g=0.7, b=0}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":29,"ins":{"up_context":[{"change":8,"pos":153050}],"down_context":[{"change":8,"pos":17080}],"flag":"BLOCK","start":7967,"end":8040,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":153050},"to":{"change":8,"start":16957,"end":17080},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" -- a line is either text or a drawing"},{"Add":" -- a text is a table with:"}],"del_contents":[{"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"}]}},{"Edit":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":33,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":17128},"to":{"change":8,"start":17128,"end":17195},"introduced_by":8}],"inode":{"change":8,"pos":152503}}},"contents":[{"Del":" -- string dataB,\n -- expanded: whether to show B side\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":49,"ins":{"up_context":[{"change":8,"pos":18044}],"down_context":[{"change":8,"pos":153260}],"flag":"BLOCK","start":8041,"end":8098,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":18044},"to":{"change":8,"start":18044,"end":18126},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" lines = {{mode='text', data=''}}, -- array of lines"}],"del_contents":[{"Del":" lines = {{mode='text', data='', dataB=nil, expanded=nil}}, -- array of lines\n"}]}},{"Edit":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":64,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":154198},"to":{"change":8,"start":154198,"end":154279},"introduced_by":8}],"inode":{"change":8,"pos":152503}}},"contents":[{"Del":" -- Positions (and screen line indexes) can be in either the A or the B side.\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":70,"ins":{"up_context":[{"change":8,"pos":154525}],"down_context":[{"change":8,"pos":23290}],"flag":"BLOCK","start":8099,"end":8337,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":154525},"to":{"change":8,"start":154525,"end":154793},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" screen_top1 = {line=1, pos=1}, -- position of start of screen line at top of screen"},{"Add":" cursor1 = {line=1, pos=1}, -- position of cursor"},{"Add":" screen_bottom1 = {line=1, pos=1}, -- position of start of screen line at bottom of screen"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":94,"ins":{"up_context":[{"change":8,"pos":155033}],"down_context":[{"change":8,"pos":155069}],"flag":"BLOCK","start":8338,"end":8398,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":155033},"to":{"change":8,"start":155033,"end":155069},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" left = math.floor(left),"},{"Add":" right = math.floor(right),"}],"del_contents":[{"Del":" left = left,\n right = right,\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":152,"ins":{"up_context":[{"change":8,"pos":155593}],"down_context":[{"change":8,"pos":155733}],"flag":"BLOCK","start":8399,"end":8495,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":155593},"to":{"change":8,"start":155593,"end":155733},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)"}],"del_contents":[{"Del":" print(State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.cursor1.posB)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":161,"ins":{"up_context":[{"change":8,"pos":155947}],"down_context":[{"change":8,"pos":155991}],"flag":"BLOCK","start":8496,"end":8540,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":155947},"to":{"change":8,"start":18439,"end":18494},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":"--? print('draw:', y, line_index, line)"}],"del_contents":[{"Del":"--? print('draw:', y, line_index, line, line.mode)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":163,"ins":{"up_context":[{"change":8,"pos":156055}],"down_context":[{"change":8,"pos":18495}],"flag":"BLOCK","start":8541,"end":8595,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":156055},"to":{"change":8,"start":156055,"end":156119},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" State.screen_bottom1 = {line=line_index, pos=nil}"}],"del_contents":[{"Del":" State.screen_bottom1 = {line=line_index, pos=nil, posB=nil}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":165,"ins":{"up_context":[{"change":8,"pos":18527}],"down_context":[{"change":8,"pos":18569}],"flag":"BLOCK","start":8596,"end":8665,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":18527},"to":{"change":8,"start":156119,"end":156161},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":156119},"to":{"change":8,"start":156119,"end":156161},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":156161},"to":{"change":8,"start":18528,"end":18569},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":"--? print('text.draw', y, line_index)"},{"Add":" local startpos = 1"}],"del_contents":[{"Del":"--? print('text.draw', y, line_index)\n"},{"Del":" local startpos, startposB = 1, nil\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":168,"ins":{"up_context":[{"change":8,"pos":18620}],"down_context":[{"change":8,"pos":18786}],"flag":"BLOCK","start":8666,"end":8707,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":18620},"to":{"change":8,"start":18620,"end":18786},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" startpos = State.screen_top1.pos"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":186,"ins":{"up_context":[{"change":8,"pos":156405}],"down_context":[{"change":8,"pos":19763}],"flag":"BLOCK","start":8708,"end":8799,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":156405},"to":{"change":8,"start":239,"end":368},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)"}],"del_contents":[{"Del":" y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB, hide_cursor)\n"}]}},{"Edit":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":221,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":157110}],"down_context":[{"change":8,"pos":157110}],"flag":"BLOCK","start":8800,"end":8887,"inode":{"change":8,"pos":152503}}},"contents":[{"Add":" -- give some time for the OS to flush everything to disk"},{"Add":" love.timer.sleep(0.1)"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":228,"ins":{"up_context":[{"change":8,"pos":157214}],"down_context":[{"change":8,"pos":157280}],"flag":"BLOCK","start":8888,"end":8954,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":157214},"to":{"change":8,"start":20091,"end":20112},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":"--? print('press', State.selection1.line, State.selection1.pos)"}],"del_contents":[{"Del":"--? print('press')\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":249,"ins":{"up_context":[{"change":8,"pos":24234}],"down_context":[{"change":8,"pos":20393}],"flag":"BLOCK","start":8955,"end":9161,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":24234},"to":{"change":8,"start":20196,"end":20331},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":20196},"to":{"change":8,"start":20196,"end":20331},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":20331},"to":{"change":8,"start":24235,"end":24399},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" State.selection1 = {"},{"Add":" line=line_index,"},{"Add":" pos=Text.to_pos_on_line(State, line_index, x, y),"},{"Add":" }"},{"Add":"--? print('selection', State.selection1.line, State.selection1.pos)"}],"del_contents":[{"Del":" local pos,posB = Text.to_pos_on_line(State, line_index, x, y)\n --? print(x,y, 'setting cursor:', line_index, pos, posB)\n"},{"Del":" State.selection1 = {line=line_index, pos=pos, posB=posB}\n--? print('selection', State.selection1.line, State.selection1.pos, State.selection1.posB)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":284,"ins":{"up_context":[{"change":8,"pos":24583}],"down_context":[{"change":8,"pos":24808}],"flag":"BLOCK","start":9162,"end":9366,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":24583},"to":{"change":8,"start":24583,"end":24808},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" State.cursor1 = {"},{"Add":" line=line_index,"},{"Add":" pos=Text.to_pos_on_line(State, line_index, x, y),"},{"Add":" }"},{"Add":"--? print('cursor', State.cursor1.line, State.cursor1.pos)"}],"del_contents":[{"Del":" local pos,posB = Text.to_pos_on_line(State, line_index, x, y)\n State.cursor1 = {line=line_index, pos=pos, posB=posB}\n--? print('cursor', State.cursor1.line, State.cursor1.pos, State.cursor1.posB)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":357,"ins":{"up_context":[{"change":8,"pos":158969}],"down_context":[{"change":8,"pos":159120}],"flag":"BLOCK","start":9367,"end":9413,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":158969},"to":{"change":8,"start":158969,"end":159120},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" State.cursor1.pos = State.cursor1.pos+1"}],"del_contents":[{"Del":" 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"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":366,"ins":{"up_context":[{"change":8,"pos":159317}],"down_context":[{"change":8,"pos":159509}],"flag":"BLOCK","start":9414,"end":9552,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159317},"to":{"change":8,"start":159317,"end":159509},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" cursor={line=State.cursor1.line, pos=State.cursor1.pos},"},{"Add":" screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},"}],"del_contents":[{"Del":" 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"}]}},{"Edit":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":370,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159552},"to":{"change":8,"start":159552,"end":159569},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159569},"to":{"change":8,"start":25858,"end":25887},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":25887},"to":{"change":8,"start":159598,"end":159838},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159598},"to":{"change":8,"start":159598,"end":159838},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159838},"to":{"change":8,"start":25888,"end":25917},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":21581},"to":{"change":8,"start":159867,"end":160455},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":25917},"to":{"change":8,"start":159867,"end":160455},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":159867},"to":{"change":8,"start":159867,"end":160455},"introduced_by":8}],"inode":{"change":8,"pos":152503}}},"contents":[{"Del":" -- bifold text\n"},{"Del":" elseif chord == 'M-b' then\n"},{"Del":" 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":" elseif chord == 'M-d' then\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"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":375,"ins":{"up_context":[{"change":8,"pos":160608}],"down_context":[{"change":8,"pos":160693}],"flag":"BLOCK","start":9553,"end":9684,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":160608},"to":{"change":8,"start":160608,"end":160693},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" if State.font_height > 2 then"},{"Add":" edit.update_font_settings(State, State.font_height-2)"},{"Add":" Text.redraw_all(State)"},{"Add":" end"}],"del_contents":[{"Del":" edit.update_font_settings(State, State.font_height-2)\n Text.redraw_all(State)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":417,"ins":{"up_context":[{"change":8,"pos":233}],"down_context":[{"change":8,"pos":161892}],"flag":"BLOCK","start":9685,"end":9773,"inode":{"change":8,"pos":152503}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":233},"to":{"change":8,"start":233,"end":331},"introduced_by":8}],"inode":{"change":8,"pos":152503}},"ins_contents":[{"Add":" State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1}"}],"del_contents":[{"Del":" State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1, posB=nil}\n"}]}},{"Edit":{"inode":{"change":8,"pos":152503},"path":"source_edit.lua","line":492,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":163349},"to":{"change":8,"start":163349,"end":163912},"introduced_by":8}],"inode":{"change":8,"pos":152503}}},"contents":[{"Del":"function 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\n"}]}},{"Replacement":{"inode":{"change":8,"pos":165829},"path":"source.lua","line":78,"ins":{"up_context":[{"change":8,"pos":167384}],"down_context":[{"change":8,"pos":167435}],"flag":"BLOCK","start":9775,"end":9809,"inode":{"change":8,"pos":165829}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":167384},"to":{"change":8,"start":167384,"end":167435},"introduced_by":8}],"inode":{"change":8,"pos":165829}},"ins_contents":[{"Add":"-- environment for a mutable file"}],"del_contents":[{"Del":"-- environment for a mutable file of bifolded text\n"}]}},{"Edit":{"inode":{"change":8,"pos":165829},"path":"source.lua","line":92,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":167957},"to":{"change":8,"start":167957,"end":168116},"introduced_by":8}],"inode":{"change":8,"pos":165829}}},"contents":[{"Del":" -- We currently start out with side B collapsed.\n -- Other options:\n -- * save all expanded state by line\n -- * expand all if any location is in side B\n"}]}},{"Edit":{"inode":{"change":8,"pos":165829},"path":"source.lua","line":98,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":168338},"to":{"change":8,"start":168338,"end":168394},"introduced_by":8}],"inode":{"change":8,"pos":165829}}},"contents":[{"Del":" edit.eradicate_locations_after_the_fold(Editor_state)\n"}]}},{"Edit":{"inode":{"change":8,"pos":165829},"path":"source.lua","line":251,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":173516},"to":{"change":8,"start":173516,"end":173551},"introduced_by":8}],"inode":{"change":8,"pos":165829}}},"contents":[{"Del":" -- convert any bifold files here\n"}]}},{"Edit":{"inode":{"change":8,"pos":165829},"path":"source.lua","line":253,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":173556},"to":{"change":8,"start":173556,"end":173763},"introduced_by":8}],"inode":{"change":8,"pos":165829}}},"contents":[{"Del":"function source.convert_bifold_text(infilename, outfilename)\n local contents = love.filesystem.read(infilename)\n contents = contents:gsub('\\u{1e}', ';')\n love.filesystem.write(outfilename, contents)\nend\n\n"}]}},{"Replacement":{"inode":{"change":8,"pos":191243},"path":"log_browser.lua","line":15,"ins":{"up_context":[{"change":8,"pos":192064}],"down_context":[{"change":8,"pos":192112}],"flag":"BLOCK","start":9816,"end":9862,"inode":{"change":8,"pos":191243}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":192064},"to":{"change":8,"start":192064,"end":192112},"introduced_by":8}],"inode":{"change":8,"pos":191243}},"ins_contents":[{"Add":" Log_browser_state.cursor1 = {line=1, pos=1}"}],"del_contents":[{"Del":" Log_browser_state.cursor1 = {line=1, pos=nil}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":191243},"path":"log_browser.lua","line":240,"ins":{"up_context":[{"change":8,"pos":200109}],"down_context":[{"change":8,"pos":200175}],"flag":"BLOCK","start":9863,"end":9919,"inode":{"change":8,"pos":191243}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":200109},"to":{"change":8,"start":200109,"end":200175},"introduced_by":8}],"inode":{"change":8,"pos":191243}},"ins_contents":[{"Add":" Editor_state.cursor1 = {line=line.line_number, pos=1}"}],"del_contents":[{"Del":" Editor_state.cursor1 = {line=line.line_number, pos=1, posB=nil}\n"}]}},{"Edit":{"inode":{"change":8,"pos":191243},"path":"log_browser.lua","line":246,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":200351},"to":{"change":8,"start":200351,"end":200401},"introduced_by":8}],"inode":{"change":8,"pos":191243}}},"contents":[{"Del":" -- expand B side\n Editor_state.expanded = true\n"}]}},{"ResurrectZombie":{"inode":{"change":8,"pos":413},"path":"edit.lua","line":82,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":8,"pos":371},"to":{"change":8,"start":371,"end":472},"introduced_by":8},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":8,"pos":371},"to":{"change":8,"start":371,"end":472},"introduced_by":8}],"inode":{"change":8,"pos":413}}},"contents":[{"Add":" or not Text.le1(State.screen_top1, State.cursor1) then\n State.screen_top1 = {line=1, pos=1}\n"}]}},{"ResurrectZombie":{"inode":{"change":8,"pos":413},"path":"edit.lua","line":85,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"","from":{"change":3,"pos":955},"to":{"change":8,"start":518,"end":648},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK","from":{"change":8,"pos":518},"to":{"change":8,"start":518,"end":648},"introduced_by":8},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":8,"pos":518},"to":{"change":8,"start":518,"end":648},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK","from":{"change":8,"pos":790},"to":{"change":8,"start":790,"end":795},"introduced_by":8},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":8,"pos":790},"to":{"change":8,"start":790,"end":795},"introduced_by":8}],"inode":{"change":8,"pos":413}}},"contents":[{"Add":" end\nend\n\nfunction edit.invalid1(State, loc1)\n return loc1.line > #State.lines\n or loc1.pos > #State.lines[loc1.line].data\n"},{"Add":"end\n\n"}]}}],"owner":"akkartik","repo":"wardley.love","token":"BfQDyns11ng0mWnCo8VSeqmr14wmobdzCJnOxbMA8s4=","login":null}

…

Dependencies

Change contents