Prettier rendering

This commit is contained in:
Aleksey Kladov 2020-07-09 10:30:47 +02:00
parent e7c47eb7f5
commit c66812193e

View file

@ -368,7 +368,7 @@ mod tests {
let content = analysis.db.file_text(position.file_id); let content = analysis.db.file_text(position.file_id);
let hovered_element = &content[hover.range]; let hovered_element = &content[hover.range];
let actual = format!("{}:\n{}\n", hovered_element, hover.info.markup); let actual = format!("*{}*\n{}\n", hovered_element, hover.info.markup);
expect.assert_eq(&actual) expect.assert_eq(&actual)
} }
@ -389,7 +389,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
foo(): *foo()*
```rust ```rust
u32 u32
``` ```
@ -421,7 +421,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
iter: *iter*
```rust ```rust
Iter<Scan<OtherStruct<OtherStruct<i32>>, |&mut u32, &u32, &mut u32| -> Option<u32>, u32>> Iter<Scan<OtherStruct<OtherStruct<i32>>, |&mut u32, &u32, &mut u32| -> Option<u32>, u32>>
``` ```
@ -439,7 +439,7 @@ pub fn foo() -> u32 { 1 }
fn main() { let foo_test = fo<|>o(); } fn main() { let foo_test = fo<|>o(); }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
pub fn foo() -> u32 pub fn foo() -> u32
``` ```
@ -466,7 +466,7 @@ mod c;
fn main() { let foo_test = fo<|>o(); } fn main() { let foo_test = fo<|>o(); }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
{unknown} {unknown}
``` ```
@ -483,7 +483,7 @@ pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str { }
fn main() { let foo_test = fo<|>o(); } fn main() { let foo_test = fo<|>o(); }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str
``` ```
@ -500,7 +500,7 @@ pub fn foo<|>(a: u32, b: u32) -> u32 {}
fn main() { } fn main() { }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
pub fn foo(a: u32, b: u32) -> u32 pub fn foo(a: u32, b: u32) -> u32
``` ```
@ -520,7 +520,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
field_a: *field_a*
```rust ```rust
Foo Foo
``` ```
@ -541,7 +541,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
field_a: *field_a*
```rust ```rust
Foo Foo
``` ```
@ -558,7 +558,7 @@ fn main() {
check( check(
r#"const foo<|>: u32 = 0;"#, r#"const foo<|>: u32 = 0;"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
const foo: u32 const foo: u32
``` ```
@ -567,7 +567,7 @@ fn main() {
check( check(
r#"static foo<|>: u32 = 0;"#, r#"static foo<|>: u32 = 0;"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
static foo: u32 static foo: u32
``` ```
@ -585,7 +585,7 @@ fn main() {
let zz<|> = Test { t: 23u8, k: 33 }; let zz<|> = Test { t: 23u8, k: 33 };
}"#, }"#,
expect![[r#" expect![[r#"
zz: *zz*
```rust ```rust
Test<i32, u8> Test<i32, u8>
``` ```
@ -603,7 +603,7 @@ use Option::Some;
fn main() { So<|>me(12); } fn main() { So<|>me(12); }
"#, "#,
expect![[r#" expect![[r#"
Some: *Some*
```rust ```rust
Option Option
``` ```
@ -622,7 +622,7 @@ use Option::Some;
fn main() { let b<|>ar = Some(12); } fn main() { let b<|>ar = Some(12); }
"#, "#,
expect![[r#" expect![[r#"
bar: *bar*
```rust ```rust
Option<i32> Option<i32>
``` ```
@ -640,7 +640,7 @@ enum Option<T> {
} }
"#, "#,
expect![[r#" expect![[r#"
None: *None*
```rust ```rust
Option Option
``` ```
@ -665,7 +665,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
Some: *Some*
```rust ```rust
Option Option
``` ```
@ -685,7 +685,7 @@ fn main() {
check( check(
r#"fn func(foo: i32) { fo<|>o; }"#, r#"fn func(foo: i32) { fo<|>o; }"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
i32 i32
``` ```
@ -698,7 +698,7 @@ fn main() {
check( check(
r#"fn func(fo<|>o: i32) {}"#, r#"fn func(fo<|>o: i32) {}"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
i32 i32
``` ```
@ -711,7 +711,7 @@ fn main() {
check( check(
r#"fn func(foo: i32) { if true { <|>foo; }; }"#, r#"fn func(foo: i32) { if true { <|>foo; }; }"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
i32 i32
``` ```
@ -724,7 +724,7 @@ fn main() {
check( check(
r#"fn func(<|>foo: i32) {}"#, r#"fn func(<|>foo: i32) {}"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
i32 i32
``` ```
@ -745,7 +745,7 @@ impl Thing {
fn main() { let foo_<|>test = Thing::new(); } fn main() { let foo_<|>test = Thing::new(); }
"#, "#,
expect![[r#" expect![[r#"
foo_test: *foo_test*
```rust ```rust
Thing Thing
``` ```
@ -768,7 +768,7 @@ mod wrapper {
fn main() { let foo_test = wrapper::Thing::new<|>(); } fn main() { let foo_test = wrapper::Thing::new<|>(); }
"#, "#,
expect![[r#" expect![[r#"
new: *new*
```rust ```rust
wrapper::Thing wrapper::Thing
``` ```
@ -798,7 +798,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
C: *C*
```rust ```rust
const C: u32 const C: u32
``` ```
@ -816,7 +816,7 @@ impl Thing {
} }
"#, "#,
expect![[r#" expect![[r#"
Self { x: 0 }: *Self { x: 0 }*
```rust ```rust
Thing Thing
``` ```
@ -875,7 +875,7 @@ fn y() {
} }
"#, "#,
expect![[r#" expect![[r#"
x: *x*
```rust ```rust
i32 i32
``` ```
@ -892,7 +892,7 @@ macro_rules! foo { () => {} }
fn f() { fo<|>o!(); } fn f() { fo<|>o!(); }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
macro_rules! foo macro_rules! foo
``` ```
@ -905,7 +905,7 @@ fn f() { fo<|>o!(); }
check( check(
r#"struct TS(String, i32<|>);"#, r#"struct TS(String, i32<|>);"#,
expect![[r#" expect![[r#"
i32: *i32*
i32 i32
"#]], "#]],
) )
@ -922,7 +922,7 @@ id! {
} }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
fn foo() fn foo()
``` ```
@ -938,7 +938,7 @@ macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
fn foo(bar:u32) { let a = id!(ba<|>r); } fn foo(bar:u32) { let a = id!(ba<|>r); }
"#, "#,
expect![[r#" expect![[r#"
bar: *bar*
```rust ```rust
u32 u32
``` ```
@ -955,7 +955,7 @@ macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
fn foo(bar:u32) { let a = id!(ba<|>r); } fn foo(bar:u32) { let a = id!(ba<|>r); }
"#, "#,
expect![[r#" expect![[r#"
bar: *bar*
```rust ```rust
u32 u32
``` ```
@ -973,7 +973,7 @@ fn bar() -> u32 { 0 }
fn foo() { let a = id!([0u32, bar(<|>)] ); } fn foo() { let a = id!([0u32, bar(<|>)] ); }
"#, "#,
expect![[r#" expect![[r#"
bar(): *bar()*
```rust ```rust
u32 u32
``` ```
@ -992,7 +992,7 @@ fn foo() {
} }
"#, "#,
expect![[r#" expect![[r#"
"Tracks": *"Tracks"*
```rust ```rust
&str &str
``` ```
@ -1013,7 +1013,7 @@ fn foo() {
} }
"#, "#,
expect![[r#" expect![[r#"
bar: *bar*
```rust ```rust
fn bar() -> bool fn bar() -> bool
``` ```
@ -1045,7 +1045,7 @@ fn foo() { }
fn bar() { fo<|>o(); } fn bar() { fo<|>o(); }
", ",
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
fn foo() fn foo()
``` ```
@ -1061,7 +1061,7 @@ fn bar() { fo<|>o(); }
check( check(
r#"async fn foo<|>() {}"#, r#"async fn foo<|>() {}"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
async fn foo() async fn foo()
``` ```
@ -1070,7 +1070,7 @@ fn bar() { fo<|>o(); }
check( check(
r#"pub const unsafe fn foo<|>() {}"#, r#"pub const unsafe fn foo<|>() {}"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
pub const unsafe fn foo() pub const unsafe fn foo()
``` ```
@ -1079,7 +1079,7 @@ fn bar() { fo<|>o(); }
check( check(
r#"pub(crate) async unsafe extern "C" fn foo<|>() {}"#, r#"pub(crate) async unsafe extern "C" fn foo<|>() {}"#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
pub(crate) async unsafe extern "C" fn foo() pub(crate) async unsafe extern "C" fn foo()
``` ```
@ -1116,7 +1116,7 @@ mod my { pub struct Bar; }
fn my() {} fn my() {}
"#, "#,
expect![[r#" expect![[r#"
my: *my*
```rust ```rust
mod my mod my
``` ```
@ -1134,7 +1134,7 @@ struct Bar;
fn foo() { let bar = Ba<|>r; } fn foo() { let bar = Ba<|>r; }
"#, "#,
expect![[r#" expect![[r#"
Bar: *Bar*
```rust ```rust
struct Bar struct Bar
``` ```
@ -1155,7 +1155,7 @@ struct Bar;
fn foo() { let bar = Ba<|>r; } fn foo() { let bar = Ba<|>r; }
"#, "#,
expect![[r#" expect![[r#"
Bar: *Bar*
```rust ```rust
struct Bar struct Bar
``` ```
@ -1178,7 +1178,7 @@ struct Bar;
fn foo() { let bar = Ba<|>r; } fn foo() { let bar = Ba<|>r; }
"#, "#,
expect![[r#" expect![[r#"
Bar: *Bar*
```rust ```rust
struct Bar struct Bar
``` ```
@ -1214,7 +1214,7 @@ bar!();
fn foo() { let bar = Bar; bar.fo<|>o(); } fn foo() { let bar = Bar; bar.fo<|>o(); }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
Bar Bar
``` ```
@ -1250,7 +1250,7 @@ bar!();
fn foo() { let bar = Bar; bar.fo<|>o(); } fn foo() { let bar = Bar; bar.fo<|>o(); }
"#, "#,
expect![[r#" expect![[r#"
foo: *foo*
```rust ```rust
Bar Bar
``` ```