1 files changed, 13 insertions, 5 deletions

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 572ae7fb5..1751d7fa8 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -107,9 +107,16 @@ pub fn handle_on_type_formatting(
     };
     let edits = match world.analysis().on_eq_typed(position) {
         None => return Ok(None),
-        Some(mut action) => action.source_file_edits.pop().unwrap().edits,
+        Some(mut action) => action
+            .source_file_edits
+            .pop()
+            .unwrap()
+            .edit
+            .as_atoms()
+            .iter()
+            .map_conv_with(&line_index)
+            .collect(),
     };
-    let edits = edits.into_iter().map_conv_with(&line_index).collect();
     Ok(Some(edits))
 }
 
@@ -446,8 +453,9 @@ pub fn handle_folding_range(
             .into_iter()
             .map(|fold| {
                 let kind = match fold.kind {
-                    FoldKind::Comment => FoldingRangeKind::Comment,
-                    FoldKind::Imports => FoldingRangeKind::Imports,
+                    FoldKind::Comment => Some(FoldingRangeKind::Comment),
+                    FoldKind::Imports => Some(FoldingRangeKind::Imports),
+                    FoldKind::Block => None,
                 };
                 let range = fold.range.conv_with(&line_index);
                 FoldingRange {
@@ -455,7 +463,7 @@ pub fn handle_folding_range(
                     start_character: Some(range.start.character),
                     end_line: range.end.line,
                     end_character: Some(range.start.character),
-                    kind: Some(kind),
+                    kind,
                 }
             })
             .collect(),