mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-19 06:59:22 +01:00
Fix missing Vue prop completions when Emmet is enabled (#66936)
## Summary Closes #66033 Fix completion trigger contexts when multiple language servers are enabled. Previously, Zed sent completion contexts based on the combined trigger chars of all attached servers. With Emmet enabled, lowercase letters were incorrectly sent to Vue as trigger chars, causing props completions to be skipped. Each request now checks the target server's registered trigger characters before it is sent, falling back to `INVOKED` with no trigger character when the character was not registered. https://github.com/user-attachments/assets/ebc032f2-61c6-48d4-a330-bf86099fb3e9 https://github.com/user-attachments/assets/e9161603-11e6-4f4f-9522-9abf9ca184fb ## Testing Manually verified that typing `pla` in `<Input pla` provides props completions with both Vue and Emmet language servers enabled. Added integration tests in `crates/project/tests/integration/project_tests.rs`: - Added `test_completion_context_uses_target_server_triggers`, which covers servers that register `.`, register `a`, and register none, with both static and dynamic registration. - Extended `test_dynamic_completion_registration_honors_document_selector` to assert the completion context forwarded after dynamic registration and unregistration. Run on Linux: - `cargo test -p project --features test-support` (435 passed) ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [ ] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - Fixed Vue props completions missing when typing lowercase letters with Emmet enabled.
This commit is contained in:
@@ -96,8 +96,8 @@ use language::{
|
||||
row_chunk::RowChunk,
|
||||
};
|
||||
use lsp::{
|
||||
AdapterServerCapabilities, CodeActionKind, CompletionContext, DEFAULT_LSP_REQUEST_TIMEOUT,
|
||||
DiagnosticServerCapabilities, DiagnosticSeverity, DiagnosticTag,
|
||||
AdapterServerCapabilities, CodeActionKind, CompletionContext, CompletionTriggerKind,
|
||||
DEFAULT_LSP_REQUEST_TIMEOUT, DiagnosticServerCapabilities, DiagnosticSeverity, DiagnosticTag,
|
||||
DidChangeWatchedFilesRegistrationOptions, Edit, FileOperationFilter, FileOperationPatternKind,
|
||||
FileOperationRegistrationOptions, FileRename, FileSystemWatcher, LanguageServer,
|
||||
LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId, LanguageServerName,
|
||||
@@ -8047,6 +8047,12 @@ impl LspStore {
|
||||
this.update(cx, |lsp_store, cx| {
|
||||
for server_id in server_ids {
|
||||
let lsp_adapter = lsp_store.language_server_adapter_for_id(server_id);
|
||||
let context = lsp_store.completion_context_for_server(
|
||||
buffer.read(cx),
|
||||
server_id,
|
||||
context.clone(),
|
||||
cx,
|
||||
);
|
||||
let lsp_timeout = lsp_timeout
|
||||
.map(|lsp_timeout| cx.background_executor().timer(lsp_timeout));
|
||||
let mut timeout = cx.background_spawn(async move {
|
||||
@@ -8063,7 +8069,7 @@ impl LspStore {
|
||||
LanguageServerToQuery::Other(server_id),
|
||||
GetCompletions {
|
||||
position,
|
||||
context: context.clone(),
|
||||
context,
|
||||
server_id: Some(server_id),
|
||||
},
|
||||
cx,
|
||||
@@ -8110,6 +8116,36 @@ impl LspStore {
|
||||
}
|
||||
}
|
||||
|
||||
fn completion_context_for_server(
|
||||
&self,
|
||||
buffer: &Buffer,
|
||||
server_id: LanguageServerId,
|
||||
mut context: CompletionContext,
|
||||
cx: &App,
|
||||
) -> CompletionContext {
|
||||
if context.trigger_kind != CompletionTriggerKind::TRIGGER_CHARACTER {
|
||||
return context;
|
||||
}
|
||||
let Some(local) = self.as_local() else {
|
||||
return context;
|
||||
};
|
||||
let Some(adapter) = self.language_server_adapter_for_id(server_id) else {
|
||||
return context;
|
||||
};
|
||||
|
||||
let triggers =
|
||||
completion_trigger_characters_for_buffer(local, server_id, &adapter, buffer, cx);
|
||||
if !context
|
||||
.trigger_character
|
||||
.as_ref()
|
||||
.is_some_and(|trigger| triggers.contains(trigger))
|
||||
{
|
||||
context.trigger_kind = CompletionTriggerKind::INVOKED;
|
||||
context.trigger_character = None;
|
||||
}
|
||||
context
|
||||
}
|
||||
|
||||
pub fn resolve_completions(
|
||||
&self,
|
||||
buffer: Entity<Buffer>,
|
||||
|
||||
@@ -7486,6 +7486,265 @@ async fn test_definition(cx: &mut gpui::TestAppContext) {
|
||||
}
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_completion_context_uses_target_server_triggers(cx: &mut gpui::TestAppContext) {
|
||||
init_test(cx);
|
||||
|
||||
for dynamic in [false, true] {
|
||||
let fs = FakeFs::new(cx.executor());
|
||||
fs.insert_tree(path!("/dir"), json!({ "a.ts": "a" })).await;
|
||||
let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
|
||||
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
|
||||
language_registry.add(typescript_lang());
|
||||
let mut servers = Vec::new();
|
||||
for (name, triggers) in [
|
||||
(
|
||||
"typescript",
|
||||
if dynamic {
|
||||
None
|
||||
} else {
|
||||
Some(vec![".".into()])
|
||||
},
|
||||
),
|
||||
("emmet", Some(vec!["a".into()])),
|
||||
("no-triggers", None),
|
||||
] {
|
||||
servers.push(language_registry.register_fake_lsp(
|
||||
"TypeScript",
|
||||
FakeLspAdapter {
|
||||
name,
|
||||
capabilities: lsp::ServerCapabilities {
|
||||
completion_provider: if dynamic && name == "typescript" {
|
||||
None
|
||||
} else {
|
||||
Some(lsp::CompletionOptions {
|
||||
trigger_characters: triggers,
|
||||
..Default::default()
|
||||
})
|
||||
},
|
||||
..Default::default()
|
||||
},
|
||||
..Default::default()
|
||||
},
|
||||
));
|
||||
}
|
||||
|
||||
let (buffer, _handle) = project
|
||||
.update(cx, |project, cx| {
|
||||
project.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
let mut fake_servers = Vec::new();
|
||||
for server in &mut servers {
|
||||
fake_servers.push(server.next().await.unwrap());
|
||||
}
|
||||
cx.run_until_parked();
|
||||
|
||||
if dynamic {
|
||||
fake_servers[0]
|
||||
.request::<lsp::request::RegisterCapability>(
|
||||
lsp::RegistrationParams {
|
||||
registrations: vec![lsp::Registration {
|
||||
id: "completion".into(),
|
||||
method: "textDocument/completion".into(),
|
||||
register_options: Some(json!({
|
||||
"documentSelector": [{ "language": "typescript", "scheme": "file" }],
|
||||
"triggerCharacters": ["."]
|
||||
})),
|
||||
}],
|
||||
},
|
||||
DEFAULT_LSP_REQUEST_TIMEOUT,
|
||||
)
|
||||
.await
|
||||
.into_response()
|
||||
.unwrap();
|
||||
cx.run_until_parked();
|
||||
}
|
||||
|
||||
assert_eq!(
|
||||
buffer.read_with(cx, |buffer, _| buffer.completion_triggers().clone()),
|
||||
BTreeSet::from([".".into(), "a".into()])
|
||||
);
|
||||
let contexts = Arc::new(Mutex::new(HashMap::default()));
|
||||
let _handlers = fake_servers
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(index, server)| {
|
||||
let contexts = contexts.clone();
|
||||
server.set_request_handler::<lsp::request::Completion, _, _>(move |params, _| {
|
||||
contexts.lock().insert(index, params.context.unwrap());
|
||||
async move {
|
||||
Ok(Some(lsp::CompletionResponse::Array(vec![
|
||||
lsp::CompletionItem {
|
||||
label: "available".into(),
|
||||
..Default::default()
|
||||
},
|
||||
])))
|
||||
}
|
||||
})
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
for (kind, trigger) in [
|
||||
(lsp::CompletionTriggerKind::TRIGGER_CHARACTER, Some("a")),
|
||||
(lsp::CompletionTriggerKind::TRIGGER_CHARACTER, Some(".")),
|
||||
(lsp::CompletionTriggerKind::TRIGGER_CHARACTER, Some("!")),
|
||||
(lsp::CompletionTriggerKind::INVOKED, None),
|
||||
(
|
||||
lsp::CompletionTriggerKind::TRIGGER_FOR_INCOMPLETE_COMPLETIONS,
|
||||
None,
|
||||
),
|
||||
] {
|
||||
contexts.lock().clear();
|
||||
let context = lsp::CompletionContext {
|
||||
trigger_kind: kind,
|
||||
trigger_character: trigger.map(str::to_string),
|
||||
};
|
||||
let responses = project
|
||||
.update(cx, |project, cx| {
|
||||
project.completions(&buffer, 1, context.clone(), cx)
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(responses.len(), 3);
|
||||
assert!(
|
||||
responses
|
||||
.iter()
|
||||
.all(|response| response.completions.len() == 1)
|
||||
);
|
||||
|
||||
let contexts = contexts.lock();
|
||||
assert_eq!(contexts.len(), 3);
|
||||
for (index, own_trigger) in [Some("."), Some("a"), None].into_iter().enumerate() {
|
||||
let expected = if kind == lsp::CompletionTriggerKind::TRIGGER_CHARACTER
|
||||
&& trigger != own_trigger
|
||||
{
|
||||
DEFAULT_COMPLETION_CONTEXT
|
||||
} else {
|
||||
context.clone()
|
||||
};
|
||||
assert_eq!(contexts[&index], expected);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_completion_context_survives_stale_trigger_replay(cx: &mut gpui::TestAppContext) {
|
||||
init_test(cx);
|
||||
|
||||
let fs = FakeFs::new(cx.executor());
|
||||
fs.insert_tree(path!("/dir"), json!({ "a.ts": "a." })).await;
|
||||
let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
|
||||
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
|
||||
language_registry.add(typescript_lang());
|
||||
let [mut primary_servers, mut secondary_servers] =
|
||||
[("typescript", ":"), ("emmet", ".")].map(|(name, trigger)| {
|
||||
language_registry.register_fake_lsp(
|
||||
"TypeScript",
|
||||
FakeLspAdapter {
|
||||
name,
|
||||
capabilities: lsp::ServerCapabilities {
|
||||
completion_provider: Some(lsp::CompletionOptions {
|
||||
trigger_characters: Some(vec![trigger.to_string()]),
|
||||
..Default::default()
|
||||
}),
|
||||
..Default::default()
|
||||
},
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
});
|
||||
let (buffer, _handle) = project
|
||||
.update(cx, |project, cx| {
|
||||
project.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
|
||||
})
|
||||
.await
|
||||
.expect("open buffer with both language servers");
|
||||
let primary_server = primary_servers.next().await.expect("start primary server");
|
||||
let secondary_server = secondary_servers
|
||||
.next()
|
||||
.await
|
||||
.expect("start secondary server");
|
||||
cx.run_until_parked();
|
||||
|
||||
let old_version = buffer.read_with(cx, |buffer, _| buffer.version());
|
||||
let stale_operations = buffer
|
||||
.read_with(cx, |buffer, cx| buffer.serialize_ops(Some(old_version), cx))
|
||||
.await
|
||||
.into_iter()
|
||||
.map(language::proto::deserialize_operation)
|
||||
.collect::<Result<Vec<_>>>()
|
||||
.expect("deserialize the collaborator's old buffer state");
|
||||
|
||||
primary_server
|
||||
.request::<lsp::request::RegisterCapability>(
|
||||
lsp::RegistrationParams {
|
||||
registrations: vec![lsp::Registration {
|
||||
id: "additional-completion-trigger".into(),
|
||||
method: "textDocument/completion".into(),
|
||||
register_options: Some(json!({
|
||||
"documentSelector": [{ "language": "typescript", "scheme": "file" }],
|
||||
"triggerCharacters": ["."]
|
||||
})),
|
||||
}],
|
||||
},
|
||||
DEFAULT_LSP_REQUEST_TIMEOUT,
|
||||
)
|
||||
.await
|
||||
.into_response()
|
||||
.expect("register an additional trigger on the primary server");
|
||||
cx.run_until_parked();
|
||||
|
||||
let contexts = Arc::new(Mutex::new(HashMap::default()));
|
||||
let primary_server_id = primary_server.server.server_id();
|
||||
let secondary_server_id = secondary_server.server.server_id();
|
||||
let _handlers = [primary_server, secondary_server].map(|server| {
|
||||
let contexts = contexts.clone();
|
||||
let server_id = server.server.server_id();
|
||||
server.set_request_handler::<lsp::request::Completion, _, _>(move |params, _| {
|
||||
contexts.lock().insert(server_id, params.context);
|
||||
async move { Ok(Some(lsp::CompletionResponse::Array(Vec::new()))) }
|
||||
})
|
||||
});
|
||||
let context = lsp::CompletionContext {
|
||||
trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
|
||||
trigger_character: Some(".".to_string()),
|
||||
};
|
||||
|
||||
for replay_stale_state in [false, true] {
|
||||
if replay_stale_state {
|
||||
buffer.update(cx, |buffer, cx| {
|
||||
buffer.apply_ops(stale_operations.clone(), cx);
|
||||
});
|
||||
}
|
||||
assert_eq!(
|
||||
buffer.read_with(cx, |buffer, _| buffer.completion_triggers().clone()),
|
||||
BTreeSet::from([":".to_string(), ".".to_string()]),
|
||||
);
|
||||
|
||||
contexts.lock().clear();
|
||||
project
|
||||
.update(cx, |project, cx| {
|
||||
project.completions(&buffer, 2, context.clone(), cx)
|
||||
})
|
||||
.await
|
||||
.expect("request completions from both servers");
|
||||
let contexts = contexts.lock();
|
||||
assert_eq!(contexts.len(), 2);
|
||||
assert_eq!(
|
||||
contexts.get(&secondary_server_id),
|
||||
Some(&Some(context.clone()))
|
||||
);
|
||||
assert_eq!(
|
||||
contexts.get(&primary_server_id),
|
||||
Some(&Some(context.clone())),
|
||||
"the primary server registered '.', even after stale trigger replay: {replay_stale_state}",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_completions_with_text_edit(cx: &mut gpui::TestAppContext) {
|
||||
init_test(cx);
|
||||
@@ -7641,11 +7900,11 @@ async fn test_dynamic_completion_registration_honors_document_selector(
|
||||
|
||||
assert!(buffer.read_with(cx, |buffer, _| buffer.completion_triggers().is_empty()));
|
||||
|
||||
let completion_request_count = Arc::new(atomic::AtomicUsize::new(0));
|
||||
let completion_contexts = Arc::new(Mutex::new(Vec::new()));
|
||||
let _completion_requests = fake_server.set_request_handler::<lsp::request::Completion, _, _>({
|
||||
let completion_request_count = completion_request_count.clone();
|
||||
move |_, _| {
|
||||
completion_request_count.fetch_add(1, atomic::Ordering::SeqCst);
|
||||
let completion_contexts = completion_contexts.clone();
|
||||
move |params, _| {
|
||||
completion_contexts.lock().push(params.context.unwrap());
|
||||
async move {
|
||||
Ok(Some(lsp::CompletionResponse::Array(vec![
|
||||
lsp::CompletionItem {
|
||||
@@ -7664,7 +7923,7 @@ async fn test_dynamic_completion_registration_honors_document_selector(
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(completions.is_empty());
|
||||
assert_eq!(completion_request_count.load(atomic::Ordering::SeqCst), 0);
|
||||
assert!(completion_contexts.lock().is_empty());
|
||||
|
||||
fake_server
|
||||
.request::<lsp::request::RegisterCapability>(
|
||||
@@ -7700,19 +7959,37 @@ async fn test_dynamic_completion_registration_honors_document_selector(
|
||||
BTreeSet::from([":".to_string()])
|
||||
);
|
||||
|
||||
let completions = project
|
||||
.update(cx, |project, cx| {
|
||||
project.completions(&buffer, 15, DEFAULT_COMPLETION_CONTEXT, cx)
|
||||
})
|
||||
.await
|
||||
.unwrap()
|
||||
.into_iter()
|
||||
.flat_map(|response| response.completions)
|
||||
.collect::<Vec<_>>();
|
||||
let colon_context = lsp::CompletionContext {
|
||||
trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
|
||||
trigger_character: Some(":".to_string()),
|
||||
};
|
||||
for (trigger_character, expected_context) in [
|
||||
(":", colon_context.clone()),
|
||||
(".", DEFAULT_COMPLETION_CONTEXT),
|
||||
] {
|
||||
let completions = project
|
||||
.update(cx, |project, cx| {
|
||||
project.completions(
|
||||
&buffer,
|
||||
15,
|
||||
lsp::CompletionContext {
|
||||
trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
|
||||
trigger_character: Some(trigger_character.to_string()),
|
||||
},
|
||||
cx,
|
||||
)
|
||||
})
|
||||
.await
|
||||
.unwrap()
|
||||
.into_iter()
|
||||
.flat_map(|response| response.completions)
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(completions.len(), 1);
|
||||
assert_eq!(completions[0].new_text, "matched");
|
||||
assert_eq!(completion_request_count.load(atomic::Ordering::SeqCst), 1);
|
||||
assert_eq!(completions.len(), 1);
|
||||
assert_eq!(completions[0].new_text, "matched");
|
||||
assert_eq!(completion_contexts.lock().last(), Some(&expected_context));
|
||||
}
|
||||
assert_eq!(completion_contexts.lock().len(), 2);
|
||||
|
||||
fake_server
|
||||
.request::<lsp::request::RegisterCapability>(
|
||||
@@ -7769,12 +8046,22 @@ async fn test_dynamic_completion_registration_honors_document_selector(
|
||||
);
|
||||
let completions = project
|
||||
.update(cx, |project, cx| {
|
||||
project.completions(&buffer, 15, DEFAULT_COMPLETION_CONTEXT, cx)
|
||||
project.completions(&buffer, 15, colon_context, cx)
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(completions.len(), 1);
|
||||
assert_eq!(completion_request_count.load(atomic::Ordering::SeqCst), 2);
|
||||
assert_eq!(
|
||||
completion_contexts.lock().as_slice(),
|
||||
&[
|
||||
lsp::CompletionContext {
|
||||
trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
|
||||
trigger_character: Some(":".to_string()),
|
||||
},
|
||||
DEFAULT_COMPLETION_CONTEXT,
|
||||
DEFAULT_COMPLETION_CONTEXT,
|
||||
]
|
||||
);
|
||||
|
||||
fake_server
|
||||
.request::<lsp::request::UnregisterCapability>(
|
||||
@@ -7799,7 +8086,7 @@ async fn test_dynamic_completion_registration_honors_document_selector(
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(completions.is_empty());
|
||||
assert_eq!(completion_request_count.load(atomic::Ordering::SeqCst), 2);
|
||||
assert_eq!(completion_contexts.lock().len(), 3);
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
|
||||
Reference in New Issue
Block a user