zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
18,747 Commits 667 Branches 720 Tags 178 MiB
3dadfe4787
Commit Graph

343 Commits

Author SHA1 Message Date
Antonio Scandurra
6212f2fe30 Wait for remote worktree to catch up with host before mutating entries 
This ensures that entries don't randomly re-appear on remote worktrees
due to observing an update too late. In fact, it ensures that the remote
worktree has the same starting state of the host before preemptively applying
the fs operation locally.
 2022-05-05 13:47:53 +02:00
Max Brunsfeld
4b1c46fa45 Allow deleting entries from the project panel 2022-05-04 18:00:23 -07:00
Max Brunsfeld
438e4e7a19 Allow guests to rename stuff 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-04 10:28:44 -07:00
Max Brunsfeld
657ea264cc Allow guests to create files from the project panel 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-04 10:28:44 -07:00
Keith Simmons
d4bef67cf2
Merge pull request #929 from zed-industries/non-uniform-batched-edits 
Allow batched edits where each range is associated with different insertion text
 2022-04-29 16:14:38 -07:00
Keith Simmons
04fc1d5982 Building, but failing test WIP 2022-04-27 17:25:38 -07:00
Antonio Scandurra
cde5a45318 Clip scroll_top_row before navigating back to it 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-27 16:25:26 +02:00
Antonio Scandurra
ef784cf21e Remove summaries that don't contain any errors or warnings 
When opening a buffer, some language servers might start reporting
diagnostics. When closing a buffer, they might report that no diagnostics
are present for that buffer. Previously, we would keep an empty summary entry
which would cause us to open a buffer in the project diagnostics view, only to
drop it because it contained no diagnostics. However, the act of opening it
caused the language server to asynchronously report non-empty diagnostics.
We would therefore handle this as an update, but the previous closing of the
buffer would cause the language server to report empty diagnostics again. This
would cause the project diagnostics view to thrash infinitely between these two
states, pegging the CPU and constantly refreshing the UI.

