Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-16 07:03:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix unwanted leading whitespace in hover text

Browse source 
PR #16366 moved layout information to a separate line, so the
leading whitespace is no longer necessary.
This commit is contained in:
Wilfred Hughes 2024-03-12 12:27:57 -07:00
parent a2e274142f
commit 30d3d68044
2 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/ide/src/hover/render.rs
View file

@ -510,7 +510,7 @@ fn render_notable_trait_comment(
let mut needs_impl_header = true; let mut needs_impl_header = true;
for (trait_, assoc_types) in notable_traits { for (trait_, assoc_types) in notable_traits {
desc.push_str(if mem::take(&mut needs_impl_header) { desc.push_str(if mem::take(&mut needs_impl_header) {
" // Implements notable traits: " "// Implements notable traits: "
} else { } else {
", " ", "
}); });
@ -661,7 +661,7 @@ fn closure_ty(
if let Some(layout) = if let Some(layout) =
render_memory_layout(config.memory_layout, || original.layout(sema.db), |_| None, |_| None) render_memory_layout(config.memory_layout, || original.layout(sema.db), |_| None, |_| None)
{ {
format_to!(markup, "{layout}"); format_to!(markup, " {layout}");
} }
if let Some(trait_) = c.fn_trait(sema.db).get_id(sema.db, original.krate(sema.db).into()) { if let Some(trait_) = c.fn_trait(sema.db).get_id(sema.db, original.krate(sema.db).into()) {
push_new_def(hir::Trait::from(trait_).into()) push_new_def(hir::Trait::from(trait_).into())
@ -730,7 +730,7 @@ fn render_memory_layout(
let config = config?; let config = config?;
let layout = layout().ok()?; let layout = layout().ok()?;
let mut label = String::from(" // "); let mut label = String::from("// ");
if let Some(render) = config.size { if let Some(render) = config.size {
let size = match tag(&layout) { let size = match tag(&layout) {

124
crates/ide/src/hover/tests.rs
View file

@ -180,7 +180,7 @@ fn foo() {
*local* *local*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
let local: i32 let local: i32
``` ```
"#]], "#]],
@ -471,7 +471,7 @@ fn main() {
*iter* *iter*
```rust ```rust
// size = 8, align = 4 // size = 8, align = 4
let mut iter: Iter<Scan<OtherStruct<OtherStruct<i32>>, impl Fn(&mut u32, &u32, &mut u32) -> Option<u32>, u32>> let mut iter: Iter<Scan<OtherStruct<OtherStruct<i32>>, impl Fn(&mut u32, &u32, &mut u32) -> Option<u32>, u32>>
``` ```
"#]], "#]],
@ -713,7 +713,7 @@ struct Foo { fiel$0d_a: u8, field_b: i32, field_c: i16 }
``` ```
```rust ```rust
// size = 1, align = 1, offset = 6 // size = 1, align = 1, offset = 6
field_a: u8 field_a: u8
``` ```
"#]], "#]],
@ -739,7 +739,7 @@ fn main() {
``` ```
```rust ```rust
// size = 4, align = 4, offset = 0 // size = 4, align = 4, offset = 0
pub field_a: u32 pub field_a: u32
``` ```
"#]], "#]],
@ -762,7 +762,7 @@ fn main() {
``` ```
```rust ```rust
// size = 4, align = 4, offset = 0 // size = 4, align = 4, offset = 0
pub field_a: u32 pub field_a: u32
``` ```
"#]], "#]],
@ -787,7 +787,7 @@ fn main() {
``` ```
```rust ```rust
// size = 4, align = 4, offset = 0 // size = 4, align = 4, offset = 0
pub 0: u32 pub 0: u32
``` ```
"#]], "#]],
@ -808,7 +808,7 @@ fn foo(foo: Foo) {
``` ```
```rust ```rust
// size = 4, align = 4, offset = 0 // size = 4, align = 4, offset = 0
pub 0: u32 pub 0: u32
``` ```
"#]], "#]],
@ -829,7 +829,7 @@ struct Foo$0(pub u32)
``` ```
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
struct Foo(pub u32); struct Foo(pub u32);
``` ```
"#]], "#]],
@ -957,7 +957,7 @@ fn main() {
*zz* *zz*
```rust ```rust
// size = 8, align = 4 // size = 8, align = 4
let zz: Test<i32> let zz: Test<i32>
``` ```
"#]], "#]],
@ -1009,7 +1009,7 @@ fn main() { let b$0ar = Some(12); }
*bar* *bar*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
let bar: Option<i32> let bar: Option<i32>
``` ```
"#]], "#]],
@ -1079,7 +1079,7 @@ fn hover_for_local_variable() {
*foo* *foo*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
foo: i32 foo: i32
``` ```
"#]], "#]],
@ -1094,7 +1094,7 @@ fn hover_for_local_variable_pat() {
*foo* *foo*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
foo: i32 foo: i32
``` ```
"#]], "#]],
@ -1109,7 +1109,7 @@ fn hover_local_var_edge() {
*foo* *foo*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
foo: i32 foo: i32
``` ```
"#]], "#]],
@ -1124,7 +1124,7 @@ fn hover_for_param_edge() {
*foo* *foo*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
foo: i32 foo: i32
``` ```
"#]], "#]],
@ -1169,7 +1169,7 @@ fn main() { let foo_$0test = Thing::new(); }
*foo_test* *foo_test*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
let foo_test: Thing let foo_test: Thing
``` ```
"#]], "#]],
@ -1374,7 +1374,7 @@ fn y() {
*x* *x*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
let x: i32 let x: i32
``` ```
"#]], "#]],
@ -1505,7 +1505,7 @@ fn foo(bar:u32) { let a = id!(ba$0r); }
*bar* *bar*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
bar: u32 bar: u32
``` ```
"#]], "#]],
@ -1524,7 +1524,7 @@ fn foo(bar:u32) { let a = id!(ba$0r); }
*bar* *bar*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
bar: u32 bar: u32
``` ```
"#]], "#]],
@ -1760,7 +1760,7 @@ fn test_hover_function_pointer_show_identifiers() {
``` ```
```rust ```rust
// size = 8, align = 8, niches = 1 // size = 8, align = 8, niches = 1
type foo = fn(a: i32, b: i32) -> i32 type foo = fn(a: i32, b: i32) -> i32
``` ```
"#]], "#]],
@ -1779,7 +1779,7 @@ fn test_hover_function_pointer_no_identifier() {
``` ```
```rust ```rust
// size = 8, align = 8, niches = 1 // size = 8, align = 8, niches = 1
type foo = fn(i32, i32) -> i32 type foo = fn(i32, i32) -> i32
``` ```
"#]], "#]],
@ -1926,7 +1926,7 @@ fn foo() { let bar = Ba$0r; }
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
struct Bar struct Bar
``` ```
@ -1963,7 +1963,7 @@ fn foo() { let bar = Ba$0r; }
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
struct Bar struct Bar
``` ```
@ -1993,7 +1993,7 @@ fn foo() { let bar = Ba$0r; }
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
struct Bar struct Bar
``` ```
@ -2022,7 +2022,7 @@ pub struct B$0ar
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
pub struct Bar pub struct Bar
``` ```
@ -2050,7 +2050,7 @@ pub struct B$0ar
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
pub struct Bar pub struct Bar
``` ```
@ -2140,7 +2140,7 @@ fn test_hover_layout_of_variant() {
``` ```
```rust ```rust
// size = 4, align = 2 // size = 4, align = 2
Variant1(u8, u16) Variant1(u8, u16)
``` ```
"#]], "#]],
@ -2162,7 +2162,7 @@ fn test_hover_layout_of_enum() {
``` ```
```rust ```rust
// size = 16 (0x10), align = 8, niches = 254 // size = 16 (0x10), align = 8, niches = 254
enum Foo { enum Foo {
Variant1(u8, u16), Variant1(u8, u16),
Variant2(i32, u8, i64), Variant2(i32, u8, i64),
@ -3466,7 +3466,7 @@ fn main() {
*f* *f*
```rust ```rust
// size = 8, align = 8, niches = 1 // size = 8, align = 8, niches = 1
let f: &i32 let f: &i32
``` ```
--- ---
@ -3476,7 +3476,7 @@ fn main() {
``` ```
```rust ```rust
// size = 4, align = 4, offset = 0 // size = 4, align = 4, offset = 0
f: i32 f: i32
``` ```
"#]], "#]],
@ -3561,7 +3561,7 @@ fn main() {
*value* *value*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
let value: Const<1> let value: Const<1>
``` ```
"#]], "#]],
@ -3582,7 +3582,7 @@ fn main() {
*value* *value*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
let value: Const<0> let value: Const<0>
``` ```
"#]], "#]],
@ -3603,7 +3603,7 @@ fn main() {
*value* *value*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
let value: Const<-1> let value: Const<-1>
``` ```
"#]], "#]],
@ -3624,7 +3624,7 @@ fn main() {
*value* *value*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
let value: Const<true> let value: Const<true>
``` ```
"#]], "#]],
@ -3645,7 +3645,7 @@ fn main() {
*value* *value*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
let value: Const<'🦀'> let value: Const<'🦀'>
``` ```
"#]], "#]],
@ -3665,7 +3665,7 @@ impl Foo {
*self* *self*
```rust ```rust
// size = 8, align = 8, niches = 1 // size = 8, align = 8, niches = 1
self: &Foo self: &Foo
``` ```
"#]], "#]],
@ -3686,7 +3686,7 @@ impl Foo {
*self* *self*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
self: Arc<Foo> self: Arc<Foo>
``` ```
"#]], "#]],
@ -4072,7 +4072,7 @@ type Fo$0o2 = Foo<2>;
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
type Foo2 = Foo<2> type Foo2 = Foo<2>
``` ```
"#]], "#]],
@ -4115,7 +4115,7 @@ enum E {
``` ```
```rust ```rust
// size = 1, align = 1 // size = 1, align = 1
A = 8 A = 8
``` ```
@ -4141,7 +4141,7 @@ enum E {
``` ```
```rust ```rust
// size = 1, align = 1 // size = 1, align = 1
A = 12 (0xC) A = 12 (0xC)
``` ```
@ -4168,7 +4168,7 @@ enum E {
``` ```
```rust ```rust
// size = 1, align = 1 // size = 1, align = 1
B = 2 B = 2
``` ```
@ -4195,7 +4195,7 @@ enum E {
``` ```
```rust ```rust
// size = 1, align = 1 // size = 1, align = 1
B = 5 B = 5
``` ```
@ -5002,7 +5002,7 @@ fn foo(e: E) {
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
A = 3 A = 3
``` ```
@ -5025,7 +5025,7 @@ fn main() {
*tile4* *tile4*
```rust ```rust
// size = 32 (0x20), align = 4 // size = 32 (0x20), align = 4
let tile4: [u32; 8] let tile4: [u32; 8]
``` ```
"#]], "#]],
@ -5262,7 +5262,7 @@ pub fn gimme() -> theitem::TheItem {
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
pub struct TheItem pub struct TheItem
``` ```
@ -5411,7 +5411,7 @@ mod string {
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
struct String struct String
``` ```
@ -6139,7 +6139,7 @@ foo_macro!(
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
pub struct Foo pub struct Foo
``` ```
@ -6165,7 +6165,7 @@ pub struct Foo(i32);
``` ```
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
pub struct Foo(i32); pub struct Foo(i32);
``` ```
@ -6290,7 +6290,7 @@ enum Enum {
``` ```
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
RecordV { field: u32 } RecordV { field: u32 }
``` ```
"#]], "#]],
@ -6313,7 +6313,7 @@ enum Enum {
``` ```
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
field: u32 field: u32
``` ```
"#]], "#]],
@ -6961,7 +6961,7 @@ fn test() {
``` ```
```rust ```rust
// size = 4, align = 4, offset = 0 // size = 4, align = 4, offset = 0
f: u32 f: u32
``` ```
"#]], "#]],
@ -6981,7 +6981,7 @@ fn test() {
*s* *s*
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
let s: S let s: S
``` ```
"#]], "#]],
@ -7002,7 +7002,7 @@ fn test() {
*foo* *foo*
```rust ```rust
// size = 4, align = 4 // size = 4, align = 4
let foo: i32 let foo: i32
``` ```
"#]], "#]],
@ -7023,7 +7023,7 @@ format_args!("{aaaaa$0}");
*aaaaa* *aaaaa*
```rust ```rust
// size = 16 (0x10), align = 8, niches = 1 // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str let aaaaa: &str
``` ```
"#]], "#]],
@ -7044,7 +7044,7 @@ format_args!("{$0aaaaa}");
*aaaaa* *aaaaa*
```rust ```rust
// size = 16 (0x10), align = 8, niches = 1 // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str let aaaaa: &str
``` ```
"#]], "#]],
@ -7065,7 +7065,7 @@ format_args!(r"{$0aaaaa}");
*aaaaa* *aaaaa*
```rust ```rust
// size = 16 (0x10), align = 8, niches = 1 // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str let aaaaa: &str
``` ```
"#]], "#]],
@ -7091,7 +7091,7 @@ foo!(r"{$0aaaaa}");
*aaaaa* *aaaaa*
```rust ```rust
// size = 16 (0x10), align = 8, niches = 1 // size = 16 (0x10), align = 8, niches = 1
let aaaaa: &str let aaaaa: &str
``` ```
"#]], "#]],
@ -7440,8 +7440,8 @@ fn main(notable$0: u32) {}
*notable* *notable*
```rust ```rust
// Implements notable traits: Notable<Assoc = &str, Assoc2 = char> // Implements notable traits: Notable<Assoc = &str, Assoc2 = char>
// size = 4, align = 4 // size = 4, align = 4
notable: u32 notable: u32
``` ```
"#]], "#]],
@ -7472,8 +7472,8 @@ impl Iterator for S {
``` ```
```rust ```rust
// Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S> // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>
// size = 0, align = 1 // size = 0, align = 1
struct S struct S
``` ```
"#]], "#]],
@ -7532,7 +7532,7 @@ extern "C" {
``` ```
```rust ```rust
// size = 0, align = 1 // size = 0, align = 1
type Ty type Ty
``` ```
"#]], "#]],
@ -7560,7 +7560,7 @@ fn main() {
"#, "#,
expect![[r#" expect![[r#"
```rust ```rust
// Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S> // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>
S S
```"#]], ```"#]],
); );