rust-analyzer

diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 8311e770b4..a94bf8ebd1 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs

@@ -151,13 +151,11 @@ pub struct InlayHint {

pub label: InlayHintLabel,

/// Text edit to apply when "accepting" this inlay hint.

pub text_edit: Option<TextEdit>,

- pub needs_resolve: bool,

}

impl InlayHint {

fn closing_paren_after(kind: InlayKind, range: TextRange) -> InlayHint {

InlayHint {

- needs_resolve: false,

range,

kind,

label: InlayHintLabel::from(")"),

@@ -167,9 +165,9 @@ impl InlayHint {

pad_right: false,

}

fn opening_paren_before(kind: InlayKind, range: TextRange) -> InlayHint {

InlayHint {

- needs_resolve: false,

range,

kind,

label: InlayHintLabel::from("("),

@@ -179,6 +177,10 @@ impl InlayHint {

pad_right: false,

}

+ pub fn needs_resolve(&self) -> bool {

+ self.text_edit.is_some() || self.label.needs_resolve()

+ }

}

#[derive(Debug)]

diff --git a/crates/ide/src/inlay_hints/adjustment.rs b/crates/ide/src/inlay_hints/adjustment.rs
index 631807d99a..20128a286f 100644
--- a/crates/ide/src/inlay_hints/adjustment.rs
+++ b/crates/ide/src/inlay_hints/adjustment.rs

@@ -147,7 +147,6 @@ pub(super) fn hints(

None,

);

acc.push(InlayHint {

- needs_resolve: label.needs_resolve(),

range: expr.syntax().text_range(),

pad_left: false,

pad_right: false,

diff --git a/crates/ide/src/inlay_hints/bind_pat.rs b/crates/ide/src/inlay_hints/bind_pat.rs
index 45b51e3557..703eb660c8 100644
--- a/crates/ide/src/inlay_hints/bind_pat.rs
+++ b/crates/ide/src/inlay_hints/bind_pat.rs

@@ -99,7 +99,6 @@ pub(super) fn hints(

None => pat.syntax().text_range(),

};

acc.push(InlayHint {

- needs_resolve: label.needs_resolve() || text_edit.is_some(),

range: match type_ascriptable {

Some(Some(t)) => text_range.cover(t.text_range()),

_ => text_range,

diff --git a/crates/ide/src/inlay_hints/binding_mode.rs b/crates/ide/src/inlay_hints/binding_mode.rs
index 35504ffa78..f27390ee89 100644
--- a/crates/ide/src/inlay_hints/binding_mode.rs
+++ b/crates/ide/src/inlay_hints/binding_mode.rs

@@ -50,7 +50,6 @@ pub(super) fn hints(

_ => return,

};

acc.push(InlayHint {

- needs_resolve: false,

range,

kind: InlayKind::BindingMode,

label: r.into(),

@@ -69,7 +68,6 @@ pub(super) fn hints(

hir::BindingMode::Ref(Mutability::Shared) => "ref",

};

acc.push(InlayHint {

- needs_resolve: false,

range: pat.syntax().text_range(),

kind: InlayKind::BindingMode,

label: bm.into(),

diff --git a/crates/ide/src/inlay_hints/chaining.rs b/crates/ide/src/inlay_hints/chaining.rs
index b6063978e9..d86487d4b4 100644
--- a/crates/ide/src/inlay_hints/chaining.rs
+++ b/crates/ide/src/inlay_hints/chaining.rs

@@ -59,7 +59,6 @@ pub(super) fn hints(

}

let label = label_of_ty(famous_defs, config, &ty)?;

acc.push(InlayHint {

- needs_resolve: label.needs_resolve(),

range: expr.syntax().text_range(),

kind: InlayKind::Chaining,

label,

diff --git a/crates/ide/src/inlay_hints/closing_brace.rs b/crates/ide/src/inlay_hints/closing_brace.rs
index 2b68538c19..2cefd5acdc 100644
--- a/crates/ide/src/inlay_hints/closing_brace.rs
+++ b/crates/ide/src/inlay_hints/closing_brace.rs

@@ -109,7 +109,6 @@ pub(super) fn hints(

let linked_location = name_range.map(|range| FileRange { file_id, range });

acc.push(InlayHint {

- needs_resolve: linked_location.is_some(),

range: closing_token.text_range(),

kind: InlayKind::ClosingBrace,

label: InlayHintLabel::simple(label, None, linked_location),

diff --git a/crates/ide/src/inlay_hints/closure_captures.rs b/crates/ide/src/inlay_hints/closure_captures.rs
index 2f8b959516..f1b524e088 100644
--- a/crates/ide/src/inlay_hints/closure_captures.rs
+++ b/crates/ide/src/inlay_hints/closure_captures.rs

@@ -32,7 +32,6 @@ pub(super) fn hints(

let range = closure.syntax().first_token()?.prev_token()?.text_range();

let range = TextRange::new(range.end() - TextSize::from(1), range.end());

acc.push(InlayHint {

- needs_resolve: false,

range,

kind: InlayKind::ClosureCapture,

label: InlayHintLabel::from("move"),

@@ -45,7 +44,6 @@ pub(super) fn hints(

}

};

acc.push(InlayHint {

- needs_resolve: false,

range: move_kw_range,

kind: InlayKind::ClosureCapture,

label: InlayHintLabel::from("("),

@@ -79,7 +77,6 @@ pub(super) fn hints(

}),

);

acc.push(InlayHint {

- needs_resolve: label.needs_resolve(),

range: move_kw_range,

kind: InlayKind::ClosureCapture,

label,

@@ -91,7 +88,6 @@ pub(super) fn hints(

if idx != last {

acc.push(InlayHint {

- needs_resolve: false,

range: move_kw_range,

kind: InlayKind::ClosureCapture,

label: InlayHintLabel::from(", "),

@@ -103,7 +99,6 @@ pub(super) fn hints(

}

acc.push(InlayHint {

- needs_resolve: false,

range: move_kw_range,

kind: InlayKind::ClosureCapture,

label: InlayHintLabel::from(")"),

diff --git a/crates/ide/src/inlay_hints/closure_ret.rs b/crates/ide/src/inlay_hints/closure_ret.rs
index 204967cd7c..3b41db0f13 100644
--- a/crates/ide/src/inlay_hints/closure_ret.rs
+++ b/crates/ide/src/inlay_hints/closure_ret.rs

@@ -64,7 +64,6 @@ pub(super) fn hints(

};

acc.push(InlayHint {

- needs_resolve: label.needs_resolve() || text_edit.is_some(),

range: param_list.syntax().text_range(),

kind: InlayKind::Type,

label,

diff --git a/crates/ide/src/inlay_hints/discriminant.rs b/crates/ide/src/inlay_hints/discriminant.rs
index 06cce147d2..202954100f 100644
--- a/crates/ide/src/inlay_hints/discriminant.rs
+++ b/crates/ide/src/inlay_hints/discriminant.rs

@@ -79,7 +79,6 @@ fn variant_hints(

None,

);

acc.push(InlayHint {

- needs_resolve: label.needs_resolve(),

range: match eq_token {

Some(t) => range.cover(t.text_range()),

_ => range,

diff --git a/crates/ide/src/inlay_hints/fn_lifetime_fn.rs b/crates/ide/src/inlay_hints/fn_lifetime_fn.rs
index 6e5f23bed0..d3666754e2 100644
--- a/crates/ide/src/inlay_hints/fn_lifetime_fn.rs
+++ b/crates/ide/src/inlay_hints/fn_lifetime_fn.rs

@@ -22,7 +22,6 @@ pub(super) fn hints(

}

let mk_lt_hint = |t: SyntaxToken, label: String| InlayHint {

- needs_resolve: false,

range: t.text_range(),

kind: InlayKind::Lifetime,

label: label.into(),

@@ -184,7 +183,6 @@ pub(super) fn hints(

let angle_tok = gpl.l_angle_token()?;

let is_empty = gpl.generic_params().next().is_none();

acc.push(InlayHint {

- needs_resolve: false,

range: angle_tok.text_range(),

kind: InlayKind::Lifetime,

label: format!(

@@ -200,7 +198,6 @@ pub(super) fn hints(

});

}

(None, allocated_lifetimes) => acc.push(InlayHint {

- needs_resolve: false,

range: func.name()?.syntax().text_range(),

kind: InlayKind::GenericParamList,

label: format!("<{}>", allocated_lifetimes.iter().format(", "),).into(),

diff --git a/crates/ide/src/inlay_hints/implicit_drop.rs b/crates/ide/src/inlay_hints/implicit_drop.rs
index 5ba4e514e1..31f0c79037 100644
--- a/crates/ide/src/inlay_hints/implicit_drop.rs
+++ b/crates/ide/src/inlay_hints/implicit_drop.rs

@@ -105,7 +105,6 @@ pub(super) fn hints(

pad_left: true,

pad_right: true,

kind: InlayKind::Drop,

- needs_resolve: label.needs_resolve(),

label,

text_edit: None,

})

diff --git a/crates/ide/src/inlay_hints/implicit_static.rs b/crates/ide/src/inlay_hints/implicit_static.rs
index f18e6421cb..42223ddf58 100644
--- a/crates/ide/src/inlay_hints/implicit_static.rs
+++ b/crates/ide/src/inlay_hints/implicit_static.rs

@@ -31,7 +31,6 @@ pub(super) fn hints(

if ty.lifetime().is_none() {

let t = ty.amp_token()?;

acc.push(InlayHint {

- needs_resolve: false,

range: t.text_range(),

kind: InlayKind::Lifetime,

label: "'static".into(),

diff --git a/crates/ide/src/inlay_hints/param_name.rs b/crates/ide/src/inlay_hints/param_name.rs
index 418fc002a8..96e845b2f3 100644
--- a/crates/ide/src/inlay_hints/param_name.rs
+++ b/crates/ide/src/inlay_hints/param_name.rs

@@ -57,7 +57,6 @@ pub(super) fn hints(

let label =

InlayHintLabel::simple(format!("{param_name}{colon}"), None, linked_location);

InlayHint {

- needs_resolve: label.needs_resolve(),

range,

kind: InlayKind::Parameter,

label,

diff --git a/crates/ide/src/inlay_hints/range_exclusive.rs b/crates/ide/src/inlay_hints/range_exclusive.rs
index c4b0c199fc..bfb9283885 100644
--- a/crates/ide/src/inlay_hints/range_exclusive.rs
+++ b/crates/ide/src/inlay_hints/range_exclusive.rs

@@ -30,7 +30,6 @@ fn inlay_hint(token: SyntaxToken) -> InlayHint {

kind: crate::InlayKind::RangeExclusive,

label: crate::InlayHintLabel::from("<"),

text_edit: None,

- needs_resolve: false,

}

diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
index e77d0c13bf..cd6c317364 100644
--- a/crates/rust-analyzer/src/lsp/to_proto.rs
+++ b/crates/rust-analyzer/src/lsp/to_proto.rs

@@ -446,7 +446,7 @@ pub(crate) fn inlay_hint(

file_id: FileId,

inlay_hint: InlayHint,

) -> Cancellable<lsp_types::InlayHint> {

- let needs_resolve = inlay_hint.needs_resolve;

+ let needs_resolve = inlay_hint.needs_resolve();

let (label, tooltip, mut something_to_resolve) =

inlay_hint_label(snap, fields_to_resolve, needs_resolve, inlay_hint.label)?;