3 files changed, 38 insertions, 30 deletions

diff --git a/crates/ide/src/annotations.rs b/crates/ide/src/annotations.rs
index b0c4ed60a..8d68dce05 100644
--- a/crates/ide/src/annotations.rs
+++ b/crates/ide/src/annotations.rs
@@ -58,7 +58,7 @@ pub(crate) fn annotations(
             }
 
             let action = runnable.action();
-            let range = runnable.nav.full_range;
+            let range = runnable.nav.focus_or_full_range();
 
             if config.run {
                 annotations.push(Annotation {
@@ -224,7 +224,7 @@ fn main() {
             expect![[r#"
                 [
                     Annotation {
-                        range: 50..85,
+                        range: 53..57,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -243,7 +243,7 @@ fn main() {
                         },
                     },
                     Annotation {
-                        range: 50..85,
+                        range: 53..57,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -328,7 +328,7 @@ fn main() {
             expect![[r#"
                 [
                     Annotation {
-                        range: 14..48,
+                        range: 17..21,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -347,7 +347,7 @@ fn main() {
                         },
                     },
                     Annotation {
-                        range: 14..48,
+                        range: 17..21,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -436,7 +436,7 @@ fn main() {
             expect![[r#"
                 [
                     Annotation {
-                        range: 66..100,
+                        range: 69..73,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -455,7 +455,7 @@ fn main() {
                         },
                     },
                     Annotation {
-                        range: 66..100,
+                        range: 69..73,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -597,7 +597,7 @@ fn main() {}
             expect![[r#"
                 [
                     Annotation {
-                        range: 0..12,
+                        range: 3..7,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -616,7 +616,7 @@ fn main() {}
                         },
                     },
                     Annotation {
-                        range: 0..12,
+                        range: 3..7,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -670,7 +670,7 @@ fn main() {
             expect![[r#"
                 [
                     Annotation {
-                        range: 58..95,
+                        range: 61..65,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -689,7 +689,7 @@ fn main() {
                         },
                     },
                     Annotation {
-                        range: 58..95,
+                        range: 61..65,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -812,7 +812,7 @@ mod tests {
             expect![[r#"
                 [
                     Annotation {
-                        range: 0..12,
+                        range: 3..7,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -831,7 +831,7 @@ mod tests {
                         },
                     },
                     Annotation {
-                        range: 0..12,
+                        range: 3..7,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -850,7 +850,7 @@ mod tests {
                         },
                     },
                     Annotation {
-                        range: 14..64,
+                        range: 18..23,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -871,7 +871,7 @@ mod tests {
                         },
                     },
                     Annotation {
-                        range: 14..64,
+                        range: 18..23,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
@@ -892,7 +892,7 @@ mod tests {
                         },
                     },
                     Annotation {
-                        range: 30..62,
+                        range: 45..57,
                         kind: Runnable {
                             debug: false,
                             runnable: Runnable {
@@ -918,7 +918,7 @@ mod tests {
                         },
                     },
                     Annotation {
-                        range: 30..62,
+                        range: 45..57,
                         kind: Runnable {
                             debug: true,
                             runnable: Runnable {
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index cc6641ba1..6780af617 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -1,7 +1,7 @@
 //! Utilities for creating `Analysis` instances for tests.
 use ide_db::base_db::fixture::ChangeFixture;
 use syntax::{TextRange, TextSize};
-use test_utils::{extract_annotations, RangeOrOffset};
+use test_utils::extract_annotations;
 
 use crate::{Analysis, AnalysisHost, FileId, FilePosition, FileRange};
 
@@ -27,10 +27,7 @@ pub(crate) fn position(ra_fixture: &str) -> (Analysis, FilePosition) {
     let change_fixture = ChangeFixture::parse(ra_fixture);
     host.db.apply_change(change_fixture.change);
     let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
-    let offset = match range_or_offset {
-        RangeOrOffset::Range(_) => panic!(),
-        RangeOrOffset::Offset(it) => it,
-    };
+    let offset = range_or_offset.expect_offset();
     (host.analysis(), FilePosition { file_id, offset })
 }
 
@@ -40,10 +37,7 @@ pub(crate) fn range(ra_fixture: &str) -> (Analysis, FileRange) {
     let change_fixture = ChangeFixture::parse(ra_fixture);
     host.db.apply_change(change_fixture.change);
     let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
-    let range = match range_or_offset {
-        RangeOrOffset::Range(it) => it,
-        RangeOrOffset::Offset(_) => panic!(),
-    };
+    let range = range_or_offset.expect_range();
     (host.analysis(), FileRange { file_id, range })
 }
 
@@ -53,10 +47,7 @@ pub(crate) fn annotations(ra_fixture: &str) -> (Analysis, FilePosition, Vec<(Fil
     let change_fixture = ChangeFixture::parse(ra_fixture);
     host.db.apply_change(change_fixture.change);
     let (file_id, range_or_offset) = change_fixture.file_position.expect("expected a marker ($0)");
-    let offset = match range_or_offset {
-        RangeOrOffset::Range(_) => panic!(),
-        RangeOrOffset::Offset(it) => it,
-    };
+    let offset = range_or_offset.expect_offset();
 
     let annotations = change_fixture
         .files
diff --git a/crates/ide/src/folding_ranges.rs b/crates/ide/src/folding_ranges.rs
index b893c1c54..c5015a345 100755
--- a/crates/ide/src/folding_ranges.rs
+++ b/crates/ide/src/folding_ranges.rs
@@ -19,6 +19,7 @@ pub enum FoldKind {
     Statics,
     Array,
     WhereClause,
+    ReturnType,
 }
 
 #[derive(Debug)]
@@ -131,6 +132,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         COMMENT => Some(FoldKind::Comment),
         ARG_LIST | PARAM_LIST => Some(FoldKind::ArgList),
         ARRAY_EXPR => Some(FoldKind::Array),
+        RET_TYPE => Some(FoldKind::ReturnType),
         ASSOC_ITEM_LIST
         | RECORD_FIELD_LIST
         | RECORD_PAT_FIELD_LIST
@@ -300,6 +302,7 @@ mod tests {
                 FoldKind::Statics => "statics",
                 FoldKind::Array => "array",
                 FoldKind::WhereClause => "whereclause",
+                FoldKind::ReturnType => "returntype",
             };
             assert_eq!(kind, &attr.unwrap());
         }
@@ -560,4 +563,18 @@ where
 "#,
         )
     }
+
+    #[test]
+    fn fold_return_type() {
+        check(
+            r#"
+fn foo()<fold returntype>-> (
+    bool,
+    bool,
+)</fold> { (true, true) }
+
+fn bar() -> (bool, bool) { (true, true) }
+            "#,
+        )
+    }
 }