Skip to content

Commit 6682b74

Browse files
Stop eagerly resolving inlay hint text edits for VSCode
After microsoft/vscode#193124 was fixed, this change is not needed anymore.
1 parent 850ba2f commit 6682b74

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

crates/rust-analyzer/src/lsp/to_proto.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -442,17 +442,16 @@ pub(crate) fn inlay_hint(
442442
file_id: FileId,
443443
inlay_hint: InlayHint,
444444
) -> Cancellable<lsp_types::InlayHint> {
445-
let is_visual_studio_code = snap.config.is_visual_studio_code();
446445
let needs_resolve = inlay_hint.needs_resolve;
447446
let (label, tooltip, mut something_to_resolve) =
448447
inlay_hint_label(snap, fields_to_resolve, needs_resolve, inlay_hint.label)?;
449-
let text_edits =
450-
if !is_visual_studio_code && needs_resolve && fields_to_resolve.resolve_text_edits {
451-
something_to_resolve |= inlay_hint.text_edit.is_some();
452-
None
453-
} else {
454-
inlay_hint.text_edit.map(|it| text_edit_vec(line_index, it))
455-
};
448+
let text_edits = if needs_resolve && fields_to_resolve.resolve_text_edits {
449+
something_to_resolve |= inlay_hint.text_edit.is_some();
450+
None
451+
} else {
452+
inlay_hint.text_edit.map(|it| text_edit_vec(line_index, it))
453+
};
454+
456455
let data = if needs_resolve && something_to_resolve {
457456
Some(to_value(lsp_ext::InlayHintResolveData { file_id: file_id.index() }).unwrap())
458457
} else {

0 commit comments

Comments
 (0)