Merge #1594

1594: Improve inlay hinting for types r=matklad a=SomeoneToIgnore

Add hints for types in for loop expressions.
Resolve types for every tuple parameter.
Refactor the code.

![image](https://user-images.githubusercontent.com/2690773/61957524-2294ae00-afc8-11e9-8bdc-f86f9c84ab7e.png)


Co-authored-by: Kirill Bulatov <[email protected]>

2 files changed, 4 insertions, 0 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 14619ede2..0b4493ce2 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -897,6 +897,9 @@ pub fn handle_inlay_hints(
             kind: match api_type.kind {
                 ra_ide_api::InlayKind::LetBindingType => InlayKind::LetBindingType,
                 ra_ide_api::InlayKind::ClosureParameterType => InlayKind::ClosureParameterType,
+                ra_ide_api::InlayKind::ForExpressionBindingType => {
+                    InlayKind::ForExpressionBindingType
+                }
             },
         })
         .collect())
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index 916185f99..96f6b1bc5 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -215,6 +215,7 @@ pub struct InlayHintsParams {
 pub enum InlayKind {
     LetBindingType,
     ClosureParameterType,
+    ForExpressionBindingType,
 }
 
 #[derive(Debug, Deserialize, Serialize)]