yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,009 Commits 5 Branches 0 Tags
90d94deaa69e510c3016e18734cfd33fa8b06d34
Commit Graph
25009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max BrunsfeldandNathan c90503de59 Start work on following in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:51:53 -08:00
Nate Butler a412df61e0 Remove double first item border in tabs 2023-12-04 20:13:52 -05:00
Max BrunsfeldandNathan da74d47191 Allow joining remote projects in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 17:06:08 -08:00
Max Brunsfeld 42aaec9d32 Revert "Decouple workspace from call (#3380)" 
This reverts commit 2df0a46cbe, reversing
changes made to 2704b92d2e.

Also, adjust new code that was written using the "call handler".
 2023-12-04 17:05:44 -08:00
Conrad Irwin ca8c696f92 Fix project panel context menu (#3495) 
Release Notes:

- N/A
 2023-12-05 00:51:07 +00:00
Conrad Irwin 861148cf24 Fix project panel context menu 2023-12-05 00:41:00 +00:00
Max BrunsfeldandNathan 8ec74dbaf5 Allow sharing projects 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Max BrunsfeldandNathan debcb52436 Start bringing back the current call section of the collab panel 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Conrad Irwin ac0cd14522 action dispatch target (#3494) 
- Ensure the candidate keybinding matches the correct context
- Fix context key matching
- I was soooo close
- Dispatch actions on focused node

[[PR Description]]

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
 2023-12-04 23:43:26 +00:00
Conrad Irwin 1f7391fd60 Remove cx param 2023-12-04 23:35:31 +00:00
Nate Butler ed019635f9 Draw border under tabs 2023-12-04 18:21:50 -05:00
Nate Butler c20de8223e Fix double border 2023-12-04 18:13:28 -05:00
Conrad Irwin a3ea5a944e Dispatch actions on focused node 
Allows us to implement context menu matching nicely
 2023-12-04 22:58:04 +00:00
Nate Butler 7989ec5072 Work on light theme, update tab 2023-12-04 17:54:37 -05:00
Marshall Bowers 6e16cdd0d7 Fix cursor styles not displaying properly (#3493) 
This PR fixes an issue where an element with a cursor style set would
not update the cursor when hovering over it.

Previously the cursor style would only appear by interacting with the
element in some way, for instance, by clicking on the element or by
having a `.hover` with some other style being applied.

Release Notes:

- N/A
 2023-12-04 16:40:53 -05:00
Conrad Irwin b8d12e8404 I was soooo close 2023-12-04 21:37:47 +00:00
Conrad Irwin 05f23386e3 Fix context key matching 
* You need to check all layers of the context stack
* When in command, the context should be based on where focus was (to
  match `available_actions`.
 2023-12-04 21:28:37 +00:00
Julia a3ccc3cd65 Zed2 outline view (#3490) 
Release Notes:

- N/A
 2023-12-04 15:56:53 -05:00
Marshall Bowers 10b17399ab Ensure the candidate keybinding matches the correct context 2023-12-04 15:53:38 -05:00
Julia d12fcc9b37 Avoid panic with outline highlight ranges 
Previously we were using a function in `editor` to combine syntax
highlighting and fuzzy match positions, it would operate on the full
text as put into the label. However we now have a method `ranges` on
`StringMatch` itself which operates on just the match text.

The outline view has some pretty specific behavior around path/normal
matches and how they are highlighted. So let's just give the match the
full text before it leaves the search function so it can freely index
 2023-12-04 15:37:34 -05:00
Marshall Bowers 886f309729 Merge branch 'main' into editor2_tests 2023-12-04 14:09:23 -05:00
Marshall Bowers 38c7241da1 Add support for copying diagnostic messages to the clipboard (#3489) 
This PR adds support for copying diagnostics messages to the clipboard.

This was already working, but we were missing implementations
clipboard-related methods in the `TestPlatform` that were causing the
tests to fail when the copying functionality was added.

Release Notes:

- N/A
 2023-12-04 14:08:05 -05:00
Nate Butler 3388fa87f8 Add temp nightly icon (#3488) 
[[PR Description]]

This will get updated – I need to get the template derek used for the
new preview icon. Sorry for the jank in advance.

Release Notes:

- N/A
 2023-12-04 12:57:22 -05:00
Nate Butler ff5abcb9aa Add temp nightly icon 2023-12-04 12:48:21 -05:00
Marshall Bowers b66aa7e918 Diagnostics style 2 (#3483) 
[[PR Description]]

Merge past diagnostic multibuffer style work + some extras

Release Notes:

- N/A
 2023-12-04 12:02:14 -05:00
Piotr Osiewicz 071aa38f4b Fix git test compilation 2023-12-04 17:57:43 +01:00
Marshall Bowers 1172e4c84b Format code 2023-12-04 11:57:10 -05:00
Marshall Bowers 9d6a58fdd1 Merge branch 'main' into diagnostics-style-2 2023-12-04 11:56:55 -05:00
Nate Butler 4a613511dc Style Grab Bag (#3487) 
[[PR Description]]

- Add pane empty state
- Ensure tab bar doesn't resize when a tab is added
- Make ButtonLike respect the style of a disabled button
- Add additional cursors to gpui2

Release Notes:

- N/A
 2023-12-04 11:55:26 -05:00
Nate ButlerandMarshall Bowers 5cd08b060b Mark copy button as incomplete 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:53:46 -05:00
Nate ButlerandMarshall Bowers 0677eb806f Update diagnostic style 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:50:26 -05:00
Julia adeb5a8f9f zed2: Port outline view 2023-12-04 11:44:32 -05:00
Nate ButlerandMarshall Bowers 199c84fe43 Fix ci error – Copy to clipboard isn't implemented in tests 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:41:31 -05:00
Nate ButlerandMarshall Bowers 2fce2d590d Clean up ButtonLike 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:32:25 -05:00
Nate ButlerandMarshall Bowers 5f90f74a45 Remove debug 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:32:14 -05:00
Nate ButlerandMarshall Bowers f765757bc5 Fix typos 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:28:22 -05:00
Piotr OsiewiczandAntonio 23167550d9 Add simulate_window_resize. 
Fixes up tests for movement in editor/scrolling.

Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-04 17:27:48 +01:00
Nate ButlerandMarshall Bowers 6bff060364 Add additional cursors to gpui2 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:20:41 -05:00
Nate Butler 66e53df7df Update toolbar left tool group 2023-12-04 11:14:59 -05:00
Piotr OsiewiczandAntonio cee41d0c23 Fix disparity between editor2 and edito1 wrt copilot completions. 
Fixes test test_copilot.

Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-04 16:39:40 +01:00
Piotr OsiewiczandAntonio d36e1e9a42 Fix up copilot2 test 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-04 16:26:34 +01:00
Piotr OsiewiczandAntonio f726c36d2a Defer activating Subscriptions that are invoked as a part of an effect. 
Fixes test test_edit_events.

Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-04 16:17:33 +01:00
Julia 9a434cfe87 Disable instance handshake in dev builds (#3485) 
It feels like every week or two someone hits this and is confused about
why the app isn't launch, been meaning to disable this in dev builds for
a while. This does mean that it'll be possible to hit the local DB lock
panic in a dev build if you run it multiple times but that is so rare
that it seems preferable

Release Notes:

- N/A
 2023-12-04 09:43:24 -05:00
Nate Butler 0767dae65a Ensure disabled buttons don't have interaction styles 2023-12-04 09:37:56 -05:00
Piotr OsiewiczandAntonio 1bff6b666c Fix up condition not checking the condition at the start. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-04 15:31:35 +01:00
Nate Butler 1a4d8f1826 Prevent tab bar from growing in height when a tab is added 2023-12-04 09:24:08 -05:00
Piotr Osiewicz b570d1d4df Revert "fix display map tests" 
This reverts commit cf2ab18bcd.
 2023-12-04 15:22:29 +01:00
Julia 04ccadad7f Disable instance handshake in dev builds 2023-12-04 09:16:04 -05:00
Nate Butler a7f3f63463 Update empty pane state 2023-12-04 09:13:00 -05:00
Piotr Osiewicz 869d43e636 uncomment and augment mouse_context_menu tests 2023-12-04 15:06:56 +01:00