oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,807 Commits 1 Branch 0 Tags
3b91a76159d8e3401ff6d652de2d914566e6c414
Commit Graph
10262 Commits
Author SHA1 Message Date
Nate Butler 3b91a76159 Merge branch 'main' into n/t2 2023-11-02 11:02:55 -04:00
Nate Butler d48ec7d58e Remove unused import 2023-11-02 11:02:46 -04:00
Nate Butler 6d562aaa6f Use naive_format_distance_from_now in Notifications 2023-11-02 11:02:17 -04:00
Nate Butler b76c117979 Update naive_format_distance and tests 2023-11-02 10:37:33 -04:00
Kyle Caverly 5ee2b01102 authenticate with completion provider on new inline assists (#3209) 
authenticate with completion provider on new inline assists

Release Notes:

- Fixed bug which lead the inline assist functionality to never
authenticate
 2023-11-02 10:14:52 -04:00
Nate Butler cde7b244bc Checkpoint - impl format_distance 2023-11-02 10:11:25 -04:00
KCaverly d5b6300fd7 moved from Boxes to Arcs for shared access of completion providers across the assistant panel and inline assistant 2023-11-02 10:08:47 -04:00
KCaverly b5fe0d72ee authenticate with completion provider on new inline assists 2023-11-02 09:34:18 -04:00
Joseph T. Lyons 5412f20e35 Fix missing commit (collab version bump) 2023-11-02 09:22:12 -04:00
Antonio Scandurra 76c675a63b 💄 2023-11-02 10:57:29 +01:00
Antonio Scandurra 32db64a049 Introduce more GPUI2 APIs needed for transitioning the workspace 2023-11-02 10:54:33 +01:00
Antonio Scandurra 9c7b45f38b Add back Send and Sync to AssetSource 2023-11-02 09:58:53 +01:00
Antonio Scandurra d5f0e91faa Remove stray todo 2023-11-02 09:56:45 +01:00
Antonio Scandurra 5e50430299 Fix compile errors 2023-11-02 09:47:21 +01:00
Antonio Scandurra 64ad8943ba Remove more Send bounds and simplify view rendering 2023-11-02 09:44:16 +01:00
Nathan Sobo 64ee1bb7a5 Fix prod compile error 2023-11-01 21:19:06 -06:00
Nathan Sobo 2079cd641e Fix post-merge compile errors 2023-11-01 21:16:41 -06:00
Nathan Sobo db9ccd7f34 Merge remote-tracking branch 'origin/main' into gpui2-no-send 2023-11-01 21:10:31 -06:00
Nathan Sobo 57dfc50687 Get language2 tests passing by not blocking on a foreground task 2023-11-01 21:04:17 -06:00
Nathan Sobo 53066df522 Get project2 tests green 2023-11-01 20:14:40 -06:00
Marshall Bowers aa14552fee Remove unneeded .intos 2023-11-01 22:01:59 -04:00
Marshall Bowers b9ac1e43cd Update scale accessors 2023-11-01 22:00:16 -04:00
Marshall Bowers bd4bff47a0 Merge branch 'main' into n/t2 2023-11-01 21:54:10 -04:00
Marshall Bowers 72d060108d Make indexing into ColorScales safe (#3205) 
This PR makes indexing into `ColorScale`s safe by constraining the
`ColorScaleStep`s to a set of known values.

Release Notes:

- N/A
 2023-11-01 21:52:42 -04:00
Marshall Bowers 220228c183 Fix underflow when indexing into ColorScales 2023-11-01 21:15:06 -04:00
Marshall Bowers 115bd65344 Merge branch 'main' into n/t2 2023-11-01 21:11:26 -04:00
Marshall Bowers 69aafe9ff6 Adjust ColorScale representation (#3204) 
This PR adjusts the representations of `ColorScale`s to allow us to
remove an unsafe `From` impl when converting from the statically-defined
representation of the scale.

Release Notes:

- N/A
 2023-11-01 21:10:50 -04:00
Max Brunsfeld 401ddc6f49 WIP - flush_fs_events 2023-11-01 17:45:38 -07:00
Max BrunsfeldandNathan Sobo 6ee93125d0 Fix hangs in new dispatcher 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2023-11-01 17:11:42 -07:00
Conrad Irwin 90facc051a beautiful diff 2023-11-01 15:31:37 -06:00
Nate Butler d0975aacac Merge branch 'main' into n/t2 2023-11-01 16:52:43 -04:00
Nate ButlerandMarshall Bowers 229ba0744e Add additional notifications and style tweaks 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-01 16:50:59 -04:00
Nate ButlerandMarshall Bowers be3cc6458c Implement Notifications 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-01 16:34:42 -04:00
Conrad Irwin f415a37a3d Uncomment project2 tests (#3200) 2023-11-01 20:27:53 +00:00
Conrad Irwin cd10ba9e06 Use run_until_parked instead of blocked in tests 2023-11-01 14:27:25 -06:00
Nate Butler 3f74f75dee WIP 2023-11-01 16:19:49 -04:00
KCaverly 77dbb15aa3 port text2 to zed2 2023-11-01 16:13:53 -04:00
Nathan Sobo 3f34a8e7ec Checkpoint 2023-11-01 14:00:26 -06:00
Nathan Sobo 11b6d9e33a Split out a foreground and background executor 2023-11-01 13:53:45 -06:00
Max Brunsfeld dd1a2a9e44 wip 2023-11-01 13:53:45 -06:00
Max BrunsfeldAntonioNathan
 		57ffa8201e Start removing the Send impl for App 
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
 2023-11-01 13:53:45 -06:00
Conrad Irwin ea7fdef417 And more unused imports 2023-11-01 13:51:42 -06:00
Conrad Irwin a5d37d3510 Remove two more hanging tests 2023-11-01 13:26:12 -06:00
Joseph T. Lyons 51ecf8e6b4 collab 0.28.0 2023-11-01 14:50:29 -04:00
Mikayla 6aaeb23157 Rename live kit bridge to 2 2023-11-01 10:52:15 -07:00
Conrad Irwin cfe0ddc61a More unused imports 2023-11-01 11:43:06 -06:00
Max BrunsfeldandConrad c467fa955b Comment out hanging project2 tests 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-01 10:38:47 -07:00
Marshall Bowers b910bbf002 Add ui_font_size setting (#3199) 
This PR adds a new `ui_font_size` setting that can be used to control
the scale of the entire UI.

We use the value in this setting to set the base rem size of the window.

Release Notes:

- N/A
 2023-11-01 13:11:12 -04:00
Nate Butler 8dafd5f1f3 Allow ListHeader to take a meta 2023-11-01 12:43:25 -04:00
Mikayla Maki bd61d71018 Finish port of livekit client and call2 (#3198) 2023-11-01 09:37:40 -07:00