yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
2503 Commits
Author SHA1 Message Date
Max BrunsfeldConradAntonio
 		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
Mikayla cdacfb23d0 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 c7afbc6123 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 c2a1635d7c Add missing logo_96 icon, fix a few incorrect paths 2023-09-15 14:21:33 -04:00
Max Brunsfeld b21b2dd959 Merge branch 'main' into chat-again 2023-09-15 11:06:39 -07:00
Nate Butler 0dc4475f7f Unify icons using multiple variants, remove all unused icons 2023-09-15 12:50:49 -04:00
Max Brunsfeld 27c098addd Merge branch 'main' into chat-again 2023-09-12 11:26:54 -07:00
Piotr Osiewicz c4e0bcb99e Z 1200/replace in buffer (#2922) 
This is still WIP, mostly pending styling. I added a pretty rudimentary
text field and no buttons whatsoever other than that. I am targeting a
Preview of 09.13, as I am gonna be on PTO for the next week.

I dislike the current implementation slightly because of `regex`'s crate
syntax and lack of support of backreferences. What strikes me as odd wrt
to syntax is that it will just replace a capture name with empty string
if that capture is missing from the regex. While this is perfectly fine
behaviour for conditionally-matched capture groups (e.g. `(foo)?`), I
think it should still error out if there's no group with a given name
(conditional or not).
Release Notes:

- Added "Replace" functionality to buffer search.
 2023-09-12 18:46:54 +02:00
Nathan Sobo 7695bbf44c Merge remote-tracking branch 'origin/main' into chat-again 2023-09-11 12:08:01 -06:00
Nathan Sobo 444d8662a5 Merge branch 'main' into storybook 2023-09-11 09:13:46 -06:00
Nathan Sobo b2968c2d11 Eliminate PaintContext 2023-09-11 09:00:59 -06:00
Nathan Sobo 950ac4fbc6 Eliminate LayoutContext 2023-09-11 08:47:00 -06:00
Conrad Irwin 10d1c76db1 Partially roll back refactoring 2023-09-08 16:49:50 -06:00
Conrad Irwin 6c6b04ad71 vim: Add ZZ and ZQ 
The major change here is a refactoring to allow controling the save
behaviour when closing items, which is pre-work needed for vim command
palette.

For zed-industries/community#1868
 2023-09-08 16:25:20 -06:00
Nathan Sobo 20da2b4621 Checkpoint 2023-09-08 16:25:10 -06:00
Max Brunsfeld 4172be8abf Create chat panel settings 2023-09-08 13:28:19 -07:00
Nathan Sobo 3221dc9e05 Merge branch 'main' into storybook 2023-09-08 14:18:44 -06:00
Antonio Scandurra 3dc9c29758 Make channel notes act as an editor to enable inline assistant 2023-09-08 11:20:49 +02:00
Nathan Sobo 4f7a2ff0ac Checkpoint 2023-09-06 14:16:15 -06:00
Max Brunsfeld ea7008f752 Overhaul search bar layout 
* Use a single row, instead of centering the search bar within a double-row toolbar.
* Search query controls on the left, navigation on the right
* Semantic is the final mode, for greater stability between buffer and project search.
* Prevent query editor from moving when toggling path filters
 2023-08-28 14:20:09 -07:00
Max Brunsfeld 0596c2f103 Format let-else statements 2023-08-25 10:11:32 -07:00
Max BrunsfeldandMikayla 90b815e2f9 Make channel notes view searchable and navigable via pane history 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 17:18:18 -07:00
Mikaylaandmax 6c78ea2f24 Add following into channel notes 
co-authored-by: max <max@zed.dev>
 2023-08-24 11:25:20 -07:00
MikaylaandMax 80c8940c36 Add buffer integration test 
Rearrange channel crate structure
Get channel buffer from database

co-authored-by: Max <max@zed.dev>
 2023-08-23 18:34:43 -07:00
Mikayla 7e5517ac29 Fix cursor and hover styles changing when dragging the mouse 2023-08-23 18:08:33 -07:00
Nathan Sobo ec9bebc7f4 Merge branch 'main' into divs 2023-08-22 16:35:56 -06:00
Mikayla 63477cf1f1 Remove semantic search UI 2023-08-17 17:28:09 -07:00
Mikayla 6a79716245 Add action button component for rendering the search options 2023-08-17 15:30:40 -07:00
Piotr OsiewiczandNate feba73d0a4 Move nav buttons to the left hand side of a tab bar. 
Co-authored-by: Nate <nate@zed.dev>
 2023-08-17 16:45:11 +02:00
Mikayla a37da1b636 Merge branch 'main' into project_search_design 2023-08-17 01:56:05 -07:00
Mikayla 736e83ef32 Fix dock resizing 2023-08-16 19:47:54 -07:00
KCaverly 4e3526b616 Merge branch 'main' of github.com:zed-industries/zed into project_search_design 2023-08-16 12:43:04 +01:00
Mikayla feb8444c32 Merge branch 'main' into collab-panel 2023-08-15 03:25:45 -07:00
Mikayla ec2490269d Add components example 
Re-arrange generics on mouse event handler
Add TypeTag struct for dynamically tagged components
 2023-08-15 03:06:43 -07:00
Max BrunsfeldandMikayla f32cb99c81 Fix clicking outside of modals to dismiss them 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 16:38:21 -07:00
Nathan SoboandMikayla Maki 64f61d293a Merge branch 'main' into taffy 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-08-14 13:50:21 -06:00