Commit Graph
25009 Commits
Author SHA1 Message Date
Marshall Bowers 180e597117 v0.117.x dev 2023-12-06 12:03:59 -05:00
Antonio ScandurraandMarshall 7d11d8653d Make Node::context optional as well
This was an oversight in f29f81d.

Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-06 18:02:45 +01:00
Antonio Scandurra a19fc86091 Make more menu-related platform methods no-ops 2023-12-06 17:57:18 +01:00
Antonio ScandurraandMarshall 6ff7f2e035 Add key context to ConversationEditor
Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-06 17:56:05 +01:00
Marshall BowersandAntonio 7ef93fefdd Fix toolbar not appearing for initial pane (#3512)
This PR fixes an issues where the toolbar would not appear for the
center pane when Zed2 initially loads.

We resolved this by adding a call to initialize the center pane when the
workspace is initialized

Due to changes in the way subscriptions work we can on longer observe an
event that is emitted in the same event cycle in which the subscription
is created.

Because of this we need to explicitly initialize the center pane, as it
won't get performed by the subscription.

Release Notes:

- N/A

---------

Co-authored-by: Antonio <antonio@zed.dev>
2023-12-06 11:54:59 -05:00
Antonio Scandurra ef56033f7f Make TestPlatform::set_menus a no-op 2023-12-06 17:45:59 +01:00
Antonio ScandurraandMarshall f3db0b8e0a Take a Keymap when setting app menus
For a brief period on this branch, we were taking a `DispatchTree`. Doing so
resulted in more accurate key bindings but it meant that we would have had to
recompute the app menus every time the key context changed.

We decided to err on the side of keeping things simple and work in the same
way they worked back in zed1.

Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-06 17:26:54 +01:00
Marshall Bowers 2191cb7f3b Factor out LabelLike to share common label styles (#3510)
This PR factors out a new `LabelLike` component to share common styles
between the `Label` and `HighlightedLabel` components.

Release Notes:

- N/A
2023-12-06 11:17:12 -05:00
Nate Butler 6625197f45 Merge branch 'main' into update-pickers 2023-12-06 11:10:30 -05:00
Nate Butler c8572a4b6e Update file finder style 2023-12-06 11:10:27 -05:00
Nate Butler 7fa50c00ed Extend ui prelude 2023-12-06 11:07:46 -05:00
Nate Butler 1fbeca9451 WIP update picker style 2023-12-06 11:01:22 -05:00
Piotr OsiewiczandAntonio 225183bae9 Let WindowContext::dispatch_action handle global actions
Co-authored-by: Antonio <antonio@zed.dev>
2023-12-06 16:52:52 +01:00
Nate Butler e35178be27 Merge branch 'main' into update-pickers 2023-12-06 10:48:50 -05:00
Marshall Bowers f929473b81 Use specified color for non-highlighted text in HighlightedLabel (#3509)
This PR fixes an issue where the specified color for a
`HighlightedLabel` was not respected as the default color for
non-highlighted text.

Release Notes:

- N/A
2023-12-06 10:41:49 -05:00
Piotr Osiewicz 065df46d32 Merge branch 'main' into app-menus 2023-12-06 16:34:55 +01:00
Antonio Scandurra df706bd855 WIP 2023-12-06 16:34:07 +01:00
Antonio Scandurra 288dedded6 Copilot2 (#3498)
Add hidden_action_types to CommandPaletteFilter.
WindowContext.available_actions now returns global actions as well.

Release Notes:

- N/A
2023-12-06 16:31:30 +01:00
Piotr OsiewiczandAntonio f29f81df7c Wire up global actions
Added an ephemeral root node so that even if there's no window/focused handle we still have something to dispatch to.

Co-authored-by: Antonio <antonio@zed.dev>
2023-12-06 16:15:53 +01:00
Kirill Bulatov 23be97ce94 Disable bundling for main commits (#3508)
(in the first commit, this PR autoformats both yaml files with Zed's
default prettier, to be able to edit those in prettier from now on)

Bundling is a relatively long procedure, and now we have nightly builds
for zed2 (with their own lifecycle, CI file and tag for triggering it
from non-main branch).

Hence, bundling zed1 and/or zed2 by default looks wasteful and
unnecessary, disable them by default.
There's still a `run-build-dmg` label that enables bundling for any PR
needed, and a `startsWith(github.ref, 'refs/tags/v')` check in the CI
run to keep the releases working.

Release Notes:

- N/A
2023-12-06 17:08:48 +02:00
Nate Butler e0a2b108ca Add debugging colors to styled_ext 2023-12-06 10:08:26 -05:00
Kirill Bulatov cbc55cf8a9 Do not bundle Zed on main branch commits 2023-12-06 16:58:49 +02:00
Kirill Bulatov 62ec474a88 Format the CI file with Zed's default prettier 2023-12-06 16:58:18 +02:00
Piotr Osiewicz aac14f5c41 Merge branch 'main' into copilot2 2023-12-06 15:13:13 +01:00
Antonio Scandurra 4411c839cd Load assistant panel 2023-12-06 14:23:05 +01:00
Piotr Osiewicz 9e4c4adc51 Remove old UI code, remove dbg! 2023-12-06 14:16:19 +01:00
Piotr Osiewicz eaeea7d16e Barebones Copilot prompt
Filter out sign in/sign out when user is signed in/not signed in
2023-12-06 14:14:18 +01:00
Piotr Osiewicz 633224ed26 Signed out state is looking good 2023-12-06 13:00:57 +01:00
Antonio Scandurra c9300e2384 Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Antonio Scandurra 2be86deeaf Start wiring up assistant2 2023-12-06 12:51:25 +01:00
Antonio Scandurra 13b51ae787 WIP 2023-12-06 12:12:28 +01:00
Mikayla a526002145 Add more debugging 2023-12-05 17:31:33 -08:00
Marshall Bowers 69dd4f50b8 Add missing semicolon 2023-12-05 20:24:43 -05:00
Marshall Bowers 9ecb4b59ae Wire up NewWindow action 2023-12-05 20:24:01 -05:00
Marshall Bowers c7a789e1e2 Wire up NewFile action 2023-12-05 20:21:35 -05:00
Mikayla ea0d8571f9 Add back the main structure 2023-12-05 16:52:29 -08:00
Nathan Sobo ec8cd7dccb Merge remote-tracking branch 'origin/main' into app-menus 2023-12-05 16:54:38 -07:00
Nathan Sobo 2fa759e239 Fix cmd-n in the project panel context menu and bind global workspace actions (#3491)
This PR binds the `workspace::NewFile` action only in the `Workspace`
context. It previously was bound globally, which caused us to hijack the
`cmd-n` binding when the context menu was visible in the project panel.
In the process, we also added some other global workspace actions and
move some other global bindings to be bound only on `Pane` and
`Workspace`.

Release Notes:

- N/A
2023-12-05 16:52:39 -07:00
Nathan SoboandMarshall 76e6f84910 Merge main
Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-05 16:47:13 -07:00
Nathan SoboandMarshall a209ea2cf9 Get app menus basically working
- Everything is still disabled when there is no active window.

Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-05 16:37:01 -07:00
0cb43ab7de Add AppContext::dispatch_action and use it for app menu actions
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-12-05 15:49:06 -07:00
Max Brunsfeld e903a96401 Implement following and more collaboration panel features in zed2 (#3504) 2023-12-05 13:59:15 -08:00
Joseph T. Lyons 5dd0d826c8 temp 2023-12-05 16:37:43 -05:00
Marshall BowersandNate Butler 4faf00c9f6 Update breadcrumb rendering (#3505)
This PR updates the rendering of the breadcrumb.

Release Notes:

- N/A

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
2023-12-05 16:34:21 -05:00
Max Brunsfeld a2f0cffc57 Make Window::on_next_frame work in tests 2023-12-05 13:34:12 -08:00
Max Brunsfeld d03a77bbf4 Get following working
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
2023-12-05 12:57:23 -08:00
Joseph T. Lyons 778eff98cb Remove unused code 2023-12-05 15:53:52 -05:00
Joseph T. Lyons b41b752d04 Implement feedback action
OpenZedCommunityRepo
2023-12-05 15:52:02 -05:00
Joseph T. Lyons be231c3efd Implement feedback actions
CopySystemSpecsIntoClipboard
RequestFeature
FileBugReport
2023-12-05 15:48:41 -05:00
Nathan Sobo ef1311ab96 Start on app menus 2023-12-05 13:17:59 -07:00