Commit Graph

1508 Commits

Author SHA1 Message Date
Antonio Scandurra
e32f1f8b80 Create test_app_state with FakeFs instead of RealFs
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-23 18:17:49 +02:00
Antonio Scandurra
2352725c58 💄
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-23 17:32:37 +02:00
Antonio Scandurra
374b05a379 Display warning in titlebar when Zed is out-of-date 2021-09-23 15:36:32 +02:00
Antonio Scandurra
511cbaa2bd Version the zrpc protocol using a X-ZRPC-VERSION header 2021-09-23 15:35:35 +02:00
Antonio Scandurra
a1ca507498
Merge pull request #174 from zed-industries/tweak-word-boundaries
Adjust word-boundary motion, treating whitespace more like other editors
2021-09-23 09:09:49 +02:00
Max Brunsfeld
1402f842f7 Adjust word-boundary motion, treating whitespace more like other editors
Also, fix the behavior of 'delete_to_{prev,next}_word_boundary' commands when
there are non-empty selections.
2021-09-22 17:00:57 -07:00
Max Brunsfeld
84c7064699 Fix bytes/chars error in Editor::paste
Fixes #156
2021-09-22 14:36:30 -07:00
Antonio Scandurra
796139e4ab
Merge pull request #170 from zed-industries/people-panel
People panel
2021-09-22 17:10:50 +02:00
Antonio Scandurra
6120ce3747 Move people panel up
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 17:09:24 +02:00
Antonio Scandurra
23d77e2b9f Refine people panel styling
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 17:02:50 +02:00
Antonio Scandurra
257744ac36 Fix resolution of extends directive when children are unresolved
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 16:04:44 +02:00
Antonio Scandurra
3e65fb4267 Leave joined worktrees when guest loses connection 2021-09-22 15:33:13 +02:00
Antonio Scandurra
b47422ae28 Maintain connections correctly when leaving or unsharing worktrees 2021-09-22 15:24:11 +02:00
Antonio Scandurra
78fbd1307a Remove remote worktrees and close their buffers when host unshares 2021-09-22 14:50:32 +02:00
Antonio Scandurra
d67227177a Allow leaving worktree while opening a buffer 2021-09-22 12:38:31 +02:00
Max Brunsfeld
c24d439eb1 Allow clicking on worktrees to share, unshare, join, and leave
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 16:27:57 -07:00
Max Brunsfeld
41a1514cec Add chainable Element methods for common containers
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 15:24:14 -07:00
Max Brunsfeld
b576397610 Vertically align avatars with labels in people panel
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 15:09:31 -07:00
Max Brunsfeld
6d0b84a467 💄 2021-09-21 13:48:34 -07:00
Max Brunsfeld
729896d32a Style worktree rows in people panel
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 13:35:00 -07:00
Max Brunsfeld
9352c4e076 Ignore empty ZED_IMPERSONATE env var 2021-09-21 13:29:06 -07:00
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