oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,928 Commits 1 Branch 0 Tags
4eb609a954eec2aa320cbfd90f92e01cea2d3bc4
Commit Graph
214 Commits
Author SHA1 Message Date
Conrad Irwin 7e1d61d116 Merge branch 'main' into user-menu 2023-12-14 20:18:20 -07:00
Kirill Bulatov cfe7336519 Return include warnings toggle to the diagnostics panel 2023-12-14 10:00:31 +02:00
Conrad Irwin 3094cb749e Implement user menu 2023-12-13 14:14:03 -07:00
Conrad Irwin 9ff73d3a0a Port project_symbols 2023-12-13 13:43:39 -07:00
Julia 2e00da5a79 zed2 notification panel (#3603) 
Release Notes:

- N/A
 2023-12-12 18:04:47 -05:00
Julia 52e72d9648 Builds and runs 2023-12-12 13:07:17 -05:00
JuliaandAntonio Scandurra 44d40625fe Start changing Avatar to use URI 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-12-12 11:27:40 -05:00
Kirill Bulatov 27d6432c84 Rework the way project panel auto reveals entries 
* gitignored entries are never auto revealed
* `project_panel::auto_reveal_entries = true` settings entry was added,
setting it to `false` will disable the auto reveal
* `pane::RevealInProjectPanel` action was added that activates the project panel and reveals the entry it got triggered on (including the gitignored ones)
 2023-12-12 11:38:51 +02:00
Max Brunsfeld bb5fa6bc13 Implement welcome view in zed2. 
Still needs styling.
 2023-12-11 14:48:42 -08:00
Conrad Irwin 8ed642dc16 Clear out easy todo!()s 2023-12-11 11:00:55 -07:00
Conrad Irwin b66b4915cf Merge branch 'main' into vim2 2023-12-11 09:38:23 -07:00
Piotr Osiewicz ddbd5cf2cb Merge branch 'main' into project_search2 2023-12-11 16:47:48 +01:00
Antonio Scandurra e7c14dacae Show the correct outline when clicking on a breadcrumb 2023-12-11 14:01:16 +01:00
Conrad Irwin 4290c67b6a Restore namespace parameter to actions! 
This does not yet fix `derive(Action)`, but will conflict with a lot so
wanted to merge quickly.
 2023-12-09 15:18:31 -07:00
Max Brunsfeld c7d8169cab Get the chat panel wired up again 2023-12-08 12:31:07 -08:00
Conrad Irwin 32837d67be vim2 compiling (but mostly commented out) 2023-12-08 18:47:14 +00:00
Piotr Osiewicz b04838c23a WIP, search bar looks kinda okay 2023-12-07 16:26:40 +01:00
Joseph T. Lyons 2a68a6171a Remove remnants from conflict resolution (#3528) 
Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
 2023-12-06 23:44:49 -05:00
Joseph T. Lyons d2362d7f12 Merge branch 'main' into feedback-2 2023-12-06 23:16:54 -05:00
Marshall Bowers a4b271e063 Port recent_projects to Zed2 (#3525) 
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A
 2023-12-06 18:41:50 -05:00
Joseph T. Lyons 46c998ca8d WIP 2023-12-06 17:27:10 -05:00
Max BrunsfeldandNathan 89c8a7c242 Enable buffer font size adjustment in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-06 13:52:33 -08:00
Joseph T. Lyons f4c7b13397 temp 2023-12-06 16:15:44 -05:00
Joseph T. Lyons 4863c9ac25 WIP 2023-12-06 14:13:44 -05:00
Antonio Scandurra 14def2a1a3 Merge remote-tracking branch 'origin/main' into assistant-2 
# Conflicts:
#	crates/ui2/src/components/icon.rs
 2023-12-06 18:18:58 +01:00
Antonio Scandurra 7c9e2f6b7d Introduce app menus in zed2 (#3511) 
Release Notes:

- N/A
 2023-12-06 18:17:02 +01:00
Marshall BowersandAntonio 80c8fd1f4c 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 5f172a52a4 Load assistant panel 2023-12-06 14:23:05 +01:00
Antonio Scandurra 9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Antonio Scandurra 1de02cf6e5 Start wiring up assistant2 2023-12-06 12:51:25 +01:00
Nathan Sobo d2fe9f8f9b Merge remote-tracking branch 'origin/main' into app-menus 2023-12-05 16:54:38 -07:00
Nathan SoboandMarshall 65bb05af4c Merge main 
Co-Authored-By: Marshall <marshall@zed.dev>
 2023-12-05 16:47:13 -07:00
Nathan SoboandMarshall 82534b6612 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
Joseph T. Lyons 78e1c0f9c3 Implement feedback actions 
CopySystemSpecsIntoClipboard
RequestFeature
FileBugReport
 2023-12-05 15:48:41 -05:00
Marshall Bowers 8141f4fd86 Format code 2023-12-05 14:17:22 -05:00
Marshall Bowers e0ca7f844a Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Joseph T. Lyons ce8bdb354b Merge branch 'main' into feedback-2 2023-12-05 12:49:48 -05:00
Piotr OsiewiczandNate 412c6157b1 Port quick_action_bar to zed2 
Co-authored-by: Nate <nate@zed.dev>
 2023-12-05 17:33:35 +01:00
Kirill Bulatov 16b5d4b35c Port to gpui2 2023-12-05 16:13:39 +02:00
Max Brunsfeld ae6ddceb67 Enable more collab UI features (#3496) 
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following

Following only partially works, but the UI for following is now in
place.
 2023-12-04 18:01:11 -08:00
Max Brunsfeld 959b2961ff Revert "Decouple workspace from call (#3380)" 
This reverts commit 6da57cbc6e, reversing
changes made to 62b1843704.

Also, adjust new code that was written using the "call handler".
 2023-12-04 17:05:44 -08:00
Julia 5ab6874ae9 zed2: Port outline view 2023-12-04 11:44:32 -05:00
Julia dfe4fc4d0a Disable instance handshake in dev builds 2023-12-04 09:16:04 -05:00
Conrad Irwin 1da18ebe9a copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin 6a5b5f022d Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Conrad Irwin 2de6758443 +language_selector2 2023-12-01 21:23:20 -07:00
Nathan SoboandMax 0edd89a92f Bind CloseWindow and Open actions on workspace 
Co-Authored-By: Max <max@zed.dev>
 2023-12-01 16:17:48 -07:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Conrad Irwin 0441b4805a Show cursor position in status bar (#3464) 
Passes the compiler so it must work!

(though it doesn't show up until we fix pane focus)

Release Notes:

- N/A
 2023-11-30 16:40:42 -07:00
Nate ButlerJoseph T. LyonsConrad Irwin
 		8b7be8f614 Get feedback2 compiling 
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-11-30 16:07:54 -05:00