Antonio Scandurra
62dd5a2019
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 11:04:47 +01:00
Antonio Scandurra
86222b78a9
💄
2023-11-02 10:57:29 +01:00
Antonio Scandurra
457a1d6aab
Introduce more GPUI2 APIs needed for transitioning the workspace
2023-11-02 10:54:33 +01:00
Antonio Scandurra
d32bcc65a3
WIP
2023-11-02 10:09:08 +01:00
Antonio Scandurra
9ceb498061
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 10:06:05 +01:00
Antonio Scandurra
fb2f5f1fcc
Add back Send and Sync to AssetSource
2023-11-02 09:58:53 +01:00
Antonio Scandurra
a92e8751bb
Remove stray todo
2023-11-02 09:56:45 +01:00
Antonio Scandurra
51d3b4f8f8
Fix compile errors
2023-11-02 09:47:21 +01:00
Antonio Scandurra
10dac9979c
Remove more Send bounds and simplify view rendering
2023-11-02 09:44:16 +01:00
Antonio Scandurra
45cef6aafb
Remove more Send bounds and remove EraseViewState
2023-11-02 09:39:06 +01:00
Antonio Scandurra
73c1b1e9fe
Remove some stray Send bounds
2023-11-02 09:18:16 +01:00
Antonio Scandurra
a30655256e
Simplify contexts
2023-11-02 09:15:14 +01:00
Antonio Scandurra
c66f09e8a1
Fix outstanding errors in gpui2
2023-11-02 09:08:47 +01:00
Nathan Sobo
8582cb05c8
WIP: Merge branch 'main' into zed2-workspace
2023-11-01 22:35:02 -06:00
Nathan Sobo
c015aee641
Fix prod compile error
2023-11-01 21:19:06 -06:00
Nathan Sobo
ef3a1ff26e
Fix post-merge compile errors
2023-11-01 21:16:41 -06:00
Nathan Sobo
c5a361d12b
Merge remote-tracking branch 'origin/main' into gpui2-no-send
2023-11-01 21:10:31 -06:00
Nathan Sobo
c3ff8609e8
Get language2 tests passing by not blocking on a foreground task
2023-11-01 21:04:17 -06:00
Nathan Sobo
d2d9430fc8
Get project2 tests green
2023-11-01 20:14:40 -06:00
Marshall Bowers
06597e894d
Remove unneeded .intos
2023-11-01 22:01:59 -04:00
Marshall Bowers
f8bea1d0dc
Update scale accessors
2023-11-01 22:00:16 -04:00
Marshall Bowers
a1a7797439
Merge branch 'main' into n/t2
2023-11-01 21:54:10 -04:00
Marshall Bowers
88ab95a68a
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
af09948a2c
Fix underflow when indexing into ColorScales
2023-11-01 21:15:06 -04:00
Marshall Bowers
c9b94196cd
Merge branch 'main' into n/t2
2023-11-01 21:11:26 -04:00
Marshall Bowers
faecc27eb5
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
f738d16c4d
WIP - flush_fs_events
2023-11-01 17:45:38 -07:00
Max Brunsfeld and Nathan Sobo
1a627a1b96
Fix hangs in new dispatcher
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-11-01 17:11:42 -07:00
Conrad Irwin
e3c633ac57
beautiful diff
2023-11-01 15:31:37 -06:00
Nate Butler
76e0bdc7f0
Merge branch 'main' into n/t2
2023-11-01 16:52:43 -04:00
Nate Butler and Marshall Bowers
73578fa334
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 Butler and Marshall Bowers
7de3c470b0
Implement Notifications
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-01 16:34:42 -04:00
Conrad Irwin
1583375d99
Uncomment project2 tests ( #3200 )
2023-11-01 20:27:53 +00:00
Conrad Irwin
21d0376cbb
Use run_until_parked instead of blocked in tests
2023-11-01 14:27:25 -06:00
Nate Butler
b52624eb51
WIP
2023-11-01 16:19:49 -04:00
KCaverly
e4403876a2
port text2 to zed2
2023-11-01 16:13:53 -04:00
Nathan Sobo
15b6f40fa1
Checkpoint
2023-11-01 14:00:26 -06:00
Nathan Sobo
8b342b1332
Split out a foreground and background executor
2023-11-01 13:53:45 -06:00
Max Brunsfeld
1da07b7433
wip
2023-11-01 13:53:45 -06:00
455983d912
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
5e06344d85
And more unused imports
2023-11-01 13:51:42 -06:00
Conrad Irwin
eb6cec1be5
Remove two more hanging tests
2023-11-01 13:26:12 -06:00
Mikayla
eb82028b76
Finish main merge
2023-11-01 11:52:14 -07:00
Joseph T. Lyons
5a045efa3e
collab 0.28.0
2023-11-01 14:50:29 -04:00
Mikayla
9be2b21c0e
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Mikayla
432f10621c
WIP
2023-11-01 11:45:31 -07:00
Mikayla
d7707dfb31
Rename live kit bridge to 2
2023-11-01 10:52:15 -07:00
Conrad Irwin
e122bf83d7
More unused imports
2023-11-01 11:43:06 -06:00
Max Brunsfeld and Conrad
0fa13bb42a
Comment out hanging project2 tests
...
Co-authored-by: Conrad <conrad@zed.dev >
2023-11-01 10:38:47 -07:00
Antonio Scandurra
216eac9e5e
WIP
2023-11-01 18:34:51 +01:00
Antonio Scandurra