With this commit we won't maintain empty summary entries for files that contain
no diagnostics, which fixes the above issue.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-19 15:30:46 +02:00
Max Brunsfeld
fe27a27cb6 Merge branch 'main' into prompt-on-close 2022-04-01 15:29:23 -07:00
Antonio Scandurra
65048760b2 Allow explicit reload of buffers via Project::reload_buffers 2022-04-01 14:01:56 +02:00
Max Brunsfeld
158d987965 Start work on allowing language servers to support multiple languages 2022-03-29 16:57:18 -07:00
Max Brunsfeld
8699dd9c56 Replicate fractional component of leader's scroll position 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-22 17:20:13 -07:00
Max Brunsfeld
1728551282 Always mirror the leader's selections when following 2022-03-21 21:47:29 -07:00
Max Brunsfeld
3e0bc979c3 Avoid infinite loop when collaborators follow each other 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-21 11:47:00 -07:00
Max Brunsfeld
d02ab9bd06 Start work on updating editors's scroll positions when following 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-18 12:56:20 -07:00
Antonio Scandurra
7d7e10598a Broadcast active view to followers 2022-03-18 16:00:03 +01:00
Antonio Scandurra
f0b7bd6e17 Serialize initial follow state in leader and reflect it in follower 2022-03-18 10:22:13 +01:00
Max Brunsfeld
9716ff7964 Set up logic for starting following 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-17 10:46:54 -07:00
Antonio Scandurra
4bbfd0918e Start defining follow protocol 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-17 16:50:29 +01:00
Antonio Scandurra
7155dabf5b Fade out unnecessary code 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-15 15:51:59 +01:00
Antonio Scandurra
45fb470f4d Display language server name in status bar 2022-03-10 16:48:43 +01:00
Antonio Scandurra
4243f0c339 Render pending language server work in status bar 2022-03-10 16:09:47 +01:00
Antonio Scandurra
4bbf5ed0b9 Listen to all LSP progress notifications and broadcast them to peers 2022-03-10 12:00:33 +01:00
Antonio Scandurra
51d5ed48f0 Remove unused CloseBuffer message 2022-03-08 11:17:20 +01:00
Antonio Scandurra
bcd5c28833 Allow receiving diagnostic updates out of order 2022-03-04 09:27:49 +01:00
Antonio Scandurra
556d9cc53f Correctly defer undo operations when messages arrive out of order 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-03-03 18:07:59 +01:00
Antonio Scandurra
14d26eeedc Move several buffer-related messages to the background 2022-03-03 12:18:19 +01:00
Antonio Scandurra
68cfce1fb8 Rename weak to visible 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-03-02 14:38:16 -08:00
Max Brunsfeld
1278f5484f Add project search RPC messages 2022-02-25 12:38:31 -08:00
Antonio Scandurra
d1b4384f80 WIP 2022-02-23 19:04:22 +01:00
Antonio Scandurra
8440644dc9 Remove update_id from worktree update messages 
We don't need this anymore because worktree updates are foreground
messages.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-02-23 18:35:25 +01:00
Max Brunsfeld
e140f70e3c Show document highlights from the language server when moving the cursor 2022-02-22 17:16:31 -08:00
Max Brunsfeld
25d45378e4 Implement find-all-references 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-22 14:27:16 -08:00
Antonio Scandurra
0e4bd4b418 Sign symbols so that we can trust opening buffers for them from guests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-02-22 18:43:16 +01:00
Antonio Scandurra
fad335b2ba Don't serialize the full LSP symbol when collaborating 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-22 18:08:43 +01:00
Antonio Scandurra
72ad3c2897 Render paths in ProjectSymbolsView 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-22 17:48:14 +01:00
Antonio Scandurra
f0195ac3a3 Allow opening of buffers associated with a project symbol 2022-02-22 16:26:01 +01:00
Antonio Scandurra
ab73343323 WIP: Start on getting project symbols over RPC 2022-02-22 12:15:38 +01:00
Max Brunsfeld
54d7642712 Start work on renames 2022-02-17 18:01:07 -08:00
Antonio Scandurra
303e8e1688 Wait for version before returning code actions 2022-02-17 14:46:26 +01:00
Antonio Scandurra
20858699bc Add a Test message that we can use to assert on the behavior of Peer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-02-16 18:32:03 +01:00
Antonio Scandurra
17b13b9362 Wait for request and response version before resolving completions 2022-02-15 10:17:35 +01:00
Max Brunsfeld
d358072c74 Include the desired version in a SaveBuffer RPC request 
When handling this messages on the host, wait until the desired
version has been observed before performing the save.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-14 17:51:26 -08:00
Max Brunsfeld
8d06049124 Ensure worktree updates are applied in order 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-14 16:19:29 -08:00
Antonio Scandurra
fadb94afb2 Use selection instead of just the cursor when fetching code actions 2022-02-14 14:13:36 +01:00
Antonio Scandurra
4929b8c525 Move Buffer::format to Project::format 2022-02-11 12:07:46 +01:00
Antonio Scandurra
7d8641afb6 Make transactions serializable to enable edits on behalf of other users 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-08 19:48:21 +01:00
Antonio Scandurra
624eb5907e Serialize buffer in terms of operations rather than state 
This is required because, after joining, we want to be able to refer
to operations that have happened prior to joining, which are not
captured by the state. There is probably a way of reconstructing operations
from the state, but that seems unnecessary and we've already talked about
wanting to have the server store operations rather than state once we start
persisting worktrees.
 2022-02-08 14:59:46 +01:00
Antonio Scandurra
dca974c7d4 Apply code actions remotely 2022-02-08 12:18:14 +01:00
Antonio Scandurra
d765e75bad Apply additional edits for completion when the buffer is remote 2022-02-02 16:29:13 +01:00
Antonio Scandurra
91e5c2dfac Broadcast completion triggers to remote participants 2022-02-02 14:07:41 +01:00
Antonio Scandurra
ed549e352f Start on requesting completions for remote buffers 2022-02-02 12:22:47 +01:00
Antonio Scandurra
96b66dcce1 Fix race condition when opening a buffer and getting a definition to it 2022-01-24 18:47:55 +01:00
Antonio Scandurra
245490f934 Implement Project::definition when the buffer is remote 2022-01-24 13:10:13 +01:00
Antonio Scandurra
f859d444ff Don't show conflict indicator on remote buffer after a reload 2022-01-24 10:17:36 +01:00
Nathan Sobo
da13d028a3 Send File protos as part of Buffer protos 
Use the File proto to build the File associated with the buffer rather than relying on the local entry.
 2022-01-22 22:19:04 -07:00
Nathan Sobo
e2a2073bdb Remove worktree_path from File struct 2022-01-22 14:29:36 -07:00
Max Brunsfeld
34e42c0c5f Remove worktree_id from buffer-related RPC messages 2022-01-21 16:23:39 -08:00
Antonio Scandurra
6e7e86e491 Remove weak worktrees from project when nobody references them 
Also, avoid showing them in the project panel as well as in the
contacts panel.
 2022-01-21 14:34:14 +01:00
