From 4fb25ef43bd96da94467ffa4de8fbf0af82b28d1 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Thu, 19 Dec 2019 16:18:09 +0200
Subject: Do not add any new configuration parameters

---
 crates/ra_ide/src/inlay_hints.rs | 44 ++++++++--------------------------------
 crates/ra_ide/src/lib.rs         |  7 ++-----
 2 files changed, 11 insertions(+), 40 deletions(-)

(limited to 'crates/ra_ide/src')

diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 319ac0048..4c5004f67 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -160,7 +160,7 @@ mod tests {
     use crate::mock_analysis::single_file;
 
     #[test]
-    fn default_generic_types_disabled() {
+    fn default_generic_types_should_not_be_displayed() {
         let (analysis, file_id) = single_file(
             r#"
 struct Test<K, T = u8> {
@@ -173,7 +173,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, false).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [69; 71),
@@ -185,32 +185,6 @@ fn main() {
         );
     }
 
-    #[test]
-    fn default_generic_types_enabled() {
-        let (analysis, file_id) = single_file(
-            r#"
-struct Test<K, T = u8> {
-    k: K,
-    t: T,
-}
-
-fn main() {
-    let zz = Test { t: 23, k: 33 };
-}"#,
-        );
-
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
-        [
-            InlayHint {
-                range: [69; 71),
-                kind: TypeHint,
-                label: "Test<i32, u8>",
-            },
-        ]
-        "###
-        );
-    }
-
     #[test]
     fn let_statement() {
         let (analysis, file_id) = single_file(
@@ -251,7 +225,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [193; 197),
@@ -325,7 +299,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [21; 30),
@@ -354,7 +328,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [21; 30),
@@ -402,7 +376,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [166; 170),
@@ -465,7 +439,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [166; 170),
@@ -528,7 +502,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, None, true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, None).unwrap(), @r###"
         [
             InlayHint {
                 range: [311; 315),
@@ -570,7 +544,7 @@ fn main() {
 }"#,
         );
 
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8), true).unwrap(), @r###"
+        assert_debug_snapshot!(analysis.inlay_hints(file_id, Some(8)).unwrap(), @r###"
         [
             InlayHint {
                 range: [74; 75),
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index c3244a8dd..875919e60 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -348,12 +348,9 @@ impl Analysis {
         &self,
         file_id: FileId,
         max_inlay_hint_length: Option<usize>,
-        show_default_types_in_inlay_hints: bool,
     ) -> Cancelable<Vec<InlayHint>> {
-        let truncate_options = hir::TruncateOptions {
-            max_length: max_inlay_hint_length,
-            show_default_types: show_default_types_in_inlay_hints,
-        };
+        let truncate_options =
+            hir::TruncateOptions { max_length: max_inlay_hint_length, show_default_types: false };
         self.with_db(|db| {
             inlay_hints::inlay_hints(db, file_id, &db.parse(file_id).tree(), &truncate_options)
         })
-- 
cgit v1.2.3