mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1487 commits 697 branches 747 tags 245 MiB
Commit graph

1487 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Brunsfeld
412535420b Allow joining worktrees by clicking them in the people panel 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-21 12:21:03 -07:00
Max Brunsfeld
65a3af9bde Rerender list elements when they notify during events 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-21 12:20:32 -07:00
Antonio Scandurra
c90dc7235e Rename participants to guests in proto 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-21 18:30:49 +02:00
Antonio Scandurra
1bd6cd0978 Allow size to be specified in ImageStyle 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-21 18:27:26 +02:00
Antonio Scandurra
f8990b707a Style people panel 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-21 18:13:02 +02:00
Antonio Scandurra
4a723a1fb9 Merge branch 'main' into people-panel 2021-09-21 17:29:07 +02:00
Antonio Scandurra
7c10faeccf Use more concrete names for Store return values 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-21 17:21:30 +02:00
Antonio Scandurra
b9d46366ed Fix more failing/hanging unit tests 2021-09-21 16:20:20 +02:00
Antonio Scandurra
d381020a60 Add Server::{state,state_mut} to catch most deadlocks statically 2021-09-21 12:19:52 +02:00
Antonio Scandurra
0b11192fe3 Remove deadlock and make integration tests pass again 2021-09-21 11:58:31 +02:00
Antonio Scandurra
1954c6b00e Replace returned tuples with named structs in Store 2021-09-21 11:38:50 +02:00
Nathan Sobo
aa671f1041 Fix remaining compilation errors 2021-09-20 19:44:30 -06:00
Max Brunsfeld
5dfd4be174 WIP 2021-09-20 18:05:46 -07:00
Nathan Sobo
e6a0a46476
Merge pull request #167 from zed-industries/fix-language-selection 
Fix language selection when saving new buffers as a single-file worktree
 2021-09-20 17:51:10 -07:00
Max Brunsfeld
8b1a2c8cd2 Fix warnings in people_panel 2021-09-20 15:45:41 -07:00
Max Brunsfeld
8f578e7521 Maintain server state consistency when removing a connection 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-20 15:45:33 -07:00
Max Brunsfeld
8de9c362c9 Add .zed.toml 2021-09-20 15:44:42 -07:00
Max Brunsfeld
a068019d94 Add ZED_IMPERSONATE env var, for testing 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-20 15:44:28 -07:00
Max Brunsfeld
4ca5814470 Add missing people panel properties to base theme 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-20 13:38:59 -07:00
Nathan Sobo
4279451150 Fix language selection when saving new buffers as a single-file worktree 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-09-20 14:28:02 -06:00
Antonio Scandurra
23652f2ba6 Start on PeoplePanel::render 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-20 20:04:48 +02:00
Antonio Scandurra
cb2d8bac1d Use bullseye-slim for migration Dockerfile 
Closes #154

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-09-20 19:42:24 +02:00
Nathan Sobo
edfed001de
Merge pull request #159 from zed-industries/tabs-cleanup 
Clean up tabs styling
 2021-09-20 09:16:08 -07:00
Nathan Sobo
6f38cf5e51
Merge pull request #158 from zed-industries/highlight-new-files 
Set the language on new buffers when they are saved
 2021-09-20 09:15:58 -07:00
Antonio Scandurra
67946b7224 Add an integration test to verify collaborators are kept up to date 2021-09-20 16:40:31 +02:00
Antonio Scandurra
3d4dbf3140 Maintain collaborators in UserStore 2021-09-20 15:05:41 +02:00
Antonio Scandurra
32111092bd Turn UserStore into a model 2021-09-20 14:40:06 +02:00
Antonio Scandurra
6f2c8ffb00 Introduce a Client::subscribe method that doesn't need an entity 2021-09-20 14:14:07 +02:00
Antonio Scandurra
ae9fb65315 Fix integration tests 2021-09-20 12:52:13 +02:00
Antonio Scandurra
d8ea220acc Update collaborators as worktrees are opened/shared/closed 2021-09-20 12:29:32 +02:00
Nathan Sobo
1719d7da2a Suppress SVG loading errors in tests 2021-09-19 17:34:04 -07:00
Nathan Sobo
9e6c54ba0c Test language assignment when new buffers are saved 2021-09-19 17:33:46 -07:00
Nathan Sobo
af99d0ef42 Attempt to assign a language when a new buffer is saved 2021-09-18 11:46:22 -07:00
Nathan Sobo
c7e2b6dacb Expand the hit area area around tab close icons 2021-09-18 10:37:32 -07:00
Nathan Sobo
928779154e Tweak spacing so tab close buttons feel more balanced 2021-09-17 16:59:46 -07:00
Nathan Sobo
b5c76ccc95 Render close icons on all tabs when tab bar is hovered 2021-09-17 16:45:09 -07:00
Nathan Sobo
cab577406d
Merge pull request #153 from zed-industries/only-blink-local-cursors 
Only blink local cursors
 2021-09-17 17:32:38 -06:00
Nathan Sobo
9ec3af66b1
Merge pull request #150 from zed-industries/fix-rpc-deadlock 
Fix deadlock when handling incoming RPC messages
 2021-09-17 17:26:15 -06:00
Nathan Sobo
9691267dc8 Only blink local cursors 2021-09-17 16:17:47 -07:00
Nathan Sobo
ae9251a783
Merge pull request #149 from zed-industries/editor-style 
Specify UI editor fonts via the theme instead of the settings
 2021-09-17 17:12:19 -06:00
Nathan Sobo
9a9c8aec3f Fix deadlock when handling incoming RPC messages 
We need to drop the lock on the rpc::ClientState when handling an incoming messages in case those message handlers attempt to interact with the client and grab the lock.
 2021-09-17 16:12:03 -07:00
Nathan Sobo
42bf88b52a Base soft wrapping on TextStyle instead of Settings 2021-09-17 15:39:19 -07:00
Antonio Scandurra
f13af7dc59 WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-09-17 18:37:00 +02:00
Antonio Scandurra
f2825cceba Start on Presence as the backing model for the people panel 2021-09-17 16:18:41 +02:00
Antonio Scandurra
12fa309b7c Implement proto::GetCollaborators request 2021-09-17 14:36:50 +02:00
Max Brunsfeld
e3c0d6980c Switch to a new flow for advertising, sharing and joining worktrees 
Now, when you open a local worktree, we immediately send an `OpenWorktree` message
to the server, telling it the name of the folder that you've opened, and the names of all the
collaborators (based on a `.zed.toml` file). The server responds with a unique id for the
worktree.

When starting share this local worktree, you now include this previously-assigned id
in the `ShareWorktree` message.

When joining a worktree, there is no longer a need to provide an access token. The access
is controlled by the set of "collaborator logins" that were provided when the worktree
was initially opened by the host.
 2021-09-16 18:39:29 -07:00
Nathan Sobo
68039b9d48 Remove font_family and font_size from editor::Snapshot 
We'll rely on the style struct instead.
 2021-09-16 16:46:35 -06:00
Nathan Sobo
f13a3544fc Move editor layout code into element 
Now that most of the layout code is based on the EditorStyle struct, I think it makes more sense to put it in the element.
 2021-09-16 16:43:43 -06:00
Nathan Sobo
4f0c9a3e31 Build workspace editor TextStyle from font fields in settings 
We'll specify values in the theme but we'll only end up using the color for these editors.
 2021-09-16 14:43:19 -06:00
Nathan Sobo
a1f0693599 Specify full TextStyles in EditorStyle 2021-09-16 14:12:38 -06:00