From 61b4456752999188cdcd6a864ce170334b777089 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Fri, 28 May 2021 12:55:07 +0200
Subject: Move runnable lenses below attributes

---
 crates/ide/src/annotations.rs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'crates/ide')

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 {
-- 
cgit v1.2.3