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

Further unpropogate async

Browse Source
This commit is contained in:
Isaac Clayton
2022-07-07 16:16:58 +02:00
parent 4f016d5fc4
commit 6585daccf9
12 changed files with 86 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/editor.rs
+7 -7
View File
@@ -6233,7 +6233,7 @@ mod tests {
platform::{WindowBounds, WindowOptions},
};
use indoc::indoc;
use language::{FakeLspAdapter, LanguageConfig};
use language::{FakeLspAdapter, LanguageConfig, FakeLspAdapterInner};
use lsp::FakeLanguageServer;
use project::FakeFs;
use settings::LanguageSettings;
@@ -9302,13 +9302,13 @@ mod tests {
},
Some(tree_sitter_rust::language()),
);
let mut fake_servers = language.set_fake_lsp_adapter(FakeLspAdapter {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
capabilities: lsp::ServerCapabilities {
document_formatting_provider: Some(lsp::OneOf::Left(true)),
..Default::default()
},
..Default::default()
});
}));
let fs = FakeFs::new(cx.background().clone());
fs.insert_file("/file.rs", Default::default()).await;
@@ -9414,13 +9414,13 @@ mod tests {
},
Some(tree_sitter_rust::language()),
);
let mut fake_servers = language.set_fake_lsp_adapter(FakeLspAdapter {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
capabilities: lsp::ServerCapabilities {
document_range_formatting_provider: Some(lsp::OneOf::Left(true)),
..Default::default()
},
..Default::default()
});
}));
let fs = FakeFs::new(cx.background().clone());
fs.insert_file("/file.rs", Default::default()).await;
@@ -9526,7 +9526,7 @@ mod tests {
},
Some(tree_sitter_rust::language()),
);
let mut fake_servers = language.set_fake_lsp_adapter(FakeLspAdapter {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
capabilities: lsp::ServerCapabilities {
completion_provider: Some(lsp::CompletionOptions {
trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
@@ -9535,7 +9535,7 @@ mod tests {
..Default::default()
},
..Default::default()
});
}));
let text = "
one
crates/editor/src/test.rs
+5 -3
View File
@@ -9,7 +9,9 @@ use indoc::indoc;
use collections::BTreeMap;
use gpui::{json, keymap::Keystroke, AppContext, ModelHandle, ViewContext, ViewHandle};
use language::{point_to_lsp, FakeLspAdapter, Language, LanguageConfig, Selection};
use language::{
point_to_lsp, FakeLspAdapter, FakeLspAdapterInner, Language, LanguageConfig, Selection,
};
use project::Project;
use settings::Settings;
use util::{
@@ -457,10 +459,10 @@ impl<'a> EditorLspTestContext<'a> {
.unwrap_or(&"txt".to_string())
);
let mut fake_servers = language.set_fake_lsp_adapter(FakeLspAdapter {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
capabilities,
..Default::default()
});
}));
let project = Project::test(params.fs.clone(), [], cx).await;
project.update(cx, |project, _| project.languages().add(Arc::new(language)));