From 8b725a2f77d56ce7f7e7631070573541ff228e8d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 30 Jun 2020 21:55:21 +0200 Subject: Switch to expect for the rest of inlay tests --- crates/ra_ide/src/inlay_hints.rs | 174 ++++++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 74 deletions(-) diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs index 64980a832..62d364bfa 100644 --- a/crates/ra_ide/src/inlay_hints.rs +++ b/crates/ra_ide/src/inlay_hints.rs @@ -345,7 +345,7 @@ fn get_fn_signature(sema: &Semantics, expr: &ast::Expr) -> Option< #[cfg(test)] mod tests { - use insta::assert_debug_snapshot; + use expect::{expect, Expect}; use test_utils::extract_annotations; use crate::{inlay_hints::InlayHintsConfig, mock_analysis::single_file}; @@ -363,6 +363,12 @@ mod tests { assert_eq!(expected, actual); } + fn check_expect(ra_fixture: &str, config: InlayHintsConfig, expect: Expect) { + let (analysis, file_id) = single_file(ra_fixture); + let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap(); + expect.assert_debug_eq(&inlay_hints) + } + #[test] fn param_hints_only() { check_with_config( @@ -772,34 +778,41 @@ fn main() { #[test] fn chaining_hints_ignore_comments() { - let (analysis, file_id) = single_file( + check_expect( r#" - struct A(B); - impl A { fn into_b(self) -> B { self.0 } } - struct B(C); - impl B { fn into_c(self) -> C { self.0 } } - struct C; - - fn main() { - let c = A(B(C)) - .into_b() // This is a comment - .into_c(); - }"#, - ); - assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###" - [ - InlayHint { - range: 147..172, - kind: ChainingHint, - label: "B", - }, - InlayHint { - range: 147..154, - kind: ChainingHint, - label: "A", +struct A(B); +impl A { fn into_b(self) -> B { self.0 } } +struct B(C); +impl B { fn into_c(self) -> C { self.0 } } +struct C; + +fn main() { + let c = A(B(C)) + .into_b() // This is a comment + .into_c(); +} +"#, + InlayHintsConfig { + parameter_hints: false, + type_hints: false, + chaining_hints: true, + max_length: None, }, - ] - "###); + expect![[r#" + [ + InlayHint { + range: 147..172, + kind: ChainingHint, + label: "B", + }, + InlayHint { + range: 147..154, + kind: ChainingHint, + label: "A", + }, + ] + "#]], + ); } #[test] @@ -826,7 +839,7 @@ fn main() { #[test] fn struct_access_chaining_hints() { - let (analysis, file_id) = single_file( + check_expect( r#" struct A { pub b: B } struct B { pub c: C } @@ -845,58 +858,71 @@ fn main() { let x = D .foo(); }"#, - ); - assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###" - [ - InlayHint { - range: 143..190, - kind: ChainingHint, - label: "C", - }, - InlayHint { - range: 143..179, - kind: ChainingHint, - label: "B", + InlayHintsConfig { + parameter_hints: false, + type_hints: false, + chaining_hints: true, + max_length: None, }, - ] - "###); + expect![[r#" + [ + InlayHint { + range: 143..190, + kind: ChainingHint, + label: "C", + }, + InlayHint { + range: 143..179, + kind: ChainingHint, + label: "B", + }, + ] + "#]], + ); } #[test] fn generic_chaining_hints() { - let (analysis, file_id) = single_file( + check_expect( r#" - struct A(T); - struct B(T); - struct C(T); - struct X(T, R); - - impl A { - fn new(t: T) -> Self { A(t) } - fn into_b(self) -> B { B(self.0) } - } - impl B { - fn into_c(self) -> C { C(self.0) } - } - fn main() { - let c = A::new(X(42, true)) - .into_b() - .into_c(); - }"#, - ); - assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###" - [ - InlayHint { - range: 246..283, - kind: ChainingHint, - label: "B>", - }, - InlayHint { - range: 246..265, - kind: ChainingHint, - label: "A>", +struct A(T); +struct B(T); +struct C(T); +struct X(T, R); + +impl A { + fn new(t: T) -> Self { A(t) } + fn into_b(self) -> B { B(self.0) } +} +impl B { + fn into_c(self) -> C { C(self.0) } +} +fn main() { + let c = A::new(X(42, true)) + .into_b() + .into_c(); +} +"#, + InlayHintsConfig { + parameter_hints: false, + type_hints: false, + chaining_hints: true, + max_length: None, }, - ] - "###); + expect![[r#" + [ + InlayHint { + range: 246..283, + kind: ChainingHint, + label: "B>", + }, + InlayHint { + range: 246..265, + kind: ChainingHint, + label: "A>", + }, + ] + "#]], + ); } } -- cgit v1.2.3