Skip to content

Simplify #7031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 24, 2020
Merged

Simplify #7031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 7 additions & 35 deletions crates/ide/src/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,35 +248,7 @@ mod tests {
/// * a diagnostic is produced
/// * this diagnostic fix trigger range touches the input cursor position
/// * that the contents of the file containing the cursor match `after` after the diagnostic fix is applied
pub(super) fn check_fix(ra_fixture_before: &str, ra_fixture_after: &str) {
let after = trim_indent(ra_fixture_after);

let (analysis, file_position) = fixture::position(ra_fixture_before);
let diagnostic = analysis
.diagnostics(&DiagnosticsConfig::default(), file_position.file_id)
.unwrap()
.pop()
.unwrap();
let mut fix = diagnostic.fix.unwrap();
let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
let target_file_contents = analysis.file_text(file_position.file_id).unwrap();
let actual = {
let mut actual = target_file_contents.to_string();
edit.apply(&mut actual);
actual
};

assert_eq_text!(&after, &actual);
assert!(
fix.fix_trigger_range.contains_inclusive(file_position.offset),
"diagnostic fix range {:?} does not touch cursor position {:?}",
fix.fix_trigger_range,
file_position.offset
);
}

/// Similar to `check_fix`, but applies all the available fixes.
fn check_fixes(ra_fixture_before: &str, ra_fixture_after: &str) {
pub(crate) fn check_fix(ra_fixture_before: &str, ra_fixture_after: &str) {
let after = trim_indent(ra_fixture_after);

let (analysis, file_position) = fixture::position(ra_fixture_before);
Expand Down Expand Up @@ -802,7 +774,7 @@ struct Foo {

#[test]
fn test_rename_incorrect_case() {
check_fixes(
check_fix(
r#"
pub struct test_struct<|> { one: i32 }

Expand All @@ -819,7 +791,7 @@ pub fn some_fn(val: TestStruct) -> TestStruct {
"#,
);

check_fixes(
check_fix(
r#"
pub fn some_fn(NonSnakeCase<|>: u8) -> u8 {
NonSnakeCase
Expand All @@ -832,7 +804,7 @@ pub fn some_fn(non_snake_case: u8) -> u8 {
"#,
);

check_fixes(
check_fix(
r#"
pub fn SomeFn<|>(val: u8) -> u8 {
if val != 0 { SomeFn(val - 1) } else { val }
Expand All @@ -845,7 +817,7 @@ pub fn some_fn(val: u8) -> u8 {
"#,
);

check_fixes(
check_fix(
r#"
fn some_fn() {
let whatAWeird_Formatting<|> = 10;
Expand Down Expand Up @@ -874,7 +846,7 @@ fn foo() {

#[test]
fn test_rename_incorrect_case_struct_method() {
check_fixes(
check_fix(
r#"
pub struct TestStruct;

Expand Down Expand Up @@ -906,6 +878,6 @@ impl TestStruct {
analysis.diagnostics(&DiagnosticsConfig::default(), file_position.file_id).unwrap();
assert_eq!(diagnostics.len(), 1);

check_fixes(input, expected);
check_fix(input, expected);
}
}