Skip to content

Switch to expect for the rest of inlay tests #5151

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
Jun 30, 2020
Merged

Switch to expect for the rest of inlay tests #5151

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
174 changes: 100 additions & 74 deletions crates/ra_ide/src/inlay_hints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ fn get_fn_signature(sema: &Semantics<RootDatabase>, 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};
Expand All @@ -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(
Expand Down Expand Up @@ -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]
Expand All @@ -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 }
Expand All @@ -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>(T);
struct B<T>(T);
struct C<T>(T);
struct X<T,R>(T, R);

impl<T> A<T> {
fn new(t: T) -> Self { A(t) }
fn into_b(self) -> B<T> { B(self.0) }
}
impl<T> B<T> {
fn into_c(self) -> C<T> { 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<X<i32, bool>>",
},
InlayHint {
range: 246..265,
kind: ChainingHint,
label: "A<X<i32, bool>>",
struct A<T>(T);
struct B<T>(T);
struct C<T>(T);
struct X<T,R>(T, R);

impl<T> A<T> {
fn new(t: T) -> Self { A(t) }
fn into_b(self) -> B<T> { B(self.0) }
}
impl<T> B<T> {
fn into_c(self) -> C<T> { 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<X<i32, bool>>",
},
InlayHint {
range: 246..265,
kind: ChainingHint,
label: "A<X<i32, bool>>",
},
]
"#]],
);
}
}