Joseph Lyons
86d4586a7e
In-app feedback WIP
2023-01-07 18:53:00 -05:00
Nathan Sobo
e255eb74a0
Merge pull request #2011 from zed-industries/project-reconnection
...
Retain connection to remote projects when temporarily disconnected
2023-01-06 18:01:08 -07:00
Nathan Sobo
ce223e88fe
Fix tests that failed due to defaulting the grouping interval to zero in tests
2023-01-06 17:56:21 -07:00
Kay Simmons
4da1890a54
working f and t bindings
2023-01-06 14:24:20 -08:00
Max Brunsfeld and Nathan Sobo
c07f90cb54
Assert that buffers' file state matches in randomized collab test
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-12-21 15:38:44 -08:00
Antonio Scandurra
55c5989abc
Synchronize buffers when either the host or a guest reconnects
2022-12-21 14:20:56 +01:00
Max Brunsfeld
2125b40426
Merge pull request #1980 from zed-industries/following-panics
...
Fix panics when following
2022-12-19 11:26:28 -08:00
Julia
6fb3bad2e8
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
5dbb5b5a25
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 and Nathan Sobo
da9a238d26
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 and Max Brunsfeld
48c0db49da
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
7c312a10d9
Merge branch 'main' into fix-reconnects-after-deploy
2022-12-15 15:32:05 +01:00
Julia
c0c47139aa
Get tests building again
2022-12-15 00:17:28 -05:00
Max Brunsfeld
c5c2520d43
Introduce a ViewId message, identifying views across calls
2022-12-14 14:40:07 -08:00
Max Brunsfeld
e14f9ef153
Clean up state matching in from_state_proto using let/else statements
2022-12-14 11:09:33 -08:00
Max Brunsfeld
a5ca25c78a
In editor following test, apply excerpt removals to both followers
2022-12-14 11:08:08 -08:00
Julia
9f81f1f5c7
Clamp end of visual git hunk to requested range
2022-12-13 13:58:50 -05:00
Julia
4c2ee3d972
Cleanup
2022-12-13 12:35:58 -05:00
Julia
d100acd3b1
Initial hacky displaying of git gutter in multi-buffers
2022-12-13 12:35:58 -05:00
Max Brunsfeld
267c632c8b
Merge branch 'main' into multibuffer-following
2022-12-13 09:25:18 -08:00
Max Brunsfeld
aabe7f51ce
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
5062938a1a
Fixed issue where the NextScreen action would never have an effect
2022-12-12 15:36:51 -08:00
c30daa21c6
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
3eb2f901b0
Merge branch 'main' into multibuffer-following
2022-12-12 11:47:39 -08:00
Mikayla Maki
33fca2f334
Rearrange the terminal code to not have a cyclic dependency with the project
2022-12-08 20:21:00 -08:00
Kay Simmons
242f038bbd
fix final failing tests
2022-12-08 14:39:48 -08:00
Kay Simmons
b39cac2c5c
fix failing tests from incorrect follow behavior
2022-12-07 17:25:48 -08:00
Kay Simmons
acac7d292d
Refactor editor scrolling and implement scroll commands from vim mode
2022-12-07 16:39:32 -08:00
Mikayla Maki and
ca1166fac9
Reworked thread safe connection be threadsafer,,,, again
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:06:02 -08:00
Kay Simmons
11c25ee936
Address some issues with the sqlez_macros
2022-12-03 16:06:01 -08:00
Kay Simmons and Mikayla Maki
18494210e5
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
6a3b636633
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
3c6dccdfa7
working serialized writes with panics on failure. Everything seems to be working
2022-12-03 16:06:01 -08:00
Mikayla Maki and
16654df419
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
049c348db3
Added extra sql methods
2022-12-03 16:06:01 -08:00
Mikayla Maki
28ea35bf9f
Touched up sql macro
2022-12-03 16:06:01 -08:00
Mikayla Maki
80df7a3698
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
3ea3593b1a
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
1c6cbbd563
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
1e3cc06c73
WIP serializing and deserializing editors
2022-12-03 16:06:01 -08:00
Mikayla Maki
163ee2b188
Rebased to main
2022-12-03 16:06:01 -08:00
Mikayla Maki
8465e9262b
Added center group deserialization
2022-12-03 16:06:01 -08:00
Kay Simmons
72faa514b4
wip serialize editor
2022-12-03 16:06:01 -08:00
Kay Simmons and Mikayla Maki
ff5f2cbed7
Dock persistence working!
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-12-03 16:06:01 -08:00
Kay Simmons
337881b490
wip
2022-12-03 16:06:01 -08:00
Mikayla Maki and
9551bebee2
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 and Antonio Scandurra
6df9e3995a
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
336cd58526
Replicate multibuffer excerpt additions and removals to followers
2022-11-30 13:20:13 -08:00
Max Brunsfeld
ce0c9a8dd4
Start work on following in multi-buffers
2022-11-29 14:50:43 -08:00
Max Brunsfeld
80f0d19ed7
Send full multibuffer anchors to following peers
2022-11-28 18:00:38 -08:00
Joseph Lyons