From d025016f92866a932729394c22603b615cb458df Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 11 Aug 2019 13:25:36 +0100 Subject: Mock std String and Result types in tests for ok-wrapping diagnostic --- crates/ra_hir/src/expr/validation.rs | 2 -- crates/ra_ide_api/src/diagnostics.rs | 62 ++++++++++++++++++++++++++-------- crates/ra_ide_api/src/mock_analysis.rs | 17 ++++++++++ 3 files changed, 65 insertions(+), 16 deletions(-) diff --git a/crates/ra_hir/src/expr/validation.rs b/crates/ra_hir/src/expr/validation.rs index 0e7b08c54..ca7db61bc 100644 --- a/crates/ra_hir/src/expr/validation.rs +++ b/crates/ra_hir/src/expr/validation.rs @@ -106,12 +106,10 @@ impl<'a, 'b> ExprValidator<'a, 'b> { Some(m) => m, None => return, }; - let ret = match &mismatch.expected { Ty::Apply(t) => t, _ => return, }; - let ret_enum = match ret.ctor { TypeCtor::Adt(AdtDef::Enum(e)) => e, _ => return, diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs index be5197767..84d2b7fb1 100644 --- a/crates/ra_ide_api/src/diagnostics.rs +++ b/crates/ra_ide_api/src/diagnostics.rs @@ -187,7 +187,7 @@ mod tests { use ra_syntax::SourceFile; use test_utils::assert_eq_text; - use crate::mock_analysis::single_file; + use crate::mock_analysis::{fixture_with_target_file, single_file}; use super::*; @@ -216,6 +216,15 @@ mod tests { assert_eq_text!(after, &actual); } + fn check_apply_diagnostic_fix_for_target_file(target_file: &str, fixture: &str, after: &str) { + let (analysis, file_id, target_file_contents) = fixture_with_target_file(fixture, target_file); + let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap(); + let mut fix = diagnostic.fix.unwrap(); + let edit = fix.source_file_edits.pop().unwrap().edit; + let actual = edit.apply(&target_file_contents); + assert_eq_text!(after, &actual); + } + fn check_apply_diagnostic_fix(before: &str, after: &str) { let (analysis, file_id) = single_file(before); let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap(); @@ -225,6 +234,12 @@ mod tests { assert_eq_text!(after, &actual); } + fn check_no_diagnostic_for_target_file(target_file: &str, fixture: &str) { + let (analysis, file_id, _) = fixture_with_target_file(fixture, target_file); + let diagnostics = analysis.diagnostics(file_id).unwrap(); + assert_eq!(diagnostics.len(), 0); + } + fn check_no_diagnostic(content: &str) { let (analysis, file_id) = single_file(content); let diagnostics = analysis.diagnostics(file_id).unwrap(); @@ -234,8 +249,8 @@ mod tests { #[test] fn test_wrap_return_type() { let before = r#" - enum Result { Ok(T), Err(E) } - struct String { } + //- /main.rs + use std::{string::String, result::Result::{self, Ok, Err}}; fn div(x: i32, y: i32) -> Result { if y == 0 { @@ -243,29 +258,48 @@ mod tests { } x / y } - "#; - let after = r#" - enum Result { Ok(T), Err(E) } - struct String { } - fn div(x: i32, y: i32) -> Result { - if y == 0 { - return Err("div by zero".into()); - } - Ok(x / y) + //- /std/lib.rs + pub mod string { + pub struct String { } + } + pub mod result { + pub enum Result { Ok(T), Err(E) } } "#; - check_apply_diagnostic_fix(before, after); +// The formatting here is a bit odd due to how the parse_fixture function works in test_utils - +// it strips empty lines and leading whitespace. The important part of this test is that the final +// `x / y` expr is now wrapped in `Ok(..)` + let after = r#"use std::{string::String, result::Result::{self, Ok, Err}}; +fn div(x: i32, y: i32) -> Result { + if y == 0 { + return Err("div by zero".into()); + } + Ok(x / y) +} +"#; + check_apply_diagnostic_fix_for_target_file("/main.rs", before, after); } #[test] fn test_wrap_return_type_not_applicable() { let content = r#" + //- /main.rs + use std::{string::String, result::Result::{self, Ok, Err}}; + fn foo() -> Result { 0 } + + //- /std/lib.rs + pub mod string { + pub struct String { } + } + pub mod result { + pub enum Result { Ok(T), Err(E) } + } "#; - check_no_diagnostic(content); + check_no_diagnostic_for_target_file("/main.rs", content); } #[test] diff --git a/crates/ra_ide_api/src/mock_analysis.rs b/crates/ra_ide_api/src/mock_analysis.rs index 132f6f875..0eaf5d15a 100644 --- a/crates/ra_ide_api/src/mock_analysis.rs +++ b/crates/ra_ide_api/src/mock_analysis.rs @@ -80,6 +80,15 @@ impl MockAnalysis { .expect("no file in this mock"); FileId(idx as u32 + 1) } + pub fn id_and_contents_of(&self, path: &str) -> (FileId, String) { + let (idx, contents) = self + .files + .iter() + .enumerate() + .find(|(_, (p, _text))| path == p) + .expect("no file in this mock"); + (FileId(idx as u32 + 1), contents.1.to_string()) + } pub fn analysis_host(self) -> AnalysisHost { let mut host = AnalysisHost::default(); let source_root = SourceRootId(0); @@ -124,6 +133,14 @@ pub fn single_file(code: &str) -> (Analysis, FileId) { (mock.analysis(), file_id) } +/// Creates analysis from a fixture with multiple files +/// and returns the file id and contents of the target file. +pub fn fixture_with_target_file(fixture: &str, target_file: &str) -> (Analysis, FileId, String) { + let mock = MockAnalysis::with_files(fixture); + let (target_file_id, target_file_contents) = mock.id_and_contents_of(target_file); + (mock.analysis(), target_file_id, target_file_contents) +} + /// Creates analysis for a single file, returns position marked with <|>. pub fn single_file_with_position(code: &str) -> (Analysis, FilePosition) { let mut mock = MockAnalysis::new(); -- cgit v1.2.3