Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7851

Browse source 
7851: Compress tests r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-03-02 15:46:02 +00:00 committed by GitHub
commit 0ce539ec96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 459 additions and 651 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crates/ide_assists/src/tests.rs
View file

@ -12,7 +12,7 @@ use ide_db::{
RootDatabase,
};
use stdx::{format_to, trim_indent};
use syntax::{ast, AstNode, TextRange};
use syntax::TextRange;
use test_utils::{assert_eq_text, extract_offset};
use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, AssistKind, Assists};
@ -180,50 +180,6 @@ fn labels(assists: &[Assist]) -> String {
labels.into_iter().collect::<String>()
}
pub(crate) type NameSuggestion = fn(&ast::Expr, &Semantics<'_, RootDatabase>) -> Option<String>;
#[track_caller]
pub(crate) fn check_name_suggestion(
suggestion: NameSuggestion,
ra_fixture: &str,
suggested_name: &str,
) {
check_name(suggestion, ra_fixture, Some(suggested_name));
}
#[track_caller]
pub(crate) fn check_name_suggestion_not_applicable(suggestion: NameSuggestion, ra_fixture: &str) {
check_name(suggestion, ra_fixture, None);
}
#[track_caller]
fn check_name(suggestion: NameSuggestion, ra_fixture: &str, expected: Option<&str>) {
let (db, file_with_carret_id, range_or_offset) = RootDatabase::with_range_or_offset(ra_fixture);
let frange = FileRange { file_id: file_with_carret_id, range: range_or_offset.into() };
let sema = Semantics::new(&db);
let source_file = sema.parse(frange.file_id);
let element = source_file.syntax().covering_element(frange.range);
let expr =
element.ancestors().find_map(ast::Expr::cast).expect("selection is not an expression");
assert_eq!(
expr.syntax().text_range(),
frange.range,
"selection is not an expression(yet contained in one)"
);
let name = suggestion(&expr, &sema);
match (name, expected) {
(Some(name), Some(expected_name)) => {
assert_eq_text!(&name, expected_name);
}
(Some(_), None) => panic!("name suggestion should not be applicable"),
(None, Some(_)) => panic!("name suggestion is not applicable"),
(None, None) => (),
}
}
#[test]
fn assist_order_field_struct() {
let before = "struct Foo { $0bar: u32 }";

1064
crates/ide_assists/src/utils/suggest_name.rs
View file

File diff suppressed because it is too large Load diff