Commit Graph
1074 Commits
Author SHA1 Message Date
Antonio Scandurra 511cbaa2bd Version the zrpc protocol using a X-ZRPC-VERSION header 2021-09-23 15:35:35 +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 ScandurraandNathan Sobo 6120ce3747 Move people panel up
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 17:09:24 +02:00
Antonio ScandurraandNathan Sobo 23d77e2b9f Refine people panel styling
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 17:02:50 +02:00
Antonio ScandurraandNathan Sobo 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 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 BrunsfeldandNathan Sobo 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 BrunsfeldandNathan Sobo 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 BrunsfeldandNathan Sobo 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 BrunsfeldandNathan Sobo 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
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
Antonio ScandurraandNathan Sobo c90dc7235e Rename participants to guests in proto
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 18:30:49 +02:00
Antonio ScandurraandNathan Sobo 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 ScandurraandNathan Sobo 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 b9d46366ed Fix more failing/hanging unit tests 2021-09-21 16:20:20 +02:00
Max Brunsfeld 5dfd4be174 WIP 2021-09-20 18:05:46 -07:00
Max Brunsfeld 8b1a2c8cd2 Fix warnings in people_panel 2021-09-20 15:45:41 -07:00
Max BrunsfeldandNathan Sobo 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 BrunsfeldandNathan Sobo 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 SoboandMax Brunsfeld 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
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
Nathan Sobo edfed001de Merge pull request #159 from zed-industries/tabs-cleanup
Clean up tabs styling
2021-09-20 09:16:08 -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
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 9691267dc8 Only blink local cursors 2021-09-17 16:17:47 -07: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 ScandurraandNathan Sobo 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
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
Max Brunsfeld 176ca9086e Rename OpenWorktree message to JoinWorktree
We'll repurpose the name 'OpenWorktree' for opening a local
worktree while signed in, and advertising the open status to
the worktree's collaborators.
2021-09-16 12:57:19 -07:00
Nathan Sobo c21b754c4c Make placeholder text style optional 2021-09-16 13:23:42 -06:00
Nathan Sobo 606aa148a6 Require a build_style callback to be passed to Editor on construction
We're going to use this to control the text style, so it really doesn't make sense to allow an editor to be constructed without it.
2021-09-16 13:20:12 -06:00