From e98aff109a1c4bda6a05f16981898425c302aa0c Mon Sep 17 00:00:00 2001
From: Steffen Lyngbaek <steffenlyngbaek@gmail.com>
Date: Tue, 10 Mar 2020 00:55:46 -0700
Subject: Parameter inlay hint separate from variable type inlay? #2876

Add setting to allow enabling either type inlay hints or parameter
inlay hints or both. Group the the max inlay hint length option
into the object.

- Add a new type for the inlayHint options.
- Add tests to ensure the inlays don't happen on the server side
---
 crates/ra_ide/Cargo.toml              |   1 +
 crates/ra_ide/src/inlay_hints.rs      | 101 ++++++++++++++++++++++++++++------
 crates/ra_ide/src/lib.rs              |   5 +-
 crates/ra_project_model/src/lib.rs    |  29 ++++++++++
 crates/rust-analyzer/src/config.rs    |   5 +-
 crates/rust-analyzer/src/main_loop.rs |   2 +-
 crates/rust-analyzer/src/world.rs     |   4 +-
 7 files changed, 123 insertions(+), 24 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 7235c944c..486832529 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -21,6 +21,7 @@ rustc-hash = "1.1.0"
 rand = { version = "0.7.3", features = ["small_rng"] }
 
 ra_syntax = { path = "../ra_syntax" }
