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

Done! Finish transition to async, very close to merging

Browse Source
This commit is contained in:
Isaac Clayton
2022-07-07 16:21:20 +02:00
parent 39fdbc593b
commit 895747476f
7 changed files with 2948 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/editor.rs
+4 -4
View File
@@ -6233,7 +6233,7 @@ mod tests {
platform::{WindowBounds, WindowOptions},
};
use indoc::indoc;
use language::{FakeLspAdapterInner, LanguageConfig};
use language::{FakeLspAdapter, LanguageConfig};
use lsp::FakeLanguageServer;
use project::FakeFs;
use settings::LanguageSettings;
@@ -9302,7 +9302,7 @@ mod tests {
},
Some(tree_sitter_rust::language()),
);
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
capabilities: lsp::ServerCapabilities {
document_formatting_provider: Some(lsp::OneOf::Left(true)),
..Default::default()
@@ -9414,7 +9414,7 @@ mod tests {
},
Some(tree_sitter_rust::language()),
);
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
capabilities: lsp::ServerCapabilities {
document_range_formatting_provider: Some(lsp::OneOf::Left(true)),
..Default::default()
@@ -9526,7 +9526,7 @@ mod tests {
},
Some(tree_sitter_rust::language()),
);
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
capabilities: lsp::ServerCapabilities {
completion_provider: Some(lsp::CompletionOptions {
trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
crates/editor/src/test.rs
+2 -2
View File
@@ -9,7 +9,7 @@ use indoc::indoc;
use collections::BTreeMap;
use gpui::{json, keymap::Keystroke, AppContext, ModelHandle, ViewContext, ViewHandle};
use language::{point_to_lsp, FakeLspAdapterInner, Language, LanguageConfig, Selection};
use language::{point_to_lsp, FakeLspAdapter, Language, LanguageConfig, Selection};
use project::Project;
use settings::Settings;
use util::{
@@ -457,7 +457,7 @@ impl<'a> EditorLspTestContext<'a> {
.unwrap_or(&"txt".to_string())
);
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapterInner {
let mut fake_servers = language.set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
capabilities,
..Default::default()
}));