Max Brunsfeld
61c6c825b5
Merge pull request #1980 from zed-industries/following-panics
...
Fix panics when following
2022-12-19 11:26:28 -08:00
Julia
de9c58d216
Merge pull request #1983 from zed-industries/multi-buffer-git-gutter
...
Multi buffer git gutter
2022-12-19 10:53:42 -05:00
Max Brunsfeld
1e02ebbd11
Replicate pending selections separately from other selections
...
This fixes a panic that would occur when a leader created
a pending selection that overlapped another selection,
because the follower would attempt to treat that pending
selection as non-pending, which would violate the invariant
that selections are sorted and disjoint.
2022-12-17 14:00:53 -08:00
Julia
ebd0c5d000
Handle reversed=true for multi-buffer git-hunks-in-range iteration
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-12-15 18:17:32 -05:00
Julia
f88b413f6a
Rewrite multi-buffer aware git hunks in range to be more correct
...
Less ad-hoc state tracking, rely more on values provided by the
underlying data
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-12-15 17:09:09 -05:00
Antonio Scandurra
5720c43fe7
Merge branch 'main' into fix-reconnects-after-deploy
2022-12-15 15:32:05 +01:00
Julia
0dedc1f3a4
Get tests building again
2022-12-15 00:17:28 -05:00
Max Brunsfeld
70efd2bebe
Introduce a ViewId message, identifying views across calls
2022-12-14 14:40:07 -08:00
Max Brunsfeld
f99f581bfc
Clean up state matching in from_state_proto using let/else statements
2022-12-14 11:09:33 -08:00
Max Brunsfeld
09d3fbf04f
In editor following test, apply excerpt removals to both followers
2022-12-14 11:08:08 -08:00
Julia
cf72173282
Clamp end of visual git hunk to requested range
2022-12-13 13:58:50 -05:00
Julia
7c3dc1e3dc
Cleanup
2022-12-13 12:35:58 -05:00
Julia
00b7c78e33
Initial hacky displaying of git gutter in multi-buffers
2022-12-13 12:35:58 -05:00
Max Brunsfeld
11800a8a78
Merge branch 'main' into multibuffer-following
2022-12-13 09:25:18 -08:00
Max Brunsfeld
2affbcc495
Merge pull request #1962 from zed-industries/scrolling-breaks-follow
...
Avoid breaking follow when syncing leader's scroll position
2022-12-12 16:37:58 -08:00
Mikayla Maki
cd2d593a6c
Fixed issue where the NextScreen action would never have an effect
2022-12-12 15:36:51 -08:00
Max Brunsfeld
9ef00ea44c
Avoid breaking follow when syncing leader's scroll position
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-authored-by: Kay Simmons <kay@zed.dev>
2022-12-12 15:36:30 -08:00
Max Brunsfeld
f797dfb88f
Merge branch 'main' into multibuffer-following
2022-12-12 11:47:39 -08:00
Mikayla Maki
83aefffa38
Rearrange the terminal code to not have a cyclic dependency with the project
2022-12-08 20:21:00 -08:00
Kay Simmons
2cf48c03f9
fix final failing tests
2022-12-08 14:39:48 -08:00
Kay Simmons
f6f41510d2
fix failing tests from incorrect follow behavior
2022-12-07 17:25:48 -08:00
Kay Simmons
cffb064c16
Refactor editor scrolling and implement scroll commands from vim mode
2022-12-07 16:39:32 -08:00
Mikayla Maki
5e240f98f0
Reworked thread safe connection be threadsafer,,,, again
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:06:02 -08:00
Kay Simmons
f68e8d4664
Address some issues with the sqlez_macros
2022-12-03 16:06:01 -08:00
Kay Simmons
dd9d20be25
Added sql! proc macro which checks syntax errors on sql code and displays them with reasonable underline locations
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-12-03 16:06:01 -08:00
Kay Simmons
359b8aaf47
rename sql_method to query and adjust the syntax to more closely match function definitions
2022-12-03 16:06:01 -08:00
Kay Simmons
1cc3e4820a
working serialized writes with panics on failure. Everything seems to be working
2022-12-03 16:06:01 -08:00
Mikayla Maki
3e0f9d27a7
Made dev tools not break everything about the db
...
Also improved multi statements to allow out of order parameter binding in statements
Ensured that all statements are run for maybe_row and single, and that of all statements only 1 of them returns only 1 row
Made bind and column calls add useful context to errors
Co-authored-by: kay@zed.dev
2022-12-03 16:06:01 -08:00
Mikayla Maki
2dc1130902
Added extra sql methods
2022-12-03 16:06:01 -08:00
Mikayla Maki
37174f45f0
Touched up sql macro
2022-12-03 16:06:01 -08:00
Mikayla Maki
e1eff3f4cd
WIP: Some bugs switching to database provided IDs, terminal titles don't reload when restored from serialized, workspace tests are no longer passing but should be easy to fix when it isn't 11:44
2022-12-03 16:06:01 -08:00
Mikayla Maki
a47f2ca445
Added UUID based, stable workspace ID for caching on item startup. Completed first sketch of terminal persistence. Still need to debug it though....
2022-12-03 16:06:01 -08:00
Mikayla Maki
a8ed95e1dc
Implementing persistence for the terminal working directory, found an issue with my current data model. :(
2022-12-03 16:06:01 -08:00
Kay Simmons
cb1d2cd1f2
WIP serializing and deserializing editors
2022-12-03 16:06:01 -08:00
Mikayla Maki
992b94eef3
Rebased to main
2022-12-03 16:06:01 -08:00
Mikayla Maki
6530658c3e
Added center group deserialization
2022-12-03 16:06:01 -08:00
Kay Simmons
75d3d46b1b
wip serialize editor
2022-12-03 16:06:01 -08:00
Kay Simmons
d20d21c6a2
Dock persistence working!
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-12-03 16:06:01 -08:00
Kay Simmons
c1f7902309
wip
2022-12-03 16:06:01 -08:00
Mikayla Maki
3451a3c7fe
Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :(
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:04:10 -08:00
Max Brunsfeld
e4507c1d74
Fetch missing buffers when adding excerpts to a multibuffer while following
...
Make FollowableItem::apply_update_proto asynchronous. Use a single
task per workspace to process all leader updates, to prevent updates
from being interleaved.
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2022-12-01 15:17:51 -08:00
Max Brunsfeld
9314c0e313
Replicate multibuffer excerpt additions and removals to followers
2022-11-30 13:20:13 -08:00
Max Brunsfeld
6120d6488b
Start work on following in multi-buffers
2022-11-29 14:50:43 -08:00
Max Brunsfeld
6d9b55a654
Send full multibuffer anchors to following peers
2022-11-28 18:00:38 -08:00
Max Brunsfeld
3eac3e20d5
Emit events from a multibuffer when adding/removing excerpts
2022-11-28 17:57:55 -08:00
Max Brunsfeld
718f802157
Implement Copy for multibuffer anchors
2022-11-28 14:18:49 -08:00
Max Brunsfeld
f71145bb32
Add a layer of indirection between excerpt ids and locators
2022-11-28 14:18:49 -08:00
Julia
e4185f38cf
Merge pull request #1910 from zed-industries/lsp-coordinate-clamp
...
Don't trust LSP coordinates to be within document bounds
2022-11-23 14:07:37 -05:00
Julia
03cfd23ac5
Bump protocol version back down as proto changes are non-breaking
2022-11-23 13:40:49 -05:00
Julia
e51cbf67ab
Fixup compile errors
2022-11-22 02:49:47 -05:00
