Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-01 14:10:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1354

Browse Source 
1354: Sort hover results in tests r=matklad a=lnicola



Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot]
2019-05-31 11:13:48 +00:00
parent 29c7cdb25e be15541b03
commit 6c1ec865fb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ra_ide_api/src/hover.rs
+8 -2
View File
@@ -5,7 +5,11 @@
};
use hir::HirDisplay;
use crate::{db::RootDatabase, RangeInfo, FilePosition, FileRange, display::{rust_code_markup, doc_text_for}};
use crate::{
db::RootDatabase,
RangeInfo, FilePosition, FileRange,
display::{rust_code_markup, doc_text_for},
};
/// Contains the results when hovering over an item
#[derive(Debug, Clone)]
@@ -155,9 +159,11 @@ fn trim_markup_opt(s: Option<&str>) -> Option<&str> {
fn check_hover_result(fixture: &str, expected: &[&str]) {
let (analysis, position) = analysis_and_position(fixture);
let hover = analysis.hover(position).unwrap().unwrap();
let mut results = Vec::from(hover.info.results());
results.sort();
for (markup, expected) in
hover.info.results().iter().zip(expected.iter().chain(std::iter::repeat(&"<missing>")))
results.iter().zip(expected.iter().chain(std::iter::repeat(&"<missing>")))
{
assert_eq!(trim_markup(&markup), *expected);
}