Skip to content

Commit 57a0ad4

Browse files
SomeoneToIgnoreVeykril
authored andcommitted
Stop eagerly resolving inlay hint text edits for VSCode
After microsoft/vscode#193124 was fixed, this change is not needed anymore.
1 parent 0931361 commit 57a0ad4

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
@@ -443,17 +443,16 @@ pub(crate) fn inlay_hint(
443443
file_id: FileId,
444444
inlay_hint: InlayHint,
445445
) -> Cancellable<lsp_types::InlayHint> {
446-
let is_visual_studio_code = snap.config.is_visual_studio_code();
447446
let needs_resolve = inlay_hint.needs_resolve;
448447
let (label, tooltip, mut something_to_resolve) =
449448
inlay_hint_label(snap, fields_to_resolve, needs_resolve, inlay_hint.label)?;
450-
let text_edits =
451-
if !is_visual_studio_code && 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-
};
449+
let text_edits = if needs_resolve && fields_to_resolve.resolve_text_edits {
450+
something_to_resolve |= inlay_hint.text_edit.is_some();
451+
None
452+
} else {
453+
inlay_hint.text_edit.map(|it| text_edit_vec(line_index, it))
454+
};
455+
457456
let data = if needs_resolve && something_to_resolve {
458457
Some(to_value(lsp_ext::InlayHintResolveData { file_id: file_id.index() }).unwrap())
459458
} else {

0 commit comments

Comments
 (0)