yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
2567 Commits
Author SHA1 Message Date
Max Brunsfeld fe943bc46b Remove local timestamps from CRDT operations 
Use lamport timestamps for everything.
 2023-08-31 16:23:06 -07:00
Kirill Bulatov c36367d2e4 Rewrite inlay hint collab tests to remove races 2023-08-31 00:37:00 +03:00
Max BrunsfeldJosephMikayla
 		da054bfbb5 Avoid accidental gpui transitive dependency in collab 
* Make Fs depend on Text, not vise versa

Co-authored-by: Joseph <joseph@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-30 13:16:01 -07:00
Joseph T. Lyons 089341a97e collab 0.19.0 2023-08-30 14:37:55 -04:00
Max Brunsfeld d8df0315ad Update some tests to reflect code action debouncing 2023-08-28 17:45:32 -07:00
Mikayla Maki e357027d4c Server-sent feature flags (#2894) 
This PR adds the wiring to both the server and the client for sending
and receiving individual feature flags, as well as a client side API for
convenient access to these feature flags.

Release Notes:

- N/A
 2023-08-25 17:11:33 -07:00
Piotr OsiewiczandJulia Risley f5c0e79be1 Un serialize project search (#2857) 
This is the first batch of improvements to current project search. There
are few things we can do better still, but I want to get this out in
next Preview.
Most of the slowness at this point seems to stem from updating UI too
often.

Release Notes:
- Improved project search by making it report results sooner.

---------

Co-authored-by: Julia Risley <julia@zed.dev>
 2023-08-26 01:31:52 +02:00
Mikayla 60ecd0b28d Update database and RPC to provide configured feature flags 2023-08-25 14:34:32 -07:00
Max Brunsfeld 0596c2f103 Format let-else statements 2023-08-25 10:11:32 -07:00
Max BrunsfeldandMikayla a1dca70e81 Avoid creating redundant snapshots of channel notes buffers 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 16:55:45 -07:00
Max BrunsfeldandMikayla d2f44b9f20 Make channel notes read-only when disconnected 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 16:50:13 -07:00
Max BrunsfeldandMikayla 481af386f1 Dedup channel views 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 14:29:04 -07:00
Max Brunsfeld 910fc819bd Dedup channel buffers 2023-08-24 13:40:44 -07:00
Max BrunsfeldandMikayla d5b7254ce0 Ensure collaborators cursor colors are the same in channel buffers as in projects 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 11:31:41 -07:00
Max BrunsfeldandMikayla eb33452dc2 Fix error in update_channel_buffer when there are no operations to store 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 11:26:22 -07:00
Max BrunsfeldandMikayla bc402040ce Start work on showing consistent replica ids for channel buffers 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-23 18:37:01 -07:00
Max BrunsfeldandMikayla 006d2204b6 Simplify buffer_operations schema 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-23 18:37:01 -07:00
Max BrunsfeldandMikayla 992eddbff0 Snapshot channel notes buffers when everyone leaves 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-23 18:37:01 -07:00
MikaylaandMax 0cabb69ce7 Add channel notes view 
co-authored-by: Max <max@zed.dev>
 2023-08-23 18:37:00 -07:00
Mikaylaandmax 9ff1835b1e Achieve end to end channel buffer synchronization 
co-authored-by: max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Max Brunsfeld e3d0d2f3b0 WIP 2023-08-23 18:34:43 -07:00
Max BrunsfeldandMikayla ca98c11f5f Get join_buffer_for_channel compiling 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-23 18:34:43 -07:00
Mikayla 88351a58a1 WIP: pass synchronize channel buffers integration test 2023-08-23 18:34:43 -07:00
MikaylaandMax 80c8940c36 Add buffer integration test 
Rearrange channel crate structure
Get channel buffer from database

co-authored-by: Max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Max Brunsfeld a47eaf190e Start work on storing channel buffers 2023-08-23 18:34:43 -07:00
Max Brunsfeld 15241db3a1 Simplify macro for running a test with both databases 2023-08-23 18:34:43 -07:00
Joseph T. Lyons 4bd17b5eeb collab 0.18.0 2023-08-23 14:19:24 -04:00
Max Brunsfeld 6af4f59286 Break up Database impl into multiple files, organized by topic 2023-08-18 17:03:34 -07:00
Max Brunsfeld b4c5c9219d Reorganize source files of collab::db 
* Move all sea_orm tables into a 'tables' module
* Move TestDb into its own file
* Move id types into their own module
 2023-08-18 16:23:33 -07:00
Kirill BulatovandJulia Risley 4eea7de73f Respect completion resolve server capabilities 
Only query for additional edits if the server supports it

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-08-18 16:55:47 +03:00
Mikayla Maki dc1dbec6bb Collab panel touch ups (#2855) 
This will also fix the bug that @JosephTLyons observed where accepting a
channel invite would not show sub channels.

Release Notes:

- Offline section is now collapsed by default
- Manage members now shows full list
- Dragging of docks now follows the mouse exactly, and double clicks
reset size. (https://github.com/zed-industries/community/issues/1816)
 2023-08-17 01:09:01 -07:00
Mikayla 9c8769a94a Add fix for lost channel update bug 2023-08-17 00:56:21 -07:00
Mikayla 1846c83b91 Add test for lost channel update 2023-08-16 20:05:21 -07:00
Mikayla 68150180fa WIP 2023-08-16 16:56:00 -07:00
Kirill Bulatov 08fcb3f10e Use InlayHint instead of Inlay where appropriate 2023-08-16 23:38:11 +03:00
Max Brunsfeld 57a8c6d506 collab 0.17.0 2023-08-16 11:05:08 -07:00
Max BrunsfeldandMikayla 2223d15c96 Implement calling contacts into your current channel 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-15 14:56:54 -07:00
Max Brunsfeld c48492a1cb Avoid flicker when moving between channels 2023-08-15 13:18:56 -07:00
Mikayla feb8444c32 Merge branch 'main' into collab-panel 2023-08-15 03:25:45 -07:00
Max BrunsfeldandMikayla 847022b6d0 Fix race condition when UpdateChannel message is received while fetching participants for previous update 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 17:36:35 -07:00
Max BrunsfeldandMikayla d07a8ab12f Ensure channels are sorted alphabetically 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 16:27:35 -07:00
Kirill Bulatov 93b4957012 Hide inlay cache fields 2023-08-14 11:25:02 +03:00
Max BrunsfeldandMikayla da98fd8009 Dial in the channel creating/renaming UI 
* Ensure channel list is in a consistent state with no flicker while the
  channel creation / rename request is outstanding.
* Maintain selection properly when renaming and creating channels.
* Style the channel name editor more consistently with the non-editable
  channel names.

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 17:11:57 -07:00
Max BrunsfeldandMikayla 8abbdcc0d0 Send user ids of channels of which they are admins on connecting 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 14:40:47 -07:00
Max Brunsfeld ef699c25b7 Send channel permissions to clients when they fetch their channels 2023-08-09 13:56:03 -07:00
Mikaylaandmax fdb0aef874 Add renames 
co-authored-by: max <max@zed.dev>
 2023-08-09 12:20:48 -07:00
Mikayla 6fdfe01f4c Fix bad merge 2023-08-09 11:04:09 -07:00
Mikayla 35e307965d Merge branch 'collab-panel' of github.com:zed-industries/zed into collab-panel 2023-08-09 10:44:50 -07:00
Mikayla 8b73737072 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Max BrunsfeldandMikayla b66ac35330 Represent channel relationships using paths table 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 10:36:27 -07:00