Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove primary/secondary distinction for CachedLspAdapter (#15634)

Browse source 
This PR removes the primary/secondary distinction for
`CachedLspAdapter`s.

After #15624 we weren't relying on the `is_primary` field anywhere, so
we can remove it.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-08-01 13:51:34 -04:00 • committed by GitHub
parent 80594cc7f8
commit 7652045903
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 34 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/project/src/project_tests.rs
View file

@ -4623,9 +4623,8 @@ async fn test_multiple_language_server_hovers(cx: &mut gpui::TestAppContext) {
"ESLintServer",
"NoHoverCapabilitiesServer",
];
let mut fake_tsx_language_servers = language_registry.register_specific_fake_lsp_adapter(
let mut fake_tsx_language_servers = language_registry.register_fake_lsp_adapter(
"tsx",
true,
FakeLspAdapter {
name: &language_server_names[0],
capabilities: lsp::ServerCapabilities {
@ -4635,9 +4634,8 @@ async fn test_multiple_language_server_hovers(cx: &mut gpui::TestAppContext) {
..FakeLspAdapter::default()
},
);
let _a = language_registry.register_specific_fake_lsp_adapter(
let _a = language_registry.register_fake_lsp_adapter(
"tsx",
false,
FakeLspAdapter {
name: &language_server_names[1],
capabilities: lsp::ServerCapabilities {
@ -4647,9 +4645,8 @@ async fn test_multiple_language_server_hovers(cx: &mut gpui::TestAppContext) {
..FakeLspAdapter::default()
},
);
let _b = language_registry.register_specific_fake_lsp_adapter(
let _b = language_registry.register_fake_lsp_adapter(
"tsx",
false,
FakeLspAdapter {
name: &language_server_names[2],
capabilities: lsp::ServerCapabilities {
@ -4659,9 +4656,8 @@ async fn test_multiple_language_server_hovers(cx: &mut gpui::TestAppContext) {
..FakeLspAdapter::default()
},
);
let _c = language_registry.register_specific_fake_lsp_adapter(
let _c = language_registry.register_fake_lsp_adapter(
"tsx",
false,
FakeLspAdapter {
name: &language_server_names[3],
capabilities: lsp::ServerCapabilities {
@ -4847,9 +4843,8 @@ async fn test_multiple_language_server_actions(cx: &mut gpui::TestAppContext) {
"ESLintServer",
"NoActionsCapabilitiesServer",
];
let mut fake_tsx_language_servers = language_registry.register_specific_fake_lsp_adapter(
let mut fake_tsx_language_servers = language_registry.register_fake_lsp_adapter(
"tsx",
true,
FakeLspAdapter {
name: &language_server_names[0],
capabilities: lsp::ServerCapabilities {
@ -4859,9 +4854,8 @@ async fn test_multiple_language_server_actions(cx: &mut gpui::TestAppContext) {
..FakeLspAdapter::default()
},
);
let _a = language_registry.register_specific_fake_lsp_adapter(
let _a = language_registry.register_fake_lsp_adapter(
"tsx",
false,
FakeLspAdapter {
name: &language_server_names[1],
capabilities: lsp::ServerCapabilities {
@ -4871,9 +4865,8 @@ async fn test_multiple_language_server_actions(cx: &mut gpui::TestAppContext) {
..FakeLspAdapter::default()
},
);
let _b = language_registry.register_specific_fake_lsp_adapter(
let _b = language_registry.register_fake_lsp_adapter(
"tsx",
false,
FakeLspAdapter {
name: &language_server_names[2],
capabilities: lsp::ServerCapabilities {
@ -4883,9 +4876,8 @@ async fn test_multiple_language_server_actions(cx: &mut gpui::TestAppContext) {
..FakeLspAdapter::default()
},
);
let _c = language_registry.register_specific_fake_lsp_adapter(
let _c = language_registry.register_fake_lsp_adapter(
"tsx",
false,
FakeLspAdapter {
name: &language_server_names[3],
capabilities: lsp::ServerCapabilities {