
Still TODO: * [x] Factor out `start_language_server` so we can call it on register (instead of on detect language) * [x] Only call register in singleton editors (or when editing/go-to-definition etc. in a multibuffer?) * [x] Refcount on register so we can unregister when no buffer remain * [ ] (maybe) Stop language servers that are no longer needed after some time Release Notes: - Fixed language servers starting when doing project search - Fixed high CPU usage when ignoring warnings in the diagnostics view --------- Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Co-authored-by: Cole <cole@zed.dev>
523 lines
17 KiB
Rust
523 lines
17 KiB
Rust
use crate::tests::TestServer;
|
|
use call::ActiveCall;
|
|
use collections::HashSet;
|
|
use extension::ExtensionHostProxy;
|
|
use fs::{FakeFs, Fs as _};
|
|
use futures::StreamExt as _;
|
|
use gpui::{BackgroundExecutor, Context as _, SemanticVersion, TestAppContext, UpdateGlobal as _};
|
|
use http_client::BlockedHttpClient;
|
|
use language::{
|
|
language_settings::{
|
|
language_settings, AllLanguageSettings, Formatter, FormatterList, PrettierSettings,
|
|
SelectedFormatter,
|
|
},
|
|
tree_sitter_typescript, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher,
|
|
LanguageRegistry,
|
|
};
|
|
use node_runtime::NodeRuntime;
|
|
use project::{
|
|
lsp_store::{FormatTarget, FormatTrigger},
|
|
ProjectPath,
|
|
};
|
|
use remote::SshRemoteClient;
|
|
use remote_server::{HeadlessAppState, HeadlessProject};
|
|
use serde_json::json;
|
|
use settings::SettingsStore;
|
|
use std::{path::Path, sync::Arc};
|
|
|
|
#[gpui::test(iterations = 10)]
|
|
async fn test_sharing_an_ssh_remote_project(
|
|
cx_a: &mut TestAppContext,
|
|
cx_b: &mut TestAppContext,
|
|
server_cx: &mut TestAppContext,
|
|
) {
|
|
let executor = cx_a.executor();
|
|
cx_a.update(|cx| {
|
|
release_channel::init(SemanticVersion::default(), cx);
|
|
});
|
|
server_cx.update(|cx| {
|
|
release_channel::init(SemanticVersion::default(), cx);
|
|
});
|
|
let mut server = TestServer::start(executor.clone()).await;
|
|
let client_a = server.create_client(cx_a, "user_a").await;
|
|
let client_b = server.create_client(cx_b, "user_b").await;
|
|
server
|
|
.create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
|
|
.await;
|
|
|
|
// Set up project on remote FS
|
|
let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
|
|
let remote_fs = FakeFs::new(server_cx.executor());
|
|
remote_fs
|
|
.insert_tree(
|
|
"/code",
|
|
json!({
|
|
"project1": {
|
|
".zed": {
|
|
"settings.json": r#"{"languages":{"Rust":{"language_servers":["override-rust-analyzer"]}}}"#
|
|
},
|
|
"README.md": "# project 1",
|
|
"src": {
|
|
"lib.rs": "fn one() -> usize { 1 }"
|
|
}
|
|
},
|
|
"project2": {
|
|
"README.md": "# project 2",
|
|
},
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
// User A connects to the remote project via SSH.
|
|
server_cx.update(HeadlessProject::init);
|
|
let remote_http_client = Arc::new(BlockedHttpClient);
|
|
let node = NodeRuntime::unavailable();
|
|
let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
|
|
let _headless_project = server_cx.new_model(|cx| {
|
|
client::init_settings(cx);
|
|
HeadlessProject::new(
|
|
HeadlessAppState {
|
|
session: server_ssh,
|
|
fs: remote_fs.clone(),
|
|
http_client: remote_http_client,
|
|
node_runtime: node,
|
|
languages,
|
|
extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
|
|
},
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
|
|
let (project_a, worktree_id) = client_a
|
|
.build_ssh_project("/code/project1", client_ssh, cx_a)
|
|
.await;
|
|
|
|
// While the SSH worktree is being scanned, user A shares the remote project.
|
|
let active_call_a = cx_a.read(ActiveCall::global);
|
|
let project_id = active_call_a
|
|
.update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
// User B joins the project.
|
|
let project_b = client_b.join_remote_project(project_id, cx_b).await;
|
|
let worktree_b = project_b
|
|
.update(cx_b, |project, cx| project.worktree_for_id(worktree_id, cx))
|
|
.unwrap();
|
|
|
|
let worktree_a = project_a
|
|
.update(cx_a, |project, cx| project.worktree_for_id(worktree_id, cx))
|
|
.unwrap();
|
|
|
|
executor.run_until_parked();
|
|
|
|
worktree_a.update(cx_a, |worktree, _cx| {
|
|
assert_eq!(
|
|
worktree.paths().map(Arc::as_ref).collect::<Vec<_>>(),
|
|
vec![
|
|
Path::new(".zed"),
|
|
Path::new(".zed/settings.json"),
|
|
Path::new("README.md"),
|
|
Path::new("src"),
|
|
Path::new("src/lib.rs"),
|
|
]
|
|
);
|
|
});
|
|
|
|
worktree_b.update(cx_b, |worktree, _cx| {
|
|
assert_eq!(
|
|
worktree.paths().map(Arc::as_ref).collect::<Vec<_>>(),
|
|
vec![
|
|
Path::new(".zed"),
|
|
Path::new(".zed/settings.json"),
|
|
Path::new("README.md"),
|
|
Path::new("src"),
|
|
Path::new("src/lib.rs"),
|
|
]
|
|
);
|
|
});
|
|
|
|
// User B can open buffers in the remote project.
|
|
let buffer_b = project_b
|
|
.update(cx_b, |project, cx| {
|
|
project.open_buffer((worktree_id, "src/lib.rs"), cx)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
buffer_b.update(cx_b, |buffer, cx| {
|
|
assert_eq!(buffer.text(), "fn one() -> usize { 1 }");
|
|
let ix = buffer.text().find('1').unwrap();
|
|
buffer.edit([(ix..ix + 1, "100")], None, cx);
|
|
});
|
|
|
|
executor.run_until_parked();
|
|
|
|
cx_b.read(|cx| {
|
|
let file = buffer_b.read(cx).file();
|
|
assert_eq!(
|
|
language_settings(Some("Rust".into()), file, cx).language_servers,
|
|
["override-rust-analyzer".to_string()]
|
|
)
|
|
});
|
|
|
|
project_b
|
|
.update(cx_b, |project, cx| {
|
|
project.save_buffer_as(
|
|
buffer_b.clone(),
|
|
ProjectPath {
|
|
worktree_id: worktree_id.to_owned(),
|
|
path: Arc::from(Path::new("src/renamed.rs")),
|
|
},
|
|
cx,
|
|
)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(
|
|
remote_fs
|
|
.load("/code/project1/src/renamed.rs".as_ref())
|
|
.await
|
|
.unwrap(),
|
|
"fn one() -> usize { 100 }"
|
|
);
|
|
cx_b.run_until_parked();
|
|
cx_b.update(|cx| {
|
|
assert_eq!(
|
|
buffer_b
|
|
.read(cx)
|
|
.file()
|
|
.unwrap()
|
|
.path()
|
|
.to_string_lossy()
|
|
.to_string(),
|
|
"src/renamed.rs".to_string()
|
|
);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_ssh_collaboration_git_branches(
|
|
executor: BackgroundExecutor,
|
|
cx_a: &mut TestAppContext,
|
|
cx_b: &mut TestAppContext,
|
|
server_cx: &mut TestAppContext,
|
|
) {
|
|
cx_a.set_name("a");
|
|
cx_b.set_name("b");
|
|
server_cx.set_name("server");
|
|
|
|
cx_a.update(|cx| {
|
|
release_channel::init(SemanticVersion::default(), cx);
|
|
});
|
|
server_cx.update(|cx| {
|
|
release_channel::init(SemanticVersion::default(), cx);
|
|
});
|
|
|
|
let mut server = TestServer::start(executor.clone()).await;
|
|
let client_a = server.create_client(cx_a, "user_a").await;
|
|
let client_b = server.create_client(cx_b, "user_b").await;
|
|
server
|
|
.create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
|
|
.await;
|
|
|
|
// Set up project on remote FS
|
|
let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
|
|
let remote_fs = FakeFs::new(server_cx.executor());
|
|
remote_fs
|
|
.insert_tree("/project", serde_json::json!({ ".git":{} }))
|
|
.await;
|
|
|
|
let branches = ["main", "dev", "feature-1"];
|
|
remote_fs.insert_branches(Path::new("/project/.git"), &branches);
|
|
|
|
// User A connects to the remote project via SSH.
|
|
server_cx.update(HeadlessProject::init);
|
|
let remote_http_client = Arc::new(BlockedHttpClient);
|
|
let node = NodeRuntime::unavailable();
|
|
let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
|
|
let headless_project = server_cx.new_model(|cx| {
|
|
client::init_settings(cx);
|
|
HeadlessProject::new(
|
|
HeadlessAppState {
|
|
session: server_ssh,
|
|
fs: remote_fs.clone(),
|
|
http_client: remote_http_client,
|
|
node_runtime: node,
|
|
languages,
|
|
extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
|
|
},
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
|
|
let (project_a, worktree_id) = client_a
|
|
.build_ssh_project("/project", client_ssh, cx_a)
|
|
.await;
|
|
|
|
// While the SSH worktree is being scanned, user A shares the remote project.
|
|
let active_call_a = cx_a.read(ActiveCall::global);
|
|
let project_id = active_call_a
|
|
.update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
// User B joins the project.
|
|
let project_b = client_b.join_remote_project(project_id, cx_b).await;
|
|
|
|
// Give client A sometime to see that B has joined, and that the headless server
|
|
// has some git repositories
|
|
executor.run_until_parked();
|
|
|
|
let root_path = ProjectPath::root_path(worktree_id);
|
|
|
|
let branches_b = cx_b
|
|
.update(|cx| project_b.update(cx, |project, cx| project.branches(root_path.clone(), cx)))
|
|
.await
|
|
.unwrap();
|
|
|
|
let new_branch = branches[2];
|
|
|
|
let branches_b = branches_b
|
|
.into_iter()
|
|
.map(|branch| branch.name)
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(&branches_b, &branches);
|
|
|
|
cx_b.update(|cx| {
|
|
project_b.update(cx, |project, cx| {
|
|
project.update_or_create_branch(root_path.clone(), new_branch.to_string(), cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
executor.run_until_parked();
|
|
|
|
let server_branch = server_cx.update(|cx| {
|
|
headless_project.update(cx, |headless_project, cx| {
|
|
headless_project
|
|
.worktree_store
|
|
.update(cx, |worktree_store, cx| {
|
|
worktree_store
|
|
.current_branch(root_path.clone(), cx)
|
|
.unwrap()
|
|
})
|
|
})
|
|
});
|
|
|
|
assert_eq!(server_branch.as_ref(), branches[2]);
|
|
|
|
// Also try creating a new branch
|
|
cx_b.update(|cx| {
|
|
project_b.update(cx, |project, cx| {
|
|
project.update_or_create_branch(root_path.clone(), "totally-new-branch".to_string(), cx)
|
|
})
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
executor.run_until_parked();
|
|
|
|
let server_branch = server_cx.update(|cx| {
|
|
headless_project.update(cx, |headless_project, cx| {
|
|
headless_project
|
|
.worktree_store
|
|
.update(cx, |worktree_store, cx| {
|
|
worktree_store.current_branch(root_path, cx).unwrap()
|
|
})
|
|
})
|
|
});
|
|
|
|
assert_eq!(server_branch.as_ref(), "totally-new-branch");
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_ssh_collaboration_formatting_with_prettier(
|
|
executor: BackgroundExecutor,
|
|
cx_a: &mut TestAppContext,
|
|
cx_b: &mut TestAppContext,
|
|
server_cx: &mut TestAppContext,
|
|
) {
|
|
cx_a.set_name("a");
|
|
cx_b.set_name("b");
|
|
server_cx.set_name("server");
|
|
|
|
cx_a.update(|cx| {
|
|
release_channel::init(SemanticVersion::default(), cx);
|
|
});
|
|
server_cx.update(|cx| {
|
|
release_channel::init(SemanticVersion::default(), cx);
|
|
});
|
|
|
|
let mut server = TestServer::start(executor.clone()).await;
|
|
let client_a = server.create_client(cx_a, "user_a").await;
|
|
let client_b = server.create_client(cx_b, "user_b").await;
|
|
server
|
|
.create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
|
|
.await;
|
|
|
|
let (opts, server_ssh) = SshRemoteClient::fake_server(cx_a, server_cx);
|
|
let remote_fs = FakeFs::new(server_cx.executor());
|
|
let buffer_text = "let one = \"two\"";
|
|
let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
|
|
remote_fs
|
|
.insert_tree("/project", serde_json::json!({ "a.ts": buffer_text }))
|
|
.await;
|
|
|
|
let test_plugin = "test_plugin";
|
|
let ts_lang = Arc::new(Language::new(
|
|
LanguageConfig {
|
|
name: "TypeScript".into(),
|
|
matcher: LanguageMatcher {
|
|
path_suffixes: vec!["ts".to_string()],
|
|
..LanguageMatcher::default()
|
|
},
|
|
..LanguageConfig::default()
|
|
},
|
|
Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
|
|
));
|
|
client_a.language_registry().add(ts_lang.clone());
|
|
client_b.language_registry().add(ts_lang.clone());
|
|
|
|
let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
|
|
let mut fake_language_servers = languages.register_fake_lsp(
|
|
"TypeScript",
|
|
FakeLspAdapter {
|
|
prettier_plugins: vec![test_plugin],
|
|
..Default::default()
|
|
},
|
|
);
|
|
|
|
// User A connects to the remote project via SSH.
|
|
server_cx.update(HeadlessProject::init);
|
|
let remote_http_client = Arc::new(BlockedHttpClient);
|
|
let _headless_project = server_cx.new_model(|cx| {
|
|
client::init_settings(cx);
|
|
HeadlessProject::new(
|
|
HeadlessAppState {
|
|
session: server_ssh,
|
|
fs: remote_fs.clone(),
|
|
http_client: remote_http_client,
|
|
node_runtime: NodeRuntime::unavailable(),
|
|
languages,
|
|
extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
|
|
},
|
|
cx,
|
|
)
|
|
});
|
|
|
|
let client_ssh = SshRemoteClient::fake_client(opts, cx_a).await;
|
|
let (project_a, worktree_id) = client_a
|
|
.build_ssh_project("/project", client_ssh, cx_a)
|
|
.await;
|
|
|
|
// While the SSH worktree is being scanned, user A shares the remote project.
|
|
let active_call_a = cx_a.read(ActiveCall::global);
|
|
let project_id = active_call_a
|
|
.update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
|
|
.await
|
|
.unwrap();
|
|
|
|
// User B joins the project.
|
|
let project_b = client_b.join_remote_project(project_id, cx_b).await;
|
|
executor.run_until_parked();
|
|
|
|
// Opens the buffer and formats it
|
|
let (buffer_b, _handle) = project_b
|
|
.update(cx_b, |p, cx| {
|
|
p.open_buffer_with_lsp((worktree_id, "a.ts"), cx)
|
|
})
|
|
.await
|
|
.expect("user B opens buffer for formatting");
|
|
|
|
cx_a.update(|cx| {
|
|
SettingsStore::update_global(cx, |store, cx| {
|
|
store.update_user_settings::<AllLanguageSettings>(cx, |file| {
|
|
file.defaults.formatter = Some(SelectedFormatter::Auto);
|
|
file.defaults.prettier = Some(PrettierSettings {
|
|
allowed: true,
|
|
..PrettierSettings::default()
|
|
});
|
|
});
|
|
});
|
|
});
|
|
cx_b.update(|cx| {
|
|
SettingsStore::update_global(cx, |store, cx| {
|
|
store.update_user_settings::<AllLanguageSettings>(cx, |file| {
|
|
file.defaults.formatter = Some(SelectedFormatter::List(FormatterList(
|
|
vec![Formatter::LanguageServer { name: None }].into(),
|
|
)));
|
|
file.defaults.prettier = Some(PrettierSettings {
|
|
allowed: true,
|
|
..PrettierSettings::default()
|
|
});
|
|
});
|
|
});
|
|
});
|
|
let fake_language_server = fake_language_servers.next().await.unwrap();
|
|
fake_language_server.handle_request::<lsp::request::Formatting, _, _>(|_, _| async move {
|
|
panic!(
|
|
"Unexpected: prettier should be preferred since it's enabled and language supports it"
|
|
)
|
|
});
|
|
|
|
project_b
|
|
.update(cx_b, |project, cx| {
|
|
project.format(
|
|
HashSet::from_iter([buffer_b.clone()]),
|
|
true,
|
|
FormatTrigger::Save,
|
|
FormatTarget::Buffer,
|
|
cx,
|
|
)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
executor.run_until_parked();
|
|
assert_eq!(
|
|
buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
|
|
buffer_text.to_string() + "\n" + prettier_format_suffix,
|
|
"Prettier formatting was not applied to client buffer after client's request"
|
|
);
|
|
|
|
// User A opens and formats the same buffer too
|
|
let buffer_a = project_a
|
|
.update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.ts"), cx))
|
|
.await
|
|
.expect("user A opens buffer for formatting");
|
|
|
|
cx_a.update(|cx| {
|
|
SettingsStore::update_global(cx, |store, cx| {
|
|
store.update_user_settings::<AllLanguageSettings>(cx, |file| {
|
|
file.defaults.formatter = Some(SelectedFormatter::Auto);
|
|
file.defaults.prettier = Some(PrettierSettings {
|
|
allowed: true,
|
|
..PrettierSettings::default()
|
|
});
|
|
});
|
|
});
|
|
});
|
|
project_a
|
|
.update(cx_a, |project, cx| {
|
|
project.format(
|
|
HashSet::from_iter([buffer_a.clone()]),
|
|
true,
|
|
FormatTrigger::Manual,
|
|
FormatTarget::Buffer,
|
|
cx,
|
|
)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
executor.run_until_parked();
|
|
assert_eq!(
|
|
buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
|
|
buffer_text.to_string() + "\n" + prettier_format_suffix + "\n" + prettier_format_suffix,
|
|
"Prettier formatting was not applied to client buffer after host's request"
|
|
);
|
|
}
|