yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,133 Commits 5 Branches 0 Tags
e95eab89f4e72a2beb53e548d41e19aec26ff49f
Commit Graph
43 Commits
Author SHA1 Message Date
Max Brunsfeld b1a1f84dea Handle buffer deduping in the worktree instead of in workspace 
Previously, buffers were only deduped by file if they were opened
through Workspace::open_entry
 2021-12-13 16:35:46 -08:00
Max BrunsfeldAntonio ScandurraNathan Sobo
 		df57433d59 Get things compiling with diagnostics on worktree 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 11:15:03 -08:00
Nathan Sobo 5fc5ed5754 WIP: Start on removing selections from buffer in favor of editor 2021-12-10 19:23:34 -07:00
Nathan Sobo 271b092ec1 Move multi_buffer to editor crate 2021-12-10 17:37:53 -07:00
Max Brunsfeld bb6f9a6936 Fill in some missing methods on MultiBuffer, MultiBufferSnapshot 2021-12-10 14:27:04 -08:00
Antonio ScandurraandNathan Sobo cced16aa49 Get everything compiling again 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 17:15:16 +01:00
Max Brunsfeld ca04b13788 Merge branch 'fragment-locators' into HEAD 2021-12-09 14:49:04 -08:00
Antonio ScandurraandNathan Sobo cbb2f5cbc7 Fix some of the diagnostic tests and make DiagnosticEntry generic 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:53:08 +01:00
Antonio ScandurraandNathan Sobo a29758b389 Remove anchor collections 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:28:27 +01:00
Nathan SoboandMax Brunsfeld 66798f3be7 Get Editor compiling with MultiBuffer as its buffer 
There's a bunch of unimplemented methods in MultiBuffer, but everything compiles.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-08 19:23:04 -07:00
Max Brunsfeld 8a49e9b98d Don't pass GH auth header when following redirects for release assets 2021-12-07 12:34:55 -08:00
Nathan SoboandMax Brunsfeld 087fe38e38 Fix warning 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-11-30 12:27:00 -07:00
Nathan SoboandMax Brunsfeld b1680df715 Fix randomized test failures by waiting for client_b to be added to worktree_a 
We perform an async fetch of client_b's user data on worktree_a, which ends up holding a handle that prevents worktree_a from being released later in the test. By waiting for this fetch to finish before proceeding, we can be sure worktree_a actually gets released.

A more comprehensive fix would be some way to ensure we actually perform a release if an entity is fully dropped outside of an update cycle, but this fixes the issue for now.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-11-29 16:48:09 -07:00
Max BrunsfeldandNathan Sobo 9ddae3c4d4 Introduce a collections crate w/ deterministic hashmap, hashset in tests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-29 15:22:45 -08:00
Antonio ScandurraandNathan Sobo c9e4f7a7eb Introduce a new Grammar struct and allow it to be optional 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-29 17:38:59 +01:00
Nathan Sobo f34b494fef Introduce a TestClient and associate it with a PeerId 
This makes it easier to integration test peer interactions because now we know their PeerIds.
 2021-11-27 12:33:25 -07:00
Nathan Sobo 306c3e9a1b Populate the user data of worktree collaborators 
This will make it possible for us to render their avatars. Previously we only had the user ids. During rendering, everything needs to be available synchronously. So now, whenever collaborators are added, we perform the async I/O to fetch their user data prior to adding them to the worktree.
 2021-11-26 20:35:50 -07:00
Nathan Sobo fe66755e30 WIP: Give worktrees a reference to the UserStore 
This will allow them to fetch user data when peers are added or removed. Still work to do though.
 2021-11-26 19:12:12 -07:00
Nathan SoboMax BrunsfeldAntonio Scandurra
 		21a025ec7b Introduce a worktree::Collaborator struct that holds the user_id 
