itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7684

Browse Source 
7684: Actually fix runnable order r=lnicola a=ivan770

Changes
![image](https://user-images.githubusercontent.com/14003886/107956771-51a6b200-6fa8-11eb-91aa-f4190d6a8ccd.png)
to
![image](https://user-images.githubusercontent.com/14003886/107956926-903c6c80-6fa8-11eb-8fb9-8bf7bb1879ac.png)

Sorry for missing this one in original PR. This was an issue before ee049b256a, and I fixed it, yet *somehow* order got reversed (to a logical one)

Co-authored-by: ivan770 <leshenko.ivan770@gmail.com>
This commit is contained in:
bors[bot] 2021-02-15 14:22:33 +00:00 committed by GitHub
commit 3142814fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
crates/ide/src/annotations.rs
View File

@ -57,19 +57,19 @@ pub(crate) fn annotations(
let action = runnable.action(); let action = runnable.action();
let range = runnable.nav.full_range; let range = runnable.nav.full_range;
if action.debugee && config.debug { if config.run {
annotations.push(Annotation { annotations.push(Annotation {
range, range,
// FIXME: This one allocates without reason if run is enabled, but debug is disabled // FIXME: This one allocates without reason if run is enabled, but debug is disabled
kind: AnnotationKind::Runnable { debug: true, runnable: runnable.clone() }, kind: AnnotationKind::Runnable { debug: false, runnable: runnable.clone() },
}); });
} }
if config.run { if action.debugee && config.debug {
annotations.push(Annotation { annotations.push(Annotation {
range, range,
kind: AnnotationKind::Runnable { debug: false, runnable }, kind: AnnotationKind::Runnable { debug: true, runnable },
}); });
} }
} }
@ -199,7 +199,7 @@ fn main() {
Annotation { Annotation {
range: 50..85, range: 50..85,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -218,7 +218,7 @@ fn main() {
Annotation { Annotation {
range: 50..85, range: 50..85,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -303,7 +303,7 @@ fn main() {
Annotation { Annotation {
range: 14..48, range: 14..48,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -322,7 +322,7 @@ fn main() {
Annotation { Annotation {
range: 14..48, range: 14..48,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -411,7 +411,7 @@ fn main() {
Annotation { Annotation {
range: 66..100, range: 66..100,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -430,7 +430,7 @@ fn main() {
Annotation { Annotation {
range: 66..100, range: 66..100,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -572,7 +572,7 @@ fn main() {}
Annotation { Annotation {
range: 0..12, range: 0..12,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -591,7 +591,7 @@ fn main() {}
Annotation { Annotation {
range: 0..12, range: 0..12,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -645,7 +645,7 @@ fn main() {
Annotation { Annotation {
range: 58..95, range: 58..95,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -664,7 +664,7 @@ fn main() {
Annotation { Annotation {
range: 58..95, range: 58..95,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -787,7 +787,7 @@ mod tests {
Annotation { Annotation {
range: 0..12, range: 0..12,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -806,7 +806,7 @@ mod tests {
Annotation { Annotation {
range: 0..12, range: 0..12,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -825,7 +825,7 @@ mod tests {
Annotation { Annotation {
range: 14..64, range: 14..64,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -846,7 +846,7 @@ mod tests {
Annotation { Annotation {
range: 14..64, range: 14..64,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -867,7 +867,7 @@ mod tests {
Annotation { Annotation {
range: 30..62, range: 30..62,
kind: Runnable { kind: Runnable {
debug: true, debug: false,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(
@ -893,7 +893,7 @@ mod tests {
Annotation { Annotation {
range: 30..62, range: 30..62,
kind: Runnable { kind: Runnable {
debug: false, debug: true,
runnable: Runnable { runnable: Runnable {
nav: NavigationTarget { nav: NavigationTarget {
file_id: FileId( file_id: FileId(