mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
12588 commits 770 branches 798 tags 246 MiB
Commit graph

1133 commits

Author SHA1 Message Date
Conrad Irwin
6ffbc3a0f5 Allow pasting ZED urls in the command palette in development 2023-10-16 20:03:44 -06:00
Max Brunsfeld
96d60eff23 Fix inclusion of spurious views from other projects in FollowResponse 2023-10-10 15:40:40 -07:00
Conrad Irwin
d4ef764305 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Conrad Irwin
8922437fcd code review 2023-10-09 19:06:55 -06:00
Max Brunsfeld
90b54a45e8 Log a warning when leader activates an unknown view 2023-10-09 14:29:45 -07:00
Max Brunsfeld
ca735ad70f Ensure there's only one leader per pane 2023-10-09 13:32:38 -07:00
Conrad Irwin
abfb4490d5 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
5dbda70235 Fix ./script/bundle to allow passing key 2023-10-09 08:59:25 -06:00
Conrad Irwin
f6bc229d1d More progress and some debug logs to remove 2023-10-06 16:48:29 -06:00
Conrad Irwin
63a230f92e Make joining on boot work 2023-10-06 16:11:45 -06:00
Max Brunsfeld
f8ca86c6a7 Remove workspace -> channel dependency 2023-10-06 14:19:25 -07:00
Conrad Irwin
b58c42cd53 TEMP 2023-10-06 13:47:35 -06:00
Max Brunsfeld
8fafae2cfa Fix panic when immediately closing a window while opening paths 2023-10-05 16:21:14 -07:00
Conrad Irwin
13192fa03c
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
438dd42f7d 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
95342c8c33 Merge branch 'main' into channel-changes 2023-10-03 17:52:28 -07:00
Max Brunsfeld
af09861f5c 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
528fa5c57b Refactor to remove toggle_follow 2023-10-02 16:51:02 -06:00
Conrad Irwin
27d784b23e 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
39af2bb0a4 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 Irwin
92bb9a5fdc Make following more good 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-09-29 17:59:19 -06:00
Conrad Irwin
1cfc2f0c07 Show host in titlebar 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-09-29 16:37:00 -06:00
Max Brunsfeld
948871969f Fix active view update when center pane is not focused 2023-09-29 14:37:28 -07:00
Max Brunsfeld
afd293ee87 Update active view when activating a window 2023-09-29 14:12:51 -07:00
Max Brunsfeld
973f03e73e Fix bug in follower updates for non-project items 2023-09-29 14:09:14 -07:00
Max Brunsfeld
026b3a1d0f Remove uneeded Workspace::project_remote_id_changed method 2023-09-29 08:54:23 -07:00
Max Brunsfeld
ca0a4bdf8e Introduce a WorkspaceStore for handling following 2023-09-28 18:58:52 -07:00
Max Brunsfeld
5a15692589 🎨 Workspace::leader_updated 2023-09-28 17:13:10 -07:00
Max Brunsfeld
a8b35eb8f5 Merge branch 'main' into allow-following-outside-of-projects 2023-09-28 11:58:28 -07:00
Max Brunsfeld
0f39b63801 Rename color_index to participant_index 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-09-28 11:37:22 -07:00
Max Brunsfeld
545b5e0161 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
6cebcac805 fix tests 2023-09-27 17:02:47 -06:00
Conrad Irwin
3573896fe0 Don't prompt to save unchanged files 2023-09-27 16:07:35 -06:00
Conrad Irwin
37b6e1cbb7 Add SwapPaneInDirection 
Add keybindings for vim (and non-vim)
 2023-09-26 22:00:51 -06:00
Piotr Osiewicz
e263805847
workspace: change save prompt for unnamed buffers (#3037) 
Release Notes:
- N/A
 2023-09-26 19:35:10 +02:00
Conrad Irwin
359847d047 Revert "Revert "workspace: Improve save prompt. (#3025)"" 
This reverts commit 5c75450a77.
 2023-09-25 12:18:03 -06:00
Max Brunsfeld
4ffa167256 Allow following into channel notes regardless of project 2023-09-21 17:12:59 -07:00
Max Brunsfeld
f34c6bd1ce Start work on allowing following without a shared project 2023-09-21 13:14:15 -07:00
Conrad Irwin
32f8733313 Code review changes 2023-09-20 21:29:45 -06:00
Conrad Irwin
7a7ff4bb96 Fix save related tests, and refactor saves again 2023-09-20 20:44:42 -06:00
Conrad Irwin
6ad1f19a21 Add NewFileInDirection 2023-09-20 20:44:26 -06:00
Conrad Irwin
88a32ae48d 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
ea3a1745f5 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
e37373a636
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
f3b91082a6
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
Mikayla
d46816589e
Added 'open in terminal' action to the project panel context menu 
Also slightly re-arranged the project panel context menu
 2023-09-15 21:33:22 -07:00
Nate Butler
0aff0c105d
Add missing logo_96 icon, fix a few incorrect paths (#2977) 
🙈 I missed a few

Thanks @maxbrunsfeld / @mikayla-maki
 2023-09-15 14:57:40 -04:00
Nate Butler
9a4ecf0f88 Add missing logo_96 icon, fix a few incorrect paths 2023-09-15 14:21:33 -04:00
Max Brunsfeld
6c3fd2a687 Merge branch 'main' into chat-again 2023-09-15 11:06:39 -07:00
Nate Butler
24974ee2fa Unify icons using multiple variants, remove all unused icons 2023-09-15 12:50:49 -04:00