Skip to content

Commit 072005a

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 e4344f5 commit 072005a

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
@@ -445,17 +445,16 @@ pub(crate) fn inlay_hint(
445445
file_id: FileId,
446446
inlay_hint: InlayHint,
447447
) -> Cancellable<lsp_types::InlayHint> {
448-
let is_visual_studio_code = snap.config.is_visual_studio_code();
449448
let needs_resolve = inlay_hint.needs_resolve;
450449
let (label, tooltip, mut something_to_resolve) =
451450
inlay_hint_label(snap, fields_to_resolve, needs_resolve, inlay_hint.label)?;
452-
let text_edits =
453-
if !is_visual_studio_code && needs_resolve && fields_to_resolve.resolve_text_edits {
454-
something_to_resolve |= inlay_hint.text_edit.is_some();
455-
None
456-
} else {
457-
inlay_hint.text_edit.map(|it| text_edit_vec(line_index, it))
458-
};
451+
let text_edits = if needs_resolve && fields_to_resolve.resolve_text_edits {
452+
something_to_resolve |= inlay_hint.text_edit.is_some();
453+
None
454+
} else {
455+
inlay_hint.text_edit.map(|it| text_edit_vec(line_index, it))
456+
};
457+
459458
let data = if needs_resolve && something_to_resolve {
460459
Some(to_value(lsp_ext::InlayHintResolveData { file_id: file_id.index() }).unwrap())
461460
} else {

0 commit comments

Comments
 (0)