oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,073 Commits 1 Branch 0 Tags
a3623ec2b84ea09f7901faf1d52f599c29884618
Commit Graph
183 Commits
Author SHA1 Message Date
Mikaylaandmax a3623ec2b8 Add renames 
co-authored-by: max <max@zed.dev>
 2023-08-09 12:20:48 -07:00
Mikayla 99daa73325 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Mikayla d00f6a490c Fix a bug where channel invitations would show up in the channels section 
Block non-members from reading channel information
WIP: Make sure Arc::make_mut() works
 2023-08-08 11:47:13 -07:00
Nathan Sobo 49f1f1c6c2 Remove window when closing workspace in test 2023-08-08 09:13:17 -06:00
Nathan Sobo f0da6b05fd Remove TestAppContext::add_view 
Instead, we now call this on window handles.
 2023-08-07 22:46:48 -06:00
Nathan Sobo f2be3181a9 Move window-related methods from TestAppContext to AnyWindowHandle 2023-08-07 20:23:04 -06:00
Nathan Sobo 486f5bc6ca Get compiling 2023-08-07 19:08:58 -06:00
Max Brunsfeld c537cf2a57 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Nathan Sobo adc50469ff WIP 2023-08-06 12:45:31 -06:00
Max BrunsfeldandMikayla 2ccd153233 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max BrunsfeldandMikayla 87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max Brunsfeld a2486de045 Don't expose channel admin actions in UI if user isn't admin 2023-08-04 10:24:46 -07:00
Max Brunsfeld 7a04ee3b71 Start work on exposing which channels the user has admin rights to 2023-08-03 18:31:00 -07:00
Nathan Sobo d3c1966d96 WIP: Return WindowHandle<V: View> from AppContext::add_window (#2820) 
Instead of returning a usize for the window id, I'm instead returning a
`WindowHandle<V: View>` where `V` is the type of the window's root view.
@as-cii helped me with a cool technique using generic associated types
where methods on `WindowHandle` can return either T or Option<T>
depending on the `BorrowWindowContext::Result` associated type.

Some example usage...

```rs
let window = cx.add_window(|cx| MyView::new(cx));
let my_view = window.root(cx); // If cx is TestAppContext, returns MyView. Otherwise returns Option<MyView>, because the window could be closed.
```


This isn't insanely beneficial on its own, but I think it will help
clean up our testing story. I'm planning on making `window` more useful
in tests for laying out elements, etc.

- [x] Rework tests that call `add_window` 😅 to expect only a window in
return.
- [x] Get tests passing
- [x] 🚬  test
 2023-08-03 18:45:51 -06:00
Nathan Sobo 485c0a482e Don't refcount window handles 2023-08-03 17:11:47 -06:00
Max BrunsfeldandMikayla a7e883d956 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Mikayla Maki 30e1bfc872 Add the ability to jump between channels while in a channel 2023-08-02 17:13:09 -07:00
Max Brunsfeldandmikayla fca8cdcb8e Start work on rendering channel participants in collab panel 
Co-authored-by: mikayla <mikayla@zed.dev>
 2023-08-02 15:09:37 -07:00
Nathan Sobo 884cee6dfd Get tests compiling returning WindowHandle<V: View> from add_window 2023-08-02 14:05:03 -06:00
Max Brunsfeld a9de73739a WIP 2023-08-02 12:15:06 -07:00
Max Brunsfeld 7d97d1dd8d Merge branch 'main' into collab-panel 2023-08-02 09:20:53 -07:00
Max Brunsfeld a127b0d3e6 Fix warnings surfaced in Rust 1.71 2023-08-02 09:19:23 -07:00
Mikayla Makiandmax 74437b3988 Add remove channel method 
Move test client fields into appstate and fix tests

Co-authored-by: max <max@zed.dev>
 2023-08-01 16:06:27 -07:00
Max Brunsfeld 7954b02819 Start work on displaying channels and invites in collab panel 2023-07-31 18:00:14 -07:00
Mikayla Makiandmax 003a711dea Add room creation from channel join 
co-authored-by: max <max@zed.dev>
 2023-07-31 16:54:12 -07:00
Mikayla Makiandmax 92fa879b0c Add ability to join a room from a channel ID 
co-authored-by: max <max@zed.dev>
 2023-07-31 16:53:57 -07:00
Max BrunsfeldandMikayla 4b94bfa045 Set up basic RPC for managing channels 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-07-28 17:05:56 -07:00
Mikayla Maki 0998440bdd implement recursive channel query 2023-07-28 13:24:43 -07:00
Mikayla Maki 15631a6fd5 Add channel_tests.rs 2023-07-28 13:24:43 -07:00
Alex ViscreanuandMikayla Maki c7669317ec feat(workspace): allow alternative actions to open files and symbols in split 
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2023-07-14 21:49:15 +02:00
Joseph T. LyonsandMax Brunsfeld 98a0113ac3 Add call events 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-07-11 13:58:55 -04:00
Piotr Osiewicz abf3b4a54e chore: Replace lazy_static Mutex with const. (#2693) 
Mutex::new() is const-stable as of Rust 1.63.

Release Notes:
- N/A
 2023-07-07 15:07:12 +02:00
Kirill Bulatov e6ec0af743 Remove redundant hint kind checks in tests 2023-07-06 23:27:25 +03:00
Kirill Bulatov 652909cdba Post-rebase fixes 2023-06-29 22:39:33 +03:00
Kirill Bulatov 0972766d1d Add more hint tests 2023-06-29 22:39:18 +03:00
Kirill Bulatov 667b70afde Move hint settings on the language level 2023-06-29 22:39:18 +03:00
Kirill Bulatov 2c54d926ea Test inlay hint cache 2023-06-29 22:39:18 +03:00
Kirill Bulatov 096bad1f73 Revert useless changes, simplify 2023-06-29 22:25:50 +03:00
Kirill Bulatov acef5ff195 Query hints when editors gets open and visible 2023-06-29 22:25:50 +03:00
Kirill Bulatov 4d4544f680 Split excerpts into mutliple ranges for inlay hint queries 2023-06-29 22:25:49 +03:00
Kirill Bulatov 2c7900e11b Use excerpt visible range in query filtering 2023-06-29 22:25:49 +03:00
Kirill Bulatov 83b3a914bc Support better inlay cache parallelization 2023-06-29 22:25:49 +03:00
Kirill Bulatov 890b164278 Forward inlay hint refresh requests to clients, test coop inlay hints 2023-06-29 22:25:49 +03:00
Mikayla Maki ce52d90a9d Collab UI v2 (#2618) 
This PR implements
https://www.figma.com/file/pLq7dvhx2mFeWFOedXpUQ5/Project-%E2%80%93-Collaboration-UI?type=design&node-id=666%3A8610&t=XFGk6KEtTCFXBvCQ-1

Release notes:
- [x] Redesigned collaboration UI
- [x] Added voice support
 2023-06-28 09:14:39 -07:00
Max Brunsfeld 5350164db9 Get integration test passing. Wait for expand entry on remote projects. 2023-06-22 10:34:28 -07:00
Mikayla Maki dedc117cca Add audio APIs to Zed 
Share mic on joining room
 2023-06-16 10:13:27 -07:00
Antonio Scandurra f068712a0a Activate screen-sharing when leader activates a panel 2023-06-15 18:01:30 +02:00
Mikayla MakiandMax 2c5e83bf72 Fixed a bug where buffer saved clocks would desynchronize in rare execution paths 
co-authored-by: Max <max@zed.dev>
 2023-06-07 16:10:45 -07:00
Mikayla Maki 28ba27c9c5 Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Mikayla Maki 34e134fafb Fix several randomized test failures with the new git status implementation 2023-06-07 14:10:17 -07:00