Keep ViewPosition consistent when a Document is edited from different Views, and on buffer switching #10559
Conversation
|
Can we get a retry on this test failure? It looks unrelated to my changes, and I can't reproduce it. Ran the same commit through CI on my fork and got a pass |
|
Something must have changed on the Github Actions runner, I'm seeing the same failure in other PRs. |
|
Looks like macos runners switched from x86 to arm. Clearing the tree-stter-grammars cache for macos seems to have fixed it |
since we sorted out the borrow checker issues using partial borrows, there's nothing stopping us from going back to the simpler implementation
intarga
force-pushed
the
restore_view_offset
branch
from
23ee43a
to
83e3ce0
Compare
|
this lgtm now and was a smaller change than I expected. I will test this out locally a bit |
| for view_data in self.view_data.values_mut() { | ||
| view_data.view_position.anchor = transaction | ||
| .changes() | ||
| .map_pos(view_data.view_position.anchor, Assoc::Before); |
There was a problem hiding this comment.
I do wonder if we should be using Assoc::After here instead. I don't have any opinion here. I will try with before and see if it annoys me. It sprobably doesn't make too much difference due to ensure_cursor_in_view keeping the view position somewhat fixed in extreme cases. In thsose cases it probably makes more sense to keep the cursor at the top so before is probably right
Supersedes #7568, fixes #7355.
Since view offsets can no longer be initialised in
View::new(), I moved them next to selection initialisation indoc.ensure_view_init(view_id). I was a little concerned about all those unwraps ondoc.view_data(view_id)(those functions are infallible and don't have a mutable reference to doc, so there's no way to ensure view_data is initialised in there), but in theory it should be panic-safe, as long asdoc.ensure_view_init(view_id)is called for every new view, which it is. It was missing from some test cases, since they didn't seem to need selections, but it's added even to those now.