1 files changed, 18 insertions, 6 deletions

diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index e7ec9953f..5a6e17936 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -58,7 +58,7 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
             }
             NodeOrToken::Node(node) => {
                 // Fold groups of imports
-                if node.kind() == USE_ITEM && !visited_imports.contains(&node) {
+                if node.kind() == USE && !visited_imports.contains(&node) {
                     if let Some(range) = contiguous_range_for_group(&node, &mut visited_imports) {
                         res.push(Fold { range, kind: FoldKind::Imports })
                     }
@@ -83,17 +83,17 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
 fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
     match kind {
         COMMENT => Some(FoldKind::Comment),
-        USE_ITEM => Some(FoldKind::Imports),
-        ARG_LIST => Some(FoldKind::ArgList),
-        RECORD_FIELD_DEF_LIST
+        USE => Some(FoldKind::Imports),
+        ARG_LIST | PARAM_LIST => Some(FoldKind::ArgList),
+        RECORD_FIELD_LIST
         | RECORD_FIELD_PAT_LIST
-        | RECORD_FIELD_LIST
+        | RECORD_EXPR_FIELD_LIST
         | ITEM_LIST
         | EXTERN_ITEM_LIST
         | USE_TREE_LIST
         | BLOCK_EXPR
         | MATCH_ARM_LIST
-        | ENUM_VARIANT_LIST
+        | VARIANT_LIST
         | TOKEN_TREE => Some(FoldKind::Block),
         _ => None,
     }
@@ -386,4 +386,16 @@ const _: S = S <fold block>{
 "#,
         )
     }
+
+    #[test]
+    fn fold_multiline_params() {
+        check(
+            r#"
+fn foo<fold arglist>(
+    x: i32,
+    y: String,
+)</fold> {}
+"#,
+        )
+    }
 }