Commit Graph
1138 Commits
Author SHA1 Message Date
Conrad Irwin df648f3caf link to channel notes (#3167)
Release Notes:

- Add links to channel notes
2023-10-25 15:53:34 +02:00
Conrad Irwin 14e0931b00 link to channel notes 2023-10-24 19:48:31 +02:00
Conrad Irwin 4177fb207b Fix panic by disallowing multiple room joins 2023-10-20 14:34:25 -06:00
Conrad Irwin 9029a2807b Merge branch 'main' into guests 2023-10-17 09:54:17 -06:00
Conrad Irwin 61d349956e Allow pasting ZED urls in the command palette in development 2023-10-16 20:03:44 -06:00
Kirill Bulatov a92b61844a Make NodeRuntime non-static for prettier runner 2023-10-11 12:56:29 +03:00
Max Brunsfeld a202dafbba Fix inclusion of spurious views from other projects in FollowResponse 2023-10-10 15:40:40 -07:00
Conrad Irwin 36c95ae516 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Conrad Irwin b83ca0c3c4 code review 2023-10-09 19:06:55 -06:00
Max Brunsfeld c8032614f6 Log a warning when leader activates an unknown view 2023-10-09 14:29:45 -07:00
Max Brunsfeld 65e37b561b Ensure there's only one leader per pane 2023-10-09 13:32:38 -07:00
Conrad Irwin f98ab0f1e3 Focus the currently active project if there is one
(also consider your own projects in "most_active_projects")
2023-10-09 12:05:26 -06:00
Conrad Irwin 925afa67d0 Fix ./script/bundle to allow passing key 2023-10-09 08:59:25 -06:00
Conrad Irwin f867bbf5c4 More progress and some debug logs to remove 2023-10-06 16:48:29 -06:00
Conrad Irwin 30747d758d Make joining on boot work 2023-10-06 16:11:45 -06:00
Max Brunsfeld a829cd1f89 Remove workspace -> channel dependency 2023-10-06 14:19:25 -07:00
Conrad Irwin 1bad574967 TEMP 2023-10-06 13:47:35 -06:00
Max Brunsfeld 2c0034830d Fix panic when immediately closing a window while opening paths 2023-10-05 16:21:14 -07:00
Conrad Irwin 9da086cfce Code to allow opening zed:/channel/1234
Refactored a bit how url arguments are handled to avoid adding too much
extra complexity to main.
2023-10-05 14:57:45 -07:00
Max Brunsfeld d480074555 Fix bugs in handling mutual following
* Propagate all of leader's views to a new follower, even if those views
  were originally created by that follower.
* Propagate active view changes to followers, even if the active view is
  following that follower.
* Avoid redundant active view updates on the client.
2023-10-05 13:28:46 -07:00
Max Brunsfeld 6f6460a858 Merge branch 'main' into channel-changes 2023-10-03 17:52:28 -07:00
Max BrunsfeldandMikayla a6eaeed919 Specify uuid crate in the root Cargo.toml
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-03 17:39:24 -07:00
Conrad Irwin cbbbcdbf79 Refactor to remove toggle_follow 2023-10-02 16:51:02 -06:00
Conrad Irwin 484ea0e8ee Fix bug in following
Prior to this change you could only follow across workspaces when you
were heading to the first window.
2023-10-02 16:29:42 -06:00
Conrad Irwin 19bb02c50e Ensure notifications are dismissed
Before this change if you joined a project without clicking on the
notification it would never disappear.

Fix a related bug where if you have more than one monitor, the
notification was only dismissed from one of them.
2023-10-02 11:01:21 -06:00
Conrad IrwinandMax Brunsfeld a53a022583 Make following more good
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-09-29 17:59:19 -06:00
Conrad IrwinandMax Brunsfeld 7cda6fa956 Show host in titlebar
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-09-29 16:37:00 -06:00
Max Brunsfeld f0d5356ad9 Fix active view update when center pane is not focused 2023-09-29 14:37:28 -07:00
Max Brunsfeld 8911694c15 Update active view when activating a window 2023-09-29 14:12:51 -07:00
Max Brunsfeld 951ba848a2 Fix bug in follower updates for non-project items 2023-09-29 14:09:14 -07:00
Max Brunsfeld f7363fd4bd Remove uneeded Workspace::project_remote_id_changed method 2023-09-29 08:54:23 -07:00
Max Brunsfeld 447a8ffa81 Introduce a WorkspaceStore for handling following 2023-09-28 18:58:52 -07:00
Max Brunsfeld 7f4cce9a99 🎨 Workspace::leader_updated 2023-09-28 17:13:10 -07:00
Max Brunsfeld 0729b740c9 Merge branch 'main' into allow-following-outside-of-projects 2023-09-28 11:58:28 -07:00
Max BrunsfeldandConrad 13f4957210 Rename color_index to participant_index
Co-authored-by: Conrad <conrad@zed.dev>
2023-09-28 11:37:22 -07:00
0976bdc78d Assign unique color indices to room participants, use those instead of replica_ids
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
2023-09-28 11:06:09 -07:00
Conrad Irwin cbed65851d fix tests 2023-09-27 17:02:47 -06:00
Conrad Irwin ba31f4a531 Don't prompt to save unchanged files 2023-09-27 16:07:35 -06:00
Conrad Irwin c9da617730 Add SwapPaneInDirection
Add keybindings for vim (and non-vim)
2023-09-26 22:00:51 -06:00
Piotr Osiewicz 16d9385848 workspace: change save prompt for unnamed buffers (#3037)
Release Notes:
- N/A
2023-09-26 19:35:10 +02:00
Conrad Irwin 7506450fb2 Revert "Revert "workspace: Improve save prompt. (#3025)""
This reverts commit 16bd80371b.
2023-09-25 12:18:03 -06:00
Max Brunsfeld e23d0b8c80 Allow following into channel notes regardless of project 2023-09-21 17:12:59 -07:00
Max Brunsfeld 32bbc58a34 Start work on allowing following without a shared project 2023-09-21 13:14:15 -07:00
Conrad Irwin 6e501de8e2 Code review changes 2023-09-20 21:29:45 -06:00
Conrad Irwin 8c9233436d Fix save related tests, and refactor saves again 2023-09-20 20:44:42 -06:00
Conrad Irwin 376f80d966 Add NewFileInDirection 2023-09-20 20:44:26 -06:00
Conrad Irwin e1be209367 Merge Workspace::save_item into Pane::save_item
These methods were slightly different which caused (for example) there
to be no "Discard" option in the conflict case at the workspace level.

To make this work, a new SaveBehavior (::PromptForNewPath) was added to
support SaveAs.
2023-09-20 20:44:26 -06:00
Conrad Irwin ee0a229996 Add vim-specific interactions to command
This mostly adds the commonly requested set (:wq and friends) and
a few that I use frequently
:<line> to go to a line number
:vsp / :sp to create a split
:cn / :cp to go to diagnostics
2023-09-20 20:44:26 -06:00
Mikayla Maki 9376900ab1 Add UI/UX for moving channels (#2976)
TODO:

- [x] Add drag and drop
- [x] Polish up in-flight decisions.
- [x] Fix chat panel panic
- [x] Add nice hover effect highlighting the matching ones
- [x] Fix and test keyboard

Release Notes:

- N/A
2023-09-19 17:56:22 -07:00
Mikayla 2d6ee42ce3 Improve drag and drop to look and feel better
WIP: Change rendering of drag and drop based on alt-modifier
2023-09-19 14:48:34 -07:00