+ra_project_model = { path = "../ra_project_model" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index cf0cbdbd0..0f1c13c14 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -3,6 +3,7 @@
 use hir::{Adt, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
 use ra_prof::profile;
+use ra_project_model::{InlayHintDisplayType, InlayHintOptions};
 use ra_syntax::{
     ast::{self, ArgListOwner, AstNode, TypeAscriptionOwner},
     match_ast, SmolStr, TextRange,
@@ -26,7 +27,7 @@ pub struct InlayHint {
 pub(crate) fn inlay_hints(
     db: &RootDatabase,
     file_id: FileId,
-    max_inlay_hint_length: Option<usize>,
+    inlay_hint_opts: &InlayHintOptions,
 ) -> Vec<InlayHint> {
     let _p = profile("inlay_hints");
     let sema = Semantics::new(db);
@@ -36,9 +37,9 @@ pub(crate) fn inlay_hints(
     for node in file.syntax().descendants() {
         match_ast! {
             match node {
-                ast::CallExpr(it) => { get_param_name_hints(&mut res, &sema, ast::Expr::from(it)); },
-                ast::MethodCallExpr(it) => { get_param_name_hints(&mut res, &sema, ast::Expr::from(it)); },
-                ast::BindPat(it) => { get_bind_pat_hints(&mut res, &sema, max_inlay_hint_length, it); },
+                ast::CallExpr(it) => { get_param_name_hints(&mut res, &sema, inlay_hint_opts, ast::Expr::from(it)); },
+                ast::MethodCallExpr(it) => { get_param_name_hints(&mut res, &sema, inlay_hint_opts, ast::Expr::from(it)); },
+                ast::BindPat(it) => { get_bind_pat_hints(&mut res, &sema, inlay_hint_opts, it); },
                 _ => (),
             }
         }
@@ -49,8 +50,14 @@ pub(crate) fn inlay_hints(
 fn get_param_name_hints(
     acc: &mut Vec<InlayHint>,
     sema: &Semantics<RootDatabase>,
+    inlay_hint_opts: &InlayHintOptions,
     expr: ast::Expr,
 ) -> Option<()> {
+    match inlay_hint_opts.display_type {
+        InlayHintDisplayType::Off | InlayHintDisplayType::TypeHints => return None,
+        _ => {}
+    }
+
     let args = match &expr {
         ast::Expr::CallExpr(expr) => expr.arg_list()?.args(),
         ast::Expr::MethodCallExpr(expr) => expr.arg_list()?.args(),
@@ -84,9 +91,14 @@ fn get_param_name_hints(
 fn get_bind_pat_hints(
     acc: &mut Vec<InlayHint>,
     sema: &Semantics<RootDatabase>,
-    max_inlay_hint_length: Option<usize>,
+    inlay_hint_opts: &InlayHintOptions,
     pat: ast::BindPat,
 ) -> Option<()> {
+    match inlay_hint_opts.display_type {
+        InlayHintDisplayType::Off | InlayHintDisplayType::ParameterHints => return None,
+        _ => {}
+    }
+
     let ty = sema.type_of_pat(&pat.clone().into())?;
 
     if should_not_display_type_hint(sema.db, &pat, &ty) {
@@ -96,7 +108,7 @@ fn get_bind_pat_hints(
     acc.push(InlayHint {
         range: pat.syntax().text_range(),
         kind: InlayKind::TypeHint,
-        label: ty.display_truncated(sema.db, max_inlay_hint_length).to_string().into(),
+        label: ty.display_truncated(sema.db, inlay_hint_opts.max_length).to_string().into(),
     });
     Some(())
 }
@@ -205,7 +217,62 @@ mod tests {
     use insta::assert_debug_snapshot;
 
     use crate::mock_analysis::single_file;
+    use ra_project_model::{InlayHintDisplayType, InlayHintOptions};
 
+    #[test]
+    fn param_hints_only() {
+        let (analysis, file_id) = single_file(
+            r#"
+            fn foo(a: i32, b: i32) -> i32 { a + b }
+            fn main() {
+                let _x = foo(4, 4);
+            }"#,
+        );
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions{ display_type: InlayHintDisplayType::ParameterHints, max_length: None}).unwrap(), @r###"
+        [
+            InlayHint {
+                range: [106; 107),
+                kind: ParameterHint,
+                label: "a",
+            },
+            InlayHint {
+                range: [109; 110),
+                kind: ParameterHint,
+                label: "b",
+            },
+        ]"###);
+    }
+
+    #[test]
+    fn hints_disabled() {
+        let (analysis, file_id) = single_file(
+            r#"
+            fn foo(a: i32, b: i32) -> i32 { a + b }
+            fn main() {
+                let _x = foo(4, 4);
+            }"#,
+        );
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions{ display_type: InlayHintDisplayType::Off, max_length: None}).unwrap(), @r###"[]"###);
+    }
+
+    #[test]
+    fn type_hints_only() {
+        let (analysis, file_id) = single_file(
+            r#"
+            fn foo(a: i32, b: i32) -> i32 { a + b }
+            fn main() {
+                let _x = foo(4, 4);
+            }"#,
+        );
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions{ display_type: InlayHintDisplayType::TypeHints, max_length: None}).unwrap(), @r###"
+        [
+            InlayHint {
+                range: [97; 99),
+                kind: TypeHint,
+                label: "i32",
+            },
+        ]"###);
+    }
     #[test]
     fn default_generic_types_should_not_be_displayed() {
         let (analysis, file_id) = single_file(
@@ -221,7 +288,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [69; 71),
@@ -278,7 +345,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [193; 197),
@@ -358,7 +425,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [21; 30),
@@ -422,7 +489,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [21; 30),
@@ -472,7 +539,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [188; 192),
@@ -567,7 +634,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [188; 192),
@@ -662,7 +729,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [252; 256),
@@ -734,7 +801,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(Some(8))).unwrap(), @r###"
         [
             InlayHint {
                 range: [74; 75),
@@ -822,7 +889,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
         [
             InlayHint {
                 range: [798; 809),
@@ -944,7 +1011,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(Some(8))).unwrap(), @r###"
         []
         "###
         );
@@ -970,7 +1037,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(Some(8))).unwrap(), @r###"
         []
         "###
         );
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 9f45003d3..8b1292a41 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -44,6 +44,7 @@ mod marks;
 #[cfg(test)]
 mod test_utils;
 
+use ra_project_model::InlayHintOptions;
 use std::sync::Arc;
 
 use ra_cfg::CfgOptions;
@@ -318,9 +319,9 @@ impl Analysis {
     pub fn inlay_hints(
         &self,
         file_id: FileId,
-        max_inlay_hint_length: Option<usize>,
+        inlay_hint_opts: &InlayHintOptions,
     ) -> Cancelable<Vec<InlayHint>> {
-        self.with_db(|db| inlay_hints::inlay_hints(db, file_id, max_inlay_hint_length))
+        self.with_db(|db| inlay_hints::inlay_hints(db, file_id, inlay_hint_opts))
     }
 
     /// Returns the set of folding ranges.
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 37845ca56..a5012c0ef 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -16,6 +16,7 @@ use anyhow::{bail, Context, Result};
 use ra_cfg::CfgOptions;
 use ra_db::{CrateGraph, CrateName, Edition, Env, FileId};
 use rustc_hash::FxHashMap;
+use serde::Deserialize;
 use serde_json::from_reader;
 
 pub use crate::{
@@ -24,6 +25,34 @@ pub use crate::{
     sysroot::Sysroot,
 };
 
+#[derive(Deserialize, Clone, Debug, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum InlayHintDisplayType {
+    Off,
+    TypeHints,
+    ParameterHints,
+    Full,
+}
+
+#[derive(Deserialize, Clone, Debug, PartialEq, Eq)]
+#[serde(rename_all = "camelCase", default)]
+pub struct InlayHintOptions {
+    pub display_type: InlayHintDisplayType,
+    pub max_length: Option<usize>,
+}
+
+impl InlayHintOptions {
+    pub fn new(max_length: Option<usize>) -> Self {
+        Self { display_type: InlayHintDisplayType::Full, max_length }
+    }
+}
+
+impl Default for InlayHintOptions {
+    fn default() -> Self {
+        Self { display_type: InlayHintDisplayType::Full, max_length: None }
+    }
+}
+
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct CargoTomlNotFoundError {
     pub searched_at: PathBuf,
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 3314269ec..1617eab0b 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -7,6 +7,7 @@
 //! configure the server itself, feature flags are passed into analysis, and
 //! tweak things like automatic insertion of `()` in completions.
 
+use ra_project_model::InlayHintOptions;
 use rustc_hash::FxHashMap;
 
 use ra_project_model::CargoFeatures;
@@ -30,7 +31,7 @@ pub struct ServerConfig {
 
     pub lru_capacity: Option<usize>,
 
-    pub max_inlay_hint_length: Option<usize>,
+    pub inlay_hint_opts: InlayHintOptions,
 
     pub cargo_watch_enable: bool,
     pub cargo_watch_args: Vec<String>,
@@ -57,7 +58,7 @@ impl Default for ServerConfig {
             exclude_globs: Vec::new(),
             use_client_watching: false,
             lru_capacity: None,
-            max_inlay_hint_length: None,
+            inlay_hint_opts: Default::default(),
             cargo_watch_enable: true,
             cargo_watch_args: Vec::new(),
             cargo_watch_command: "check".to_string(),
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index f9de712a0..91fb66abb 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -177,7 +177,7 @@ pub fn main_loop(
                     .and_then(|it| it.folding_range.as_ref())
                     .and_then(|it| it.line_folding_only)
                     .unwrap_or(false),
-                max_inlay_hint_length: config.max_inlay_hint_length,
+                inlay_hint_opts: config.inlay_hint_opts.clone(),
                 cargo_watch: CheckOptions {
                     enable: config.cargo_watch_enable,
                     args: config.cargo_watch_args,
diff --git a/crates/rust-analyzer/src/world.rs b/crates/rust-analyzer/src/world.rs
index 1ddc3c1a5..8043a6cd3 100644
--- a/crates/rust-analyzer/src/world.rs
+++ b/crates/rust-analyzer/src/world.rs
@@ -15,7 +15,7 @@ use ra_cargo_watch::{url_from_path_with_drive_lowercasing, CheckOptions, CheckWa
 use ra_ide::{
     Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, SourceRootId,
 };
-use ra_project_model::{get_rustc_cfg_options, ProjectWorkspace};
+use ra_project_model::{get_rustc_cfg_options, InlayHintOptions, ProjectWorkspace};
 use ra_vfs::{LineEndings, RootEntry, Vfs, VfsChange, VfsFile, VfsRoot, VfsTask, Watch};
 use relative_path::RelativePathBuf;
 
@@ -32,7 +32,7 @@ pub struct Options {
     pub publish_decorations: bool,
     pub supports_location_link: bool,
     pub line_folding_only: bool,
-    pub max_inlay_hint_length: Option<usize>,
+    pub inlay_hint_opts: InlayHintOptions,
     pub rustfmt_args: Vec<String>,
     pub cargo_watch: CheckOptions,
 }
-- 
cgit v1.2.3


From cfb48df149bfa8a15b113b1a252598457a4ea392 Mon Sep 17 00:00:00 2001
From: Steffen Lyngbaek <steffenlyngbaek@gmail.com>
Date: Tue, 10 Mar 2020 11:21:56 -0700
Subject: Address Issues from Github

- Updated naming of config
- Define struct in ra_ide and use remote derive in rust-analyzer/config
- Make inlayConfig type more flexible to support more future types
- Remove constructor only used in tests
---
 crates/ra_ide/Cargo.toml                       |  1 -
 crates/ra_ide/src/inlay_hints.rs               | 61 +++++++++++++++-----------
 crates/ra_ide/src/lib.rs                       |  5 +--
 crates/ra_project_model/src/lib.rs             |  6 ---
 crates/rust-analyzer/src/config.rs             | 33 +++++++++++++-
 crates/rust-analyzer/src/main_loop.rs          |  2 +-
 crates/rust-analyzer/src/main_loop/handlers.rs |  2 +-
 crates/rust-analyzer/src/world.rs              |  7 +--
 8 files changed, 74 insertions(+), 43 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 486832529..7235c944c 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -21,7 +21,6 @@ rustc-hash = "1.1.0"
 rand = { version = "0.7.3", features = ["small_rng"] }
 
 ra_syntax = { path = "../ra_syntax" }
-ra_project_model = { path = "../ra_project_model" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 0f1c13c14..8454a975b 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -3,7 +3,6 @@
 use hir::{Adt, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
 use ra_prof::profile;
-use ra_project_model::{InlayHintDisplayType, InlayHintOptions};
 use ra_syntax::{
     ast::{self, ArgListOwner, AstNode, TypeAscriptionOwner},
     match_ast, SmolStr, TextRange,
@@ -11,7 +10,19 @@ use ra_syntax::{
 
 use crate::{FileId, FunctionSignature};
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct InlayConfig {
+    pub display_type: Vec<InlayKind>,
+    pub max_length: Option<usize>,
+}
+
+impl Default for InlayConfig {
+    fn default() -> Self {
+        Self { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: None }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum InlayKind {
     TypeHint,
     ParameterHint,
@@ -27,7 +38,7 @@ pub struct InlayHint {
 pub(crate) fn inlay_hints(
     db: &RootDatabase,
     file_id: FileId,
-    inlay_hint_opts: &InlayHintOptions,
+    inlay_hint_opts: &InlayConfig,
 ) -> Vec<InlayHint> {
     let _p = profile("inlay_hints");
     let sema = Semantics::new(db);
@@ -50,12 +61,11 @@ pub(crate) fn inlay_hints(
 fn get_param_name_hints(
     acc: &mut Vec<InlayHint>,
     sema: &Semantics<RootDatabase>,
-    inlay_hint_opts: &InlayHintOptions,
+    inlay_hint_opts: &InlayConfig,
     expr: ast::Expr,
 ) -> Option<()> {
-    match inlay_hint_opts.display_type {
-        InlayHintDisplayType::Off | InlayHintDisplayType::TypeHints => return None,
-        _ => {}
+    if !inlay_hint_opts.display_type.contains(&InlayKind::ParameterHint) {
+        return None;
     }
 
     let args = match &expr {
@@ -91,12 +101,11 @@ fn get_param_name_hints(
 fn get_bind_pat_hints(
     acc: &mut Vec<InlayHint>,
     sema: &Semantics<RootDatabase>,
-    inlay_hint_opts: &InlayHintOptions,
+    inlay_hint_opts: &InlayConfig,
     pat: ast::BindPat,
 ) -> Option<()> {
-    match inlay_hint_opts.display_type {
-        InlayHintDisplayType::Off | InlayHintDisplayType::ParameterHints => return None,
-        _ => {}
+    if !inlay_hint_opts.display_type.contains(&InlayKind::TypeHint) {
+        return None;
     }
 
     let ty = sema.type_of_pat(&pat.clone().into())?;
@@ -214,10 +223,10 @@ fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<
 
 #[cfg(test)]
 mod tests {
+    use crate::inlay_hints::{InlayConfig, InlayKind};
     use insta::assert_debug_snapshot;
 
     use crate::mock_analysis::single_file;
-    use ra_project_model::{InlayHintDisplayType, InlayHintOptions};
 
     #[test]
     fn param_hints_only() {
@@ -228,7 +237,7 @@ mod tests {
                 let _x = foo(4, 4);
             }"#,
         );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions{ display_type: InlayHintDisplayType::ParameterHints, max_length: None}).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ display_type: vec![InlayKind::ParameterHint], max_length: None}).unwrap(), @r###"
         [
             InlayHint {
                 range: [106; 107),
@@ -252,7 +261,7 @@ mod tests {
                 let _x = foo(4, 4);
             }"#,
         );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions{ display_type: InlayHintDisplayType::Off, max_length: None}).unwrap(), @r###"[]"###);
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ display_type: vec![], max_length: None}).unwrap(), @r###"[]"###);
     }
 
     #[test]
@@ -264,7 +273,7 @@ mod tests {
                 let _x = foo(4, 4);
             }"#,
         );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions{ display_type: InlayHintDisplayType::TypeHints, max_length: None}).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ display_type: vec![InlayKind::TypeHint], max_length: None}).unwrap(), @r###"
         [
             InlayHint {
                 range: [97; 99),
@@ -288,7 +297,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [69; 71),
@@ -345,7 +354,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [193; 197),
@@ -425,7 +434,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [21; 30),
@@ -489,7 +498,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [21; 30),
@@ -539,7 +548,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [188; 192),
@@ -634,7 +643,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [188; 192),
@@ -729,7 +738,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [252; 256),
@@ -801,7 +810,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(Some(8))).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: Some(8) }).unwrap(), @r###"
         [
             InlayHint {
                 range: [74; 75),
@@ -889,7 +898,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(None)).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig::default()).unwrap(), @r###"
         [
             InlayHint {
                 range: [798; 809),
@@ -1011,7 +1020,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(Some(8))).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: Some(8) }).unwrap(), @r###"
         []
         "###
         );
@@ -1037,7 +1046,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintOptions::new(Some(8))).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: Some(8) }).unwrap(), @r###"
         []
         "###
         );
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 8b1292a41..a3acfd225 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -44,7 +44,6 @@ mod marks;
 #[cfg(test)]
 mod test_utils;
 
-use ra_project_model::InlayHintOptions;
 use std::sync::Arc;
 
 use ra_cfg::CfgOptions;
@@ -69,7 +68,7 @@ pub use crate::{
     expand_macro::ExpandedMacro,
     folding_ranges::{Fold, FoldKind},
     hover::HoverResult,
-    inlay_hints::{InlayHint, InlayKind},
+    inlay_hints::{InlayConfig, InlayHint, InlayKind},
     references::{Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult},
     runnables::{Runnable, RunnableKind, TestId},
     source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
@@ -319,7 +318,7 @@ impl Analysis {
     pub fn inlay_hints(
         &self,
         file_id: FileId,
-        inlay_hint_opts: &InlayHintOptions,
+        inlay_hint_opts: &InlayConfig,
     ) -> Cancelable<Vec<InlayHint>> {
         self.with_db(|db| inlay_hints::inlay_hints(db, file_id, inlay_hint_opts))
     }
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index a5012c0ef..036c8719f 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -41,12 +41,6 @@ pub struct InlayHintOptions {
     pub max_length: Option<usize>,
 }
 
-impl InlayHintOptions {
-    pub fn new(max_length: Option<usize>) -> Self {
-        Self { display_type: InlayHintDisplayType::Full, max_length }
-    }
-}
-
 impl Default for InlayHintOptions {
     fn default() -> Self {
         Self { display_type: InlayHintDisplayType::Full, max_length: None }
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 1617eab0b..2f407723b 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -7,12 +7,40 @@
 //! configure the server itself, feature flags are passed into analysis, and
 //! tweak things like automatic insertion of `()` in completions.
 
-use ra_project_model::InlayHintOptions;
+use ra_ide::{InlayConfig, InlayKind};
 use rustc_hash::FxHashMap;
 
 use ra_project_model::CargoFeatures;
 use serde::{Deserialize, Deserializer};
 
+#[derive(Deserialize)]
+#[serde(remote = "InlayKind")]
+pub enum InlayKindDef {
+    TypeHint,
+    ParameterHint,
+}
+
+// Work-around until better serde support is added
+// https://github.com/serde-rs/serde/issues/723#issuecomment-382501277
+fn vec_inlay_kind<'de, D>(deserializer: D) -> Result<Vec<InlayKind>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    struct Wrapper(#[serde(with = "InlayKindDef")] InlayKind);
+
+    let v = Vec::deserialize(deserializer)?;
+    Ok(v.into_iter().map(|Wrapper(a)| a).collect())
+}
+
+#[derive(Deserialize)]
+#[serde(remote = "InlayConfig")]
+pub struct InlayConfigDef {
+    #[serde(deserialize_with = "vec_inlay_kind")]
+    pub display_type: Vec<InlayKind>,
+    pub max_length: Option<usize>,
+}
+
 /// Client provided initialization options
 #[derive(Deserialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase", default)]
@@ -31,7 +59,8 @@ pub struct ServerConfig {
 
     pub lru_capacity: Option<usize>,
 
-    pub inlay_hint_opts: InlayHintOptions,
+    #[serde(with = "InlayConfigDef")]
+    pub inlay_hint_opts: InlayConfig,
 
     pub cargo_watch_enable: bool,
     pub cargo_watch_args: Vec<String>,
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 91fb66abb..729c384ac 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -177,7 +177,7 @@ pub fn main_loop(
                     .and_then(|it| it.folding_range.as_ref())
                     .and_then(|it| it.line_folding_only)
                     .unwrap_or(false),
-                inlay_hint_opts: config.inlay_hint_opts.clone(),
+                inlay_hint_opts: config.inlay_hint_opts,
                 cargo_watch: CheckOptions {
                     enable: config.cargo_watch_enable,
                     args: config.cargo_watch_args,
diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs
index fcb40432d..4f58bcb0a 100644
--- a/crates/rust-analyzer/src/main_loop/handlers.rs
+++ b/crates/rust-analyzer/src/main_loop/handlers.rs
@@ -997,7 +997,7 @@ pub fn handle_inlay_hints(
     let analysis = world.analysis();
     let line_index = analysis.file_line_index(file_id)?;
     Ok(analysis
-        .inlay_hints(file_id, world.options.max_inlay_hint_length)?
+        .inlay_hints(file_id, &world.options.inlay_hint_opts)?
         .into_iter()
         .map(|api_type| InlayHint {
             label: api_type.label.to_string(),
diff --git a/crates/rust-analyzer/src/world.rs b/crates/rust-analyzer/src/world.rs
index 8043a6cd3..6eb1ea7d2 100644
--- a/crates/rust-analyzer/src/world.rs
+++ b/crates/rust-analyzer/src/world.rs
@@ -13,9 +13,10 @@ use lsp_types::Url;
 use parking_lot::RwLock;
 use ra_cargo_watch::{url_from_path_with_drive_lowercasing, CheckOptions, CheckWatcher};
 use ra_ide::{
-    Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, SourceRootId,
+    Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, InlayConfig, LibraryData,
+    SourceRootId,
 };
-use ra_project_model::{get_rustc_cfg_options, InlayHintOptions, ProjectWorkspace};
+use ra_project_model::{get_rustc_cfg_options, ProjectWorkspace};
 use ra_vfs::{LineEndings, RootEntry, Vfs, VfsChange, VfsFile, VfsRoot, VfsTask, Watch};
 use relative_path::RelativePathBuf;
 
@@ -32,7 +33,7 @@ pub struct Options {
     pub publish_decorations: bool,
     pub supports_location_link: bool,
     pub line_folding_only: bool,
-    pub inlay_hint_opts: InlayHintOptions,
+    pub inlay_hint_opts: InlayConfig,
     pub rustfmt_args: Vec<String>,
     pub cargo_watch: CheckOptions,
 }
-- 
cgit v1.2.3


From 974ed7155acccb5da0c2aeac09d7052c4f75902d Mon Sep 17 00:00:00 2001
From: Steffen Lyngbaek <steffenlyngbaek@gmail.com>
Date: Tue, 10 Mar 2020 18:59:49 -0700
Subject: Deduplicate some Inlay definitions

- Remove match conversion for InlayKind since we're using remote
---
 crates/rust-analyzer/src/config.rs             | 31 ++------------------------
 crates/rust-analyzer/src/main_loop/handlers.rs |  7 ++----
 crates/rust-analyzer/src/req.rs                | 29 ++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 36 deletions(-)

(limited to 'crates')

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 2f407723b..22ff0845c 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -7,40 +7,13 @@
 //! configure the server itself, feature flags are passed into analysis, and
 //! tweak things like automatic insertion of `()` in completions.
 
-use ra_ide::{InlayConfig, InlayKind};
+use crate::req::InlayConfigDef;
+use ra_ide::InlayConfig;
 use rustc_hash::FxHashMap;
 
 use ra_project_model::CargoFeatures;
 use serde::{Deserialize, Deserializer};
 
-#[derive(Deserialize)]
-#[serde(remote = "InlayKind")]
-pub enum InlayKindDef {
-    TypeHint,
-    ParameterHint,
-}
-
-// Work-around until better serde support is added
-// https://github.com/serde-rs/serde/issues/723#issuecomment-382501277
-fn vec_inlay_kind<'de, D>(deserializer: D) -> Result<Vec<InlayKind>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    #[derive(Deserialize)]
-    struct Wrapper(#[serde(with = "InlayKindDef")] InlayKind);
-
-    let v = Vec::deserialize(deserializer)?;
-    Ok(v.into_iter().map(|Wrapper(a)| a).collect())
-}
-
-#[derive(Deserialize)]
-#[serde(remote = "InlayConfig")]
-pub struct InlayConfigDef {
-    #[serde(deserialize_with = "vec_inlay_kind")]
-    pub display_type: Vec<InlayKind>,
-    pub max_length: Option<usize>,
-}
-
 /// Client provided initialization options
 #[derive(Deserialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase", default)]
diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs
index 4f58bcb0a..23463b28e 100644
--- a/crates/rust-analyzer/src/main_loop/handlers.rs
+++ b/crates/rust-analyzer/src/main_loop/handlers.rs
@@ -37,7 +37,7 @@ use crate::{
     },
     diagnostics::DiagnosticTask,
     from_json,
-    req::{self, Decoration, InlayHint, InlayHintsParams, InlayKind},
+    req::{self, Decoration, InlayHint, InlayHintsParams},
     semantic_tokens::SemanticTokensBuilder,
     world::WorldSnapshot,
     LspError, Result,
@@ -1002,10 +1002,7 @@ pub fn handle_inlay_hints(
         .map(|api_type| InlayHint {
             label: api_type.label.to_string(),
             range: api_type.range.conv_with(&line_index),
-            kind: match api_type.kind {
-                ra_ide::InlayKind::TypeHint => InlayKind::TypeHint,
-                ra_ide::InlayKind::ParameterHint => InlayKind::ParameterHint,
-            },
+            kind: api_type.kind,
         })
         .collect())
 }
diff --git a/crates/rust-analyzer/src/req.rs b/crates/rust-analyzer/src/req.rs
index a3efe3b9f..dab05405e 100644
--- a/crates/rust-analyzer/src/req.rs
+++ b/crates/rust-analyzer/src/req.rs
@@ -2,7 +2,9 @@
 
 use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url};
 use rustc_hash::FxHashMap;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
+
+use ra_ide::{InlayConfig, InlayKind};
 
 pub use lsp_types::{
     notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens,
@@ -196,14 +198,37 @@ pub struct InlayHintsParams {
 }
 
 #[derive(Debug, PartialEq, Eq, Deserialize, Serialize)]
-pub enum InlayKind {
+#[serde(remote = "InlayKind")]
+pub enum InlayKindDef {
     TypeHint,
     ParameterHint,
 }
 
+// Work-around until better serde support is added
+// https://github.com/serde-rs/serde/issues/723#issuecomment-382501277
+fn vec_inlay_kind<'de, D>(deserializer: D) -> Result<Vec<InlayKind>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    struct Wrapper(#[serde(with = "InlayKindDef")] InlayKind);
+
+    let v = Vec::deserialize(deserializer)?;
+    Ok(v.into_iter().map(|Wrapper(a)| a).collect())
+}
+
+#[derive(Deserialize)]
+#[serde(remote = "InlayConfig")]
+pub struct InlayConfigDef {
+    #[serde(deserialize_with = "vec_inlay_kind")]
+    pub display_type: Vec<InlayKind>,
+    pub max_length: Option<usize>,
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 pub struct InlayHint {
     pub range: Range,
+    #[serde(with = "InlayKindDef")]
     pub kind: InlayKind,
     pub label: String,
 }
-- 
cgit v1.2.3


From 58248e24cd45adcbfd7bfd00e1487df196b4a8c6 Mon Sep 17 00:00:00 2001
From: Steffen Lyngbaek <steffenlyngbaek@gmail.com>
Date: Wed, 11 Mar 2020 20:14:39 -0700
Subject: Switch from Vec<InlayKind> to object with props

- Instead of a single object type, use several individual nested types
  to allow toggling from the settings GUI
- Remove unused struct definitions
- Install and test that the toggles work
---
 crates/ra_ide/src/inlay_hints.rs               | 23 ++++++++++++-----------
 crates/ra_project_model/src/lib.rs             | 23 -----------------------
 crates/rust-analyzer/src/config.rs             |  4 ++--
 crates/rust-analyzer/src/main_loop.rs          |  2 +-
 crates/rust-analyzer/src/main_loop/handlers.rs |  2 +-
 crates/rust-analyzer/src/req.rs                | 21 ++++-----------------
 crates/rust-analyzer/src/world.rs              |  2 +-
 7 files changed, 21 insertions(+), 56 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 8454a975b..59922e14c 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -12,13 +12,14 @@ use crate::{FileId, FunctionSignature};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct InlayConfig {
-    pub display_type: Vec<InlayKind>,
+    pub type_hints: bool,
+    pub parameter_hints: bool,
     pub max_length: Option<usize>,
 }
 
 impl Default for InlayConfig {
     fn default() -> Self {
-        Self { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: None }
+        Self { type_hints: true, parameter_hints: true, max_length: None }
     }
 }
 
@@ -64,7 +65,7 @@ fn get_param_name_hints(
     inlay_hint_opts: &InlayConfig,
     expr: ast::Expr,
 ) -> Option<()> {
-    if !inlay_hint_opts.display_type.contains(&InlayKind::ParameterHint) {
+    if !inlay_hint_opts.parameter_hints {
         return None;
     }
 
@@ -104,7 +105,7 @@ fn get_bind_pat_hints(
     inlay_hint_opts: &InlayConfig,
     pat: ast::BindPat,
 ) -> Option<()> {
-    if !inlay_hint_opts.display_type.contains(&InlayKind::TypeHint) {
+    if !inlay_hint_opts.type_hints {
         return None;
     }
 
@@ -223,7 +224,7 @@ fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<
 
 #[cfg(test)]
 mod tests {
-    use crate::inlay_hints::{InlayConfig, InlayKind};
+    use crate::inlay_hints::InlayConfig;
     use insta::assert_debug_snapshot;
 
     use crate::mock_analysis::single_file;
@@ -237,7 +238,7 @@ mod tests {
                 let _x = foo(4, 4);
             }"#,
         );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ display_type: vec![InlayKind::ParameterHint], max_length: None}).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ parameter_hints: true, type_hints: false, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
                 range: [106; 107),
@@ -261,7 +262,7 @@ mod tests {
                 let _x = foo(4, 4);
             }"#,
         );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ display_type: vec![], max_length: None}).unwrap(), @r###"[]"###);
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ type_hints: false, parameter_hints: false, max_length: None}).unwrap(), @r###"[]"###);
     }
 
     #[test]
@@ -273,7 +274,7 @@ mod tests {
                 let _x = foo(4, 4);
             }"#,
         );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ display_type: vec![InlayKind::TypeHint], max_length: None}).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig{ type_hints: true, parameter_hints: false, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
                 range: [97; 99),
@@ -810,7 +811,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: Some(8) }).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
         [
             InlayHint {
                 range: [74; 75),
@@ -1020,7 +1021,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: Some(8) }).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
         []
         "###
         );
@@ -1046,7 +1047,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { display_type: vec![InlayKind::TypeHint, InlayKind::ParameterHint], max_length: Some(8) }).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
         []
         "###
         );
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 036c8719f..37845ca56 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -16,7 +16,6 @@ use anyhow::{bail, Context, Result};
 use ra_cfg::CfgOptions;
 use ra_db::{CrateGraph, CrateName, Edition, Env, FileId};
 use rustc_hash::FxHashMap;
-use serde::Deserialize;
 use serde_json::from_reader;
 
 pub use crate::{
@@ -25,28 +24,6 @@ pub use crate::{
     sysroot::Sysroot,
 };
 
-#[derive(Deserialize, Clone, Debug, PartialEq, Eq)]
-#[serde(rename_all = "lowercase")]
-pub enum InlayHintDisplayType {
-    Off,
-    TypeHints,
-    ParameterHints,
-    Full,
-}
-
-#[derive(Deserialize, Clone, Debug, PartialEq, Eq)]
-#[serde(rename_all = "camelCase", default)]
-pub struct InlayHintOptions {
-    pub display_type: InlayHintDisplayType,
-    pub max_length: Option<usize>,
-}
-
-impl Default for InlayHintOptions {
-    fn default() -> Self {
-        Self { display_type: InlayHintDisplayType::Full, max_length: None }
-    }
-}
-
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct CargoTomlNotFoundError {
     pub searched_at: PathBuf,
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 22ff0845c..3a6cfbe7b 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -33,7 +33,7 @@ pub struct ServerConfig {
     pub lru_capacity: Option<usize>,
 
     #[serde(with = "InlayConfigDef")]
-    pub inlay_hint_opts: InlayConfig,
+    pub inlay_hints: InlayConfig,
 
     pub cargo_watch_enable: bool,
     pub cargo_watch_args: Vec<String>,
@@ -60,7 +60,7 @@ impl Default for ServerConfig {
             exclude_globs: Vec::new(),
             use_client_watching: false,
             lru_capacity: None,
-            inlay_hint_opts: Default::default(),
+            inlay_hints: Default::default(),
             cargo_watch_enable: true,
             cargo_watch_args: Vec::new(),
             cargo_watch_command: "check".to_string(),
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 729c384ac..b6d1f28d8 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -177,7 +177,7 @@ pub fn main_loop(
                     .and_then(|it| it.folding_range.as_ref())
                     .and_then(|it| it.line_folding_only)
                     .unwrap_or(false),
-                inlay_hint_opts: config.inlay_hint_opts,
+                inlay_hints: config.inlay_hints,
                 cargo_watch: CheckOptions {
                     enable: config.cargo_watch_enable,
                     args: config.cargo_watch_args,
diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs
index 23463b28e..921990da0 100644
--- a/crates/rust-analyzer/src/main_loop/handlers.rs
+++ b/crates/rust-analyzer/src/main_loop/handlers.rs
@@ -997,7 +997,7 @@ pub fn handle_inlay_hints(
     let analysis = world.analysis();
     let line_index = analysis.file_line_index(file_id)?;
     Ok(analysis
-        .inlay_hints(file_id, &world.options.inlay_hint_opts)?
+        .inlay_hints(file_id, &world.options.inlay_hints)?
         .into_iter()
         .map(|api_type| InlayHint {
             label: api_type.label.to_string(),
diff --git a/crates/rust-analyzer/src/req.rs b/crates/rust-analyzer/src/req.rs
index dab05405e..1dcab2703 100644
--- a/crates/rust-analyzer/src/req.rs
+++ b/crates/rust-analyzer/src/req.rs
@@ -2,7 +2,7 @@
 
 use lsp_types::{Location, Position, Range, TextDocumentIdentifier, Url};
 use rustc_hash::FxHashMap;
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 
 use ra_ide::{InlayConfig, InlayKind};
 
@@ -204,24 +204,11 @@ pub enum InlayKindDef {
     ParameterHint,
 }
 
-// Work-around until better serde support is added
-// https://github.com/serde-rs/serde/issues/723#issuecomment-382501277
-fn vec_inlay_kind<'de, D>(deserializer: D) -> Result<Vec<InlayKind>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    #[derive(Deserialize)]
-    struct Wrapper(#[serde(with = "InlayKindDef")] InlayKind);
-
-    let v = Vec::deserialize(deserializer)?;
-    Ok(v.into_iter().map(|Wrapper(a)| a).collect())
-}
-
 #[derive(Deserialize)]
-#[serde(remote = "InlayConfig")]
+#[serde(remote = "InlayConfig", rename_all = "camelCase")]
 pub struct InlayConfigDef {
-    #[serde(deserialize_with = "vec_inlay_kind")]
-    pub display_type: Vec<InlayKind>,
+    pub type_hints: bool,
+    pub parameter_hints: bool,
     pub max_length: Option<usize>,
 }
 
diff --git a/crates/rust-analyzer/src/world.rs b/crates/rust-analyzer/src/world.rs
index 6eb1ea7d2..004803b00 100644
--- a/crates/rust-analyzer/src/world.rs
+++ b/crates/rust-analyzer/src/world.rs
@@ -33,7 +33,7 @@ pub struct Options {
     pub publish_decorations: bool,
     pub supports_location_link: bool,
     pub line_folding_only: bool,
-    pub inlay_hint_opts: InlayConfig,
+    pub inlay_hints: InlayConfig,
     pub rustfmt_args: Vec<String>,
     pub cargo_watch: CheckOptions,
 }
-- 
cgit v1.2.3