We can use this to render avatars.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-11-26 11:28:30 -07:00
Nathan SoboandAntonio Scandurra ff11bcf0aa Rename PeoplePanel to ContactsPanel 
Yeah, it's true they're people, but this is a more specific way in which they're people.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-11-26 11:13:05 -07:00
Nathan SoboandAntonio Scandurra c72a5a822c Rename collaborator_logins to authorized_logins 
Again, this is about reserving the concept of a "collaborator" for actual collaborators on a worktree.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-11-26 11:08:34 -07:00
Nathan SoboandAntonio Scandurra 7754a5a6bc Rename Collaborators to Contacts 
This will allow us to use the word "collaborator" to describe users that are actively collaborating on a worktree.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-11-26 10:59:41 -07:00
Nathan Sobo e9edacaca4 Associate Peers with a user_id 
This will help us render the collaborator avatars for the active worktree when we know its peers.
 2021-11-26 10:22:34 -07:00
Antonio Scandurra 91cde5b838 Move integration test up into the zed crate 2021-11-24 17:39:15 +01:00
Max BrunsfeldandNathan Sobo 0fa00589cb Impose a timeout on writing RPC messages 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-22 13:23:55 -08:00
Max Brunsfeld bccfaf645e Merge pull request #226 from zed-industries/1d-block-map 
Allow full diagnostic messages to be displayed in the editor
 2021-11-19 09:16:49 -08:00
Antonio ScandurraandNathan Sobo 83baebd525 In a diagnostic group, mark the highest-severity diagnostic as primary 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-18 15:53:00 +01:00
Max Brunsfeld 7ac40dfb6a Add missing group_id fields in rpc test 2021-11-04 17:34:33 -07:00
Max BrunsfeldandNathan Sobo 1e6c3036a2 Fix paths to server crate in scripts and gitignore 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-03 19:22:00 -07:00
Max BrunsfeldandNathan Sobo 837244e938 Start language servers based on buffers' languages 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-02 17:41:01 -07:00
Max Brunsfeld 174efb1a04 Add an integration test for replicating buffer's diagnostics 2021-11-02 14:57:24 -07:00
Antonio Scandurra 1c4b9c8142 Fix compilation errors 2021-10-26 14:27:00 +02:00
Max Brunsfeld 34cda9fe9b Extract a language crate 2021-10-20 22:51:40 +02:00
Antonio ScandurraNathan SoboMax Brunsfeld
 		10f07a81a7 Skip autoclosed pairs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-10-06 19:04:55 +02:00
Antonio Scandurra 3dc173cf40 Move workspace module into its own crate 2021-10-05 13:49:10 +02:00
Antonio Scandurra 6cdcb4fa79 Move sidebar-specific code out of Workspace 2021-10-05 10:59:20 +02:00
Max BrunsfeldandNathan Sobo 06a44e9171 Move ChannelList, UserStore into client crate 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-04 17:30:11 -07:00
Max BrunsfeldandNathan Sobo 95c15b11b1 Rename rpc_client -> client 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-04 17:14:21 -07:00
Max BrunsfeldandNathan Sobo 95010ee295 Rename worktree crate to project, pull in Project 
Also, move the high-level fuzzy mathcing functions in
zed::fuzzy into the fuzzy crate so that project can
use them.

This required defining a 'PathMatchCandidateSet' trait
to avoid a circular dependency from fuzzy to worktree.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-04 16:45:05 -07:00
Max BrunsfeldandNathan Sobo bf7b277038 List path dependencies first in all Cargo.toml files 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-04 15:36:52 -07:00
Max BrunsfeldandNathan Sobo 4e31762075 Move editor into its own crate 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-04 15:23:10 -07:00
Nathan SoboandMax Brunsfeld 8e0cb6bec3 Rename zrpc to rpc 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-04 13:28:00 -06:00
Nathan SoboandMax Brunsfeld a1b11e8907 Move all crates to a top-level crates folder 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-04 13:22:21 -06:00