oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into window_context_2

Browse Source
This commit is contained in:
Antonio Scandurra
2023-04-14 12:07:09 +02:00
parent 183b9ef809 c13914bda1
commit 33bc47dbe2
53 changed files with 3951 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/zed/src/main.rs
+1 -1
View File
@@ -336,7 +336,7 @@ fn init_panic_hook(app_version: String) {
let message = match info.location() {
Some(location) => {
format!(
"thread '{}' panicked at '{}': {}:{}\n{:?}",
"thread '{}' panicked at '{}'\n{}:{}\n{:?}",
thread,
payload,
location.file(),
crates/zed/src/zed.rs
+6 -6
View File
@@ -1541,7 +1541,7 @@ mod tests {
.update(cx, |workspace, cx| {
let editor3_id = editor3.id();
drop(editor3);
Pane::close_item(workspace, workspace.active_pane().clone(), editor3_id, cx)
Pane::close_item_by_id(workspace, workspace.active_pane().clone(), editor3_id, cx)
})
.await
.unwrap();
@@ -1574,7 +1574,7 @@ mod tests {
.update(cx, |workspace, cx| {
let editor2_id = editor2.id();
drop(editor2);
Pane::close_item(workspace, workspace.active_pane().clone(), editor2_id, cx)
Pane::close_item_by_id(workspace, workspace.active_pane().clone(), editor2_id, cx)
})
.await
.unwrap();
@@ -1724,7 +1724,7 @@ mod tests {
// Close all the pane items in some arbitrary order.
workspace
.update(cx, |workspace, cx| {
Pane::close_item(workspace, pane.clone(), file1_item_id, cx)
Pane::close_item_by_id(workspace, pane.clone(), file1_item_id, cx)
})
.await
.unwrap();
@@ -1732,7 +1732,7 @@ mod tests {
workspace
.update(cx, |workspace, cx| {
Pane::close_item(workspace, pane.clone(), file4_item_id, cx)
Pane::close_item_by_id(workspace, pane.clone(), file4_item_id, cx)
})
.await
.unwrap();
@@ -1740,7 +1740,7 @@ mod tests {
workspace
.update(cx, |workspace, cx| {
Pane::close_item(workspace, pane.clone(), file2_item_id, cx)
Pane::close_item_by_id(workspace, pane.clone(), file2_item_id, cx)
})
.await
.unwrap();
@@ -1748,7 +1748,7 @@ mod tests {
workspace
.update(cx, |workspace, cx| {
Pane::close_item(workspace, pane.clone(), file3_item_id, cx)
Pane::close_item_by_id(workspace, pane.clone(), file3_item_id, cx)
})
.await
.unwrap();