Antonio Scandurra
6b1f989c2b Omit worktree id when emitting Event::DiskBasedDiagnosticsUpdated 
Sometimes we will have more than one worktree associated with the same
language server and in that case it's unclear which worktree id we should
report an event for.
 2022-01-20 10:13:27 +01:00
Antonio Scandurra
310def2923 Implement Buffer::format 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-12 18:01:20 +01:00
Antonio Scandurra
cf62d26ed8 Display a "Checking..." message when running disk-based diagnostics 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 15:03:19 +01:00
Nathan Sobo
2dbee1d914 Send diagnostic summaries to guests when they join the project 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-01-06 12:12:09 -07:00
Max Brunsfeld
8728d3292d Merge branch 'main' into polish-project-diagnostics 
Also fix false failure in ModelHandle::condition when parking is not forbidden.
 2022-01-05 10:53:18 -08:00
Antonio Scandurra
e56609cf0c Ensure prior, deferred selections don't override newer selections 2022-01-05 15:43:26 +01:00
Antonio Scandurra
870fa5f278 Serialize deferred operations 2022-01-05 11:52:41 +01:00
Antonio Scandurra
7bc8eb4f3d Fix compile errors and get serialization unit test passing 2022-01-05 10:29:29 +01:00
Max Brunsfeld
984e366c32 WIP - Serialize buffer in terms of its state, not its base text + ops 
The main reason for this is that we need to include information about
a buffer's UndoMap into its protobuf representation. But it's a bit
complex to correctly incorporate this information into the current
protobuf representation.

If we want to continue reusing `Buffer::apply_remote_edit` for
incorporating the historical operations, we need to either make
that method capable of incorporating already-undone edits, or
serialize the UndoMap into undo *operations*, so that we can apply
these undo operations after the fact when deserializing. But this is
not trivial, because an UndoOperation requires information about
the full offset ranges that were undone.
 2022-01-04 18:06:16 -08:00
Max Brunsfeld
d8b888c9cb Replicate diagnostic summaries 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-04 14:29:22 -08:00
Antonio Scandurra
508b9dc024 Rip out "diagnostic providers" 2022-01-04 16:32:17 +01:00
Nathan Sobo
e3ecd87081 WIP 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-23 11:24:35 -07:00
Antonio Scandurra
b9d1ca4341 Show only disk-based diagnostics in ProjectDiagnosticsEditor 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-23 16:47:54 +01:00
Max Brunsfeld
1544da887e Start work on preserving continuity of disk-based diagnostics 2021-12-22 12:52:50 -08:00
Max Brunsfeld
55910c0d79 Get the server and integration tests compiling 2021-12-20 16:30:29 -08:00
Max Brunsfeld
614ee4eac7 Send worktree info only when sharing worktree 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-20 11:36:59 -08:00
Antonio Scandurra
697e641e8e Get back to a compiling state for client 
This temporarily disables some tests and there are still some server-side
compiler errors.
 2021-12-20 16:08:34 +01:00
Max Brunsfeld
c41b958829 WIP - start restructuring collaboration around entire projects 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-17 22:00:39 -08:00
Max Brunsfeld
418a9a3d66 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
Antonio Scandurra
85674ba506 WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 16:46:35 +01:00
Antonio Scandurra
c984b39aaa Show remote collaborators' active selections 2021-12-13 11:38:38 +01:00
Nathan Sobo
4dd0752e80 More messy progress towards selections in editors 2021-12-11 00:29:34 -07:00
Antonio Scandurra
65711b2256 Remove anchor collections 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:28:27 +01:00
Nathan Sobo
b307a7e91d 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
c8ad5b68e0 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 Sobo
cd2c3c3606 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
9f29eeda03 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
0e51365770 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
Antonio Scandurra
78bbb83448 Assign diagnostics a group_id based on their related_information 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-04 14:52:34 +01:00
Max Brunsfeld
0e62ddbb65 Replicate diagnostics to remote buffers 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-01 15:28:37 -07:00
Nathan Sobo
1a92a19954 Remove Anchor from protocol 2021-10-26 12:04:04 -06:00
Nathan Sobo
6ba4af3e26 WIP: Start converting SelectionSet to use AnchorRangeMap 2021-10-22 13:19:19 -06:00
Nathan Sobo
401bdf0ba1 Simplify protocol messages related to selection sets 
This prepares the way to switch to using AnchorRangeMaps to store and transmit selection sets.
 2021-10-22 12:35:29 -06:00
Nathan Sobo
d5b60ad124 Rename zrpc to rpc 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-04 13:28:00 -06:00