From 8e0a7d8c08f04d39573777d8a3ec012696a45eac Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Mon, 2 Aug 2021 18:15:55 +0200
Subject: [PATCH] Fix ranged hover result range

---
 crates/ide/src/hover.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 7b8bf28e143..2147d3f2693 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -93,7 +93,15 @@ pub(crate) fn hover(
                 }
             }
         })?;
-        return hover_type_info(&sema, config, expr).map(|it| RangeInfo::new(range, it));
+        return hover_type_info(&sema, config, &expr).map(|it| {
+            RangeInfo::new(
+                match expr {
+                    Either::Left(it) => it.syntax().text_range(),
+                    Either::Right(it) => it.syntax().text_range(),
+                },
+                it,
+            )
+        });
     };
 
     let token = pick_best_token(file.token_at_offset(offset), |kind| match kind {
@@ -204,7 +212,7 @@ pub(crate) fn hover(
         }
     };
 
-    let res = hover_type_info(&sema, config, expr_or_pat)?;
+    let res = hover_type_info(&sema, config, &expr_or_pat)?;
     let range = sema.original_range(&node).range;
     Some(RangeInfo::new(range, res))
 }
@@ -212,16 +220,16 @@ pub(crate) fn hover(
 fn hover_type_info(
     sema: &Semantics<RootDatabase>,
     config: &HoverConfig,
-    expr_or_pat: Either<ast::Expr, ast::Pat>,
+    expr_or_pat: &Either<ast::Expr, ast::Pat>,
 ) -> Option<HoverResult> {
-    let (ty, coerced) = match &expr_or_pat {
+    let (ty, coerced) = match expr_or_pat {
         Either::Left(expr) => sema.type_of_expr_with_coercion(expr)?,
         Either::Right(pat) => sema.type_of_pat_with_coercion(pat)?,
     };
 
     let mut res = HoverResult::default();
     res.markup = if coerced {
-        let uncoerced_ty = match &expr_or_pat {
+        let uncoerced_ty = match expr_or_pat {
             Either::Left(expr) => sema.type_of_expr(expr)?,
             Either::Right(pat) => sema.type_of_pat(pat)?,
         };