From 8f3377d9f93a256f8e68ae183808fd767b529d18 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Mon, 22 Jul 2019 21:52:47 +0300
Subject: Code review fixes

---
 crates/ra_ide_api/src/inlay_hints.rs | 49 +++++++++++++++---------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

(limited to 'crates/ra_ide_api/src')

diff --git a/crates/ra_ide_api/src/inlay_hints.rs b/crates/ra_ide_api/src/inlay_hints.rs
index 1b1f28951..174662beb 100644
--- a/crates/ra_ide_api/src/inlay_hints.rs
+++ b/crates/ra_ide_api/src/inlay_hints.rs
@@ -9,16 +9,15 @@ use ra_syntax::{
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum InlayKind {
-    LetBinding,
-    ClosureParameter,
+    LetBindingType,
+    ClosureParameterType,
 }
 
 #[derive(Debug)]
 pub struct InlayHint {
     pub range: TextRange,
-    pub text: SmolStr,
-    pub inlay_kind: InlayKind,
-    pub inlay_type_string: SmolStr,
+    pub kind: InlayKind,
+    pub label: SmolStr,
 }
 
 pub(crate) fn inlay_hints(db: &RootDatabase, file_id: FileId, file: &SourceFile) -> Vec<InlayHint> {
@@ -56,9 +55,8 @@ fn get_inlay_hints(
 
             Some(vec![InlayHint {
                 range: pat_range,
-                text: let_syntax.text().to_string().into(),
-                inlay_kind: InlayKind::LetBinding,
-                inlay_type_string,
+                kind: InlayKind::LetBindingType,
+                label: inlay_type_string,
             }])
         })
         .visit(|closure_parameter: ast::LambdaExpr| match closure_parameter.param_list() {
@@ -80,9 +78,8 @@ fn get_inlay_hints(
 
                         Some(InlayHint {
                             range: closure_param_syntax.text_range(),
-                            text: closure_param_syntax.text().to_string().into(),
-                            inlay_kind: InlayKind::ClosureParameter,
-                            inlay_type_string,
+                            kind: InlayKind::ClosureParameterType,
+                            label: inlay_type_string,
                         })
                     })
                     .collect(),
@@ -149,39 +146,33 @@ fn main() {
         assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
     InlayHint {
         range: [71; 75),
-        text: "let test = 54;",
-        inlay_kind: LetBinding,
-        inlay_type_string: "i32",
+        kind: LetBindingType,
+        label: "i32",
     },
     InlayHint {
         range: [121; 125),
-        text: "let test = OuterStruct {};",
-        inlay_kind: LetBinding,
-        inlay_type_string: "OuterStruct",
+        kind: LetBindingType,
+        label: "OuterStruct",
     },
     InlayHint {
         range: [297; 305),
-        text: "let mut test = 33;",
-        inlay_kind: LetBinding,
-        inlay_type_string: "i32",
+        kind: LetBindingType,
+        label: "i32",
     },
     InlayHint {
         range: [417; 426),
-        text: "let i_squared = i * i;",
-        inlay_kind: LetBinding,
-        inlay_type_string: "u32",
+        kind: LetBindingType,
+        label: "u32",
     },
     InlayHint {
         range: [496; 502),
-        text: "let (x, c) = (42, \'a\');",
-        inlay_kind: LetBinding,
-        inlay_type_string: "(i32, char)",
+        kind: LetBindingType,
+        label: "(i32, char)",
     },
     InlayHint {
         range: [524; 528),
-        text: "let test = (42, \'a\');",
-        inlay_kind: LetBinding,
-        inlay_type_string: "(i32, char)",
+        kind: LetBindingType,
+        label: "(i32, char)",
     },
 ]"#
         );
-- 
cgit v1.2.3