about summary refs log tree commit diff stats
path: root/edit.lua
Commit message (Collapse)AuthorAgeFilesLines
...
| | * stop caching screen_bottom1Kartik K. Agaram2024-06-111-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure this is very useful. I had an initial idea to stop using screen_bottom1 in final_text_loc_on_screen, by starting from screen_top1 rather than screen_bottom1. But that changes the direction in which we scan for the text line in situations where there is somehow no text on screen (something that should never happen but I have zero confidence in that). Still, it doesn't seem like a bad thing to drastically reduce the lifetime of some derived state. Really what I need to do is throw this whole UX out and allow the cursor to be on a drawing as a whole. So up arrow or left arrow below a drawing would focus the whole drawing in a red border, and another up arrow and left arrow would skip the drawing and continue upward. I think that change to the UX will eliminate a whole class of special cases in the code.
| | * fix a crash involving mouse and drawingsKartik K. Agaram2024-06-091-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks Alex Schroeder for reporting this crash. The scenario: * Edit a file like say this repo's Readme. * The second line is empty and there's a '+' to insert a drawing. Click on that. * Resize the window so just the first line of text and the drawing are visible. * Close the window. * Reopen lines.love, it will reopen the same file. * Click on the left margin to the left of the drawing. Before this commit these steps yielded the following crash: Error: bad argument #1 to 'len' (string expected, got nil) text.lua:626: in function 'pos_at_end_of_screen_line' edit.lua:298: in function 'mouse_press' There were two distinct problems here: 1. State.screen_bottom1 is not required to point to a text line, it could just as well be a drawing. I have been sloppy in handling that. 2. The bug was partially masked (the need to close and reopen the window) by a second bug: inserting a drawing was not invalidating the cache I save of starty coordinates for each line. (I've inserted and deleted starty invalidations a few times in the past, but it looks like I'd never had one in this particular location edit.draw before.) How did these issues get missed for years? - Even though I use lines.love on a daily basis, it turns out I don't actually create line drawings all that often. - When I do, I'm still living in files that are mostly text with only an occasional drawing. - I keep my windows fairly large. Between these 3 patterns, the odds of running into a drawing as the first or bottom-most line on the screen were fairly small. And then I had to interact with it. I suspect I tend to interact with drawings after centering them vertically. --- Bug #1 in particular has some interesting past history. * Near the start of the project, when I implemented line-wrapping I started saving screen_bottom, the bottom-most line displayed on screen. I did this so I could scroll down easily just by assigning `screen_top = screen_bottom`. (On the other hand, scrolling up still required some work. I should perhaps get rid of it and just compute scrolls from scratch each time.) * Also near the start of the project, I supported selecting text by a complex state machine spanning keypress, mouse press and mouse release: mouse click (press and immediate release) moves cursor mouse drag (press and much later release) creates selection shift-click selects from current cursor to click location shift-movement creates/grows a selection * On 2023-06-01, inscript reported a bug. Opening a window with just a little bit of text (lots of unused space in the window), selecting all the text and then clicking below all the text would crash the editor. To fix this I added code at the bottom of edit.mouse_press which computed the final visible line+pos location and used that in the cursor-move/text-selection state machine. It did this computation based on.. screen_bottom. But I didn't notice that screen_bottom could be a drawing (which has no pos). This commit's bug/regression was created. * On 2023-09-20, Matt Wynne encountered a crash which got me to realize I need code at the bottom of edit.mouse_release symmetric to the code at the bottom of edit.mouse_press. I still didn't notice that screen_bottom could be a drawing. So in fixing inscript's bug report, I introduced (at least) 2 regressions, because I either had no idea or quickly forgot that screen_bottom could point at a drawing. While I created regressions, the underlying mental bug feels new. I just never focused on the fact that screen_bottom could point at a drawing. This past history makes me suspicious of my mouse_press/mouse_release code. I think I'm going to get rid of screen_bottom entirely as a concept. I'll still have to be careful though about the remaining locations and which of them are allowed to point at drawings: - cursor and selection are not allowed to point at drawings - screen_top and screen_bottom are allowed to point at drawings I sometimes copy between these 4 location variables. Auditing shows no gaps where cursor could ever end up pointing at a drawing. It's just when I started using screen_bottom for a whole new purpose (in the mouse_press/release state machine) that I went wrong. I should also try getting rid of starty entirely. Is it _really_ needed for a responsive editor? I think I introduced it back when I didn't know what I was doing with LÖVE and was profligately creating text objects willy-nilly just to compute widths. Getting rid of these two fairly global bits of mutable state will hopefully make lines much more robust when the next person tries it out in 6 months :-/ X-( Thanks everyone for the conversation around this bug: https://merveilles.town/@akkartik/112567862542495637 --- Bug #2 has some complexity as well, and might lead to some follow-on cleanup. When I click on the button to insert a new drawing, the mouse_release hook triggers and moves the cursor below the new drawing. This is desirable, but I'd never noticed this happy accident. It stops working when I invalidate starty for all lines (which gets recomputed and cached for all visible lines on every frame). Fixing this caused a couple of unit tests start crashing for 2 reasons that required their own minor fixes: - My emulated mouse press and release didn't have an intervening frame and so mouse_release no longer receives starty. Now I've added a call to edit.draw() between press and release. This might actually bite someone for real someday, if they're running on a slow computer or something like that. I've tried to click really fast but I can't seem to put mouse_press and release in the same frame (assuming 30 frames per second) - My tests' window dimensions often violate my constraint that the screen always have one line of text for showing the cursor. They're unrealistically small or have a really wide aspect ratio (width 2x of height). I suspect lines.love will itself crash in those situations, but hopefully they're unrealistic. Hmm, I wonder what would happen if someone maximized in a 16:9 screen, that's almost 2x.. Anyways, I've cleaned a couple of tests up, but might need to fix up others at some point. I'd have to rejigger all my brittle line-wrapping tests if I modify the screen width :-/ X-(
* | | Merge text.loveKartik K. Agaram2024-02-161-0/+1
|\| |
| * | Merge lines.loveKartik K. Agaram2024-02-161-0/+1
| |\|
| | * ensure tapping on editor brings up soft keyboardKartik K. Agaram2024-02-161-0/+1
| | |
* | | Merge text.loveKartik K. Agaram2024-02-041-4/+4
|\| |
| * | Merge lines.loveKartik K. Agaram2024-02-041-4/+4
| |\|
| | * bugfix: don't clear selection on M-arrowKartik K. Agaram2024-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | We now treat all arrow chords as cursor movement. Many thanks to Ryan Kessler (https://tone.support) for reporting this issue.
| | * more carefully pass the 'key' arg aroundKartik K. Agaram2024-02-041-3/+3
| | |
* | | Merge text.loveKartik K. Agaram2023-12-291-4/+7
|\| |
| * | Merge lines.loveKartik K. Agaram2023-12-291-4/+7
| |\|
| | * bugfixKartik K. Agaram2023-12-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | scenario: run without config file, quit, run again expected: font size remains the same on second run Before this commit it was increasing on each run. It turns out the font height that you pass into love.graphics.newFont() is not the result of font:getHeight().
| | * pull font into editorKartik K. Agaram2023-12-291-5/+7
| | | | | | | | | | | | | | | Now it adjusts the current font for itself. And it's up to the caller to adjust the current font after.
| | * streamline button.luaKartik K. Agaram2023-12-161-1/+1
| | |
| * | Merge lines.loveKartik K. Agaram2023-12-031-5/+0
| |\|
| | * clearing starty is redundant in mutationsKartik K. Agaram2023-12-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | We'll end up calling Text.redraw_all anyway, which will clear starty and much more besides. We'll still conservatively continue clearing starty in a few places where there's a possibility that Text.redraw_all may not be called. This change is riskier than most.
* | | Merge text.loveKartik K. Agaram2023-12-011-0/+2
|\| |
| * | Merge lines.loveKartik K. Agaram2023-12-011-0/+2
| |\|
| | * manually maintain mouse button press stateKartik K. Agaram2023-12-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just checking mouse.isDown works if the editor is the entirety of the app, as is true in this fork. However, we often want to introduce other widgets. We'd like tapping on them to not cause the selection to flash: https://news.ycombinator.com/context?id=38404923&submission=38397715 The right architecture to enforce this is: have each layer of the UI maintain its own state machine between mouse_press and mouse_release events. And only check the state machine in the next level down rather than lower layers or the bottommost layer of raw LÖVE.
* | | Merge text.loveKartik K. Agaram2023-11-181-8/+2
|\| |
| * | Merge lines.loveKartik K. Agaram2023-11-181-8/+2
| |\|
| | * audit all assertsKartik K. Agaram2023-11-181-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each one should provide a message that will show up within LÖVE. Stop relying on nearby prints to the terminal. I also found some unnecessary ones. There is some potential here for performance regressions: the format() calls will trigger whether or not the assertion fails, and cause allocations. So far Lua's GC seems good enough to manage the load even with Moby Dick, even in some situations that caused issues in the past like undo.
| | * clearer API for drawing a buttonKartik K. Agaram2023-10-161-1/+1
| | | | | | | | | | | | | | | | | | Make it more obvious that the color passed in is just for the background. The icon will do the rest. r/g/b keys are more consistent with App.color().
* | | Merge text.loveKartik K. Agaram2023-09-201-13/+26
|\| |
| * | Merge lines.loveKartik K. Agaram2023-09-201-13/+26
| |\|
| | * bugfix: clear selection when clicking above or below linesKartik K. Agaram2023-09-201-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matt Wynne pointed out that snap.love would crash when a node went off screen. While debugging it I noticed that selection1 was being set when it shouldn't be. Turns out I introduced a bug when I fixed the inscript bug back in June (commit 9656e137742). One invariant I want to preserve is: selection1 should be unset after a mouse click (press and release without intervening drag). This invariant was violated in my bugfix back in June. I was concerned only with selection back then, and I didn't realize I was breaking the mouse click case (in a fairly subtle way; you can have selection set, and when it's set identically to the cursor everything looks the same). I think there might still be an issue in snap.love after this fix. I noticed screen_bottom1.pos was nil, and as far as I recall that should never happen.
| | * indentKartik K. Agaram2023-09-161-8/+8
| | |
| | * bugfix to the helper I added yesterdayKartik K. Agaram2023-09-161-0/+1
| | |
* | | Merge text.loveKartik K. Agaram2023-09-161-2/+0
|\| |
| * | fix a bad mergeKartik K. Agaram2023-09-161-2/+0
| | |
* | | Merge text.loveKartik K. Agaram2023-09-151-0/+2
|\| |
| * | Merge lines.loveKartik K. Agaram2023-09-151-0/+2
| |\|
| | * bugfix: crash when using mouse wheelKartik K. Agaram2023-09-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the Text functions assume the cursor is always on a text line. I was violating that invariant. * When scrolling up, I start the cursor at the top-most line below the screen top. * When scrolling down, I start the cursor at the top-most line below the screen bottom. I think it would feel slightly more natural for it to be the bottom-most line above the screen bottom. However, the Text functions maintain an invariant that the bottom-most line in a buffer will be text. There's no such invariant for the top-most line.
| | * change a helper slightlyKartik K. Agaram2023-09-151-7/+11
| | |
* | | Merge text.loveKartik K. Agaram2023-08-301-1/+1
|\| |
| * | Merge lines.loveKartik K. Agaram2023-08-301-3/+3
| |\|
| | * make a few names consistent with snake_caseKartik K. Agaram2023-08-301-3/+3
| | |
* | | Merge text.loveKartik K. Agaram2023-06-081-1/+11
|\| |
| * | Merge lines.loveKartik K. Agaram2023-06-081-1/+11
| |\|
| | * several bugfixes in saving/loading cursor positionKartik K. Agaram2023-06-081-1/+11
| | |
* | | Merge text.loveKartik K. Agaram2023-06-071-1/+0
|\| |
| * | Merge lines.loveKartik K. Agaram2023-06-071-1/+0
| |\|
* | | Merge text.loveKartik K. Agaram2023-06-061-0/+2
|\| |
| * | Merge lines.loveKartik K. Agaram2023-06-061-0/+2
| |\|
| | * return height of editor widget after drawingKartik K. Agaram2023-06-061-0/+2
| | |
* | | Merge text.loveKartik K. Agaram2023-06-041-12/+32
|\| |
| * | Merge lines.loveKartik K. Agaram2023-06-041-12/+32
| |\|
| | * port inscript's bugfix to source editorKartik K. Agaram2023-06-041-1/+1
| | |
| | * bugfix: inscript's bugKartik K. Agaram2023-06-041-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix this I have to first stop incrementally updating screen_bottom1 in the middle of a frame. Now it always has a good value from the end of a frame. I'm also running into some limitations in the test I'd ideally like to write (that are documented in a comment), but I still get some sort of automated test for this bugfix.
| | * handle wrapping linesKartik K. Agaram2023-06-031-2/+2
| | |