Skip to content

Commit 1d817dc

Browse files
committed
fix(hover): unify horizontal rule formatting to ---
Replaces all `___` with `---` in hover documentation markups. Both styles are valid per the GitHub Flavored Markdown spec, but `---` is less ambiguous and already more widely used in rust-analyzer
1 parent efbe625 commit 1d817dc

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

src/tools/rust-analyzer/crates/ide/src/hover/render.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ pub(super) fn try_for_lint(attr: &ast::Attr, token: &SyntaxToken) -> Option<Hove
361361
let lint =
362362
lints.binary_search_by_key(&needle, |lint| lint.label).ok().map(|idx| &lints[idx])?;
363363
Some(HoverResult {
364-
markup: Markup::from(format!("```\n{}\n```\n___\n\n{}", lint.label, lint.description)),
364+
markup: Markup::from(format!("```\n{}\n```\n---\n\n{}", lint.label, lint.description)),
365365
..Default::default()
366366
})
367367
}
@@ -912,7 +912,7 @@ pub(super) fn literal(
912912
};
913913
let ty = ty.display(sema.db, display_target);
914914

915-
let mut s = format!("```rust\n{ty}\n```\n___\n\n");
915+
let mut s = format!("```rust\n{ty}\n```\n---\n\n");
916916
match value {
917917
Ok(value) => {
918918
let backtick_len = value.chars().filter(|c| *c == '`').count();
@@ -1026,7 +1026,7 @@ fn type_info(
10261026
if let Some(extra) =
10271027
render_notable_trait(db, &notable_traits(db, &original), edition, display_target)
10281028
{
1029-
desc.push_str("\n___\n");
1029+
desc.push_str("\n---\n");
10301030
desc.push_str(&extra);
10311031
};
10321032
desc.into()
@@ -1094,7 +1094,7 @@ fn closure_ty(
10941094
|_| None,
10951095
|_| None,
10961096
) {
1097-
format_to!(markup, "\n___\n{layout}");
1097+
format_to!(markup, "\n---\n{layout}");
10981098
}
10991099
format_to!(markup, "{adjusted}\n\n## Captures\n{}", captures_rendered,);
11001100

src/tools/rust-analyzer/crates/ide/src/hover/tests.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ fn main() {
357357
```rust
358358
impl Fn(i32) -> i32
359359
```
360-
___
360+
---
361361
size = 8, align = 8, niches = 1
362362
363363
## Captures
@@ -380,7 +380,7 @@ fn main() {
380380
```rust
381381
impl Fn(i32) -> i32
382382
```
383-
___
383+
---
384384
size = 0, align = 1
385385
386386
## Captures
@@ -414,7 +414,7 @@ fn main() {
414414
```rust
415415
impl FnOnce()
416416
```
417-
___
417+
---
418418
size = 16 (0x10), align = 8, niches = 1
419419
420420
## Captures
@@ -443,7 +443,7 @@ fn main() {
443443
```rust
444444
impl FnMut()
445445
```
446-
___
446+
---
447447
size = 8, align = 8, niches = 1
448448
449449
## Captures
@@ -468,7 +468,7 @@ fn main() {
468468
```rust
469469
impl FnOnce() -> S2
470470
```
471-
___
471+
---
472472
size = 8, align = 8, niches = 1
473473
Coerced to: &impl FnOnce() -> S2
474474
@@ -6829,7 +6829,7 @@ fn hover_lint() {
68296829
```
68306830
arithmetic_overflow
68316831
```
6832-
___
6832+
---
68336833
68346834
arithmetic operation overflows
68356835
"#]],
@@ -6841,7 +6841,7 @@ fn hover_lint() {
68416841
```
68426842
arithmetic_overflow
68436843
```
6844-
___
6844+
---
68456845
68466846
arithmetic operation overflows
68476847
"#]],
@@ -6857,7 +6857,7 @@ fn hover_clippy_lint() {
68576857
```
68586858
clippy::almost_swapped
68596859
```
6860-
___
6860+
---
68616861
68626862
Checks for `foo = bar; bar = foo` sequences.
68636863
"#]],
@@ -6869,7 +6869,7 @@ fn hover_clippy_lint() {
68696869
```
68706870
clippy::almost_swapped
68716871
```
6872-
___
6872+
---
68736873
68746874
Checks for `foo = bar; bar = foo` sequences.
68756875
"#]],
@@ -8567,7 +8567,7 @@ fn main() {
85678567
```rust
85688568
&'static str
85698569
```
8570-
___
8570+
---
85718571
85728572
value of literal: ` 🦀🦀\A `
85738573
"#]],
@@ -8583,7 +8583,7 @@ fn main() {
85838583
```rust
85848584
&'static str
85858585
```
8586-
___
8586+
---
85878587
85888588
value of literal: ` 🦀\u{1f980}\\\x41 `
85898589
"#]],
@@ -8605,7 +8605,7 @@ fsdghs";
86058605
```rust
86068606
&'static str
86078607
```
8608-
___
8608+
---
86098609
86108610
value of literal (truncated up to newline): ` 🦀\u{1f980}\\\x41 `
86118611
"#]],
@@ -8625,7 +8625,7 @@ fn main() {
86258625
```rust
86268626
&'static {unknown}
86278627
```
8628-
___
8628+
---
86298629
86308630
value of literal: ` 🦀🦀\A `
86318631
"#]],
@@ -8644,7 +8644,7 @@ fn main() {
86448644
```rust
86458645
&'static str
86468646
```
8647-
___
8647+
---
86488648
86498649
value of literal: ```` `[^`]*` ````
86508650
"#]],
@@ -8659,7 +8659,7 @@ fn main() {
86598659
```rust
86608660
&'static str
86618661
```
8662-
___
8662+
---
86638663
86648664
value of literal: `` ` ``
86658665
"#]],
@@ -8674,7 +8674,7 @@ fn main() {
86748674
```rust
86758675
&'static str
86768676
```
8677-
___
8677+
---
86788678
86798679
value of literal: ` `
86808680
"#]],
@@ -8690,7 +8690,7 @@ fn main() {
86908690
```rust
86918691
&'static str
86928692
```
8693-
___
8693+
---
86948694
86958695
value of literal: ` Hello World `
86968696
"#]],
@@ -8710,7 +8710,7 @@ fn main() {
87108710
```rust
87118711
&'static [u8; 5]
87128712
```
8713-
___
8713+
---
87148714
87158715
value of literal: ` [240, 159, 166, 128, 92] `
87168716
"#]],
@@ -8726,7 +8726,7 @@ fn main() {
87268726
```rust
87278727
&'static [u8; 18]
87288728
```
8729-
___
8729+
---
87308730
87318731
value of literal: ` [92, 120, 70, 48, 92, 120, 57, 70, 92, 120, 65, 54, 92, 120, 56, 48, 92, 92] `
87328732
"#]],
@@ -8746,7 +8746,7 @@ fn main() {
87468746
```rust
87478747
u8
87488748
```
8749-
___
8749+
---
87508750
87518751
value of literal: ` 0xF0 `
87528752
"#]],
@@ -8762,7 +8762,7 @@ fn main() {
87628762
```rust
87638763
u8
87648764
```
8765-
___
8765+
---
87668766
87678767
value of literal: ` 0x5C `
87688768
"#]],
@@ -8782,7 +8782,7 @@ fn main() {
87828782
```rust
87838783
char
87848784
```
8785-
___
8785+
---
87868786
87878787
value of literal: ` A `
87888788
"#]],
@@ -8798,7 +8798,7 @@ fn main() {
87988798
```rust
87998799
char
88008800
```
8801-
___
8801+
---
88028802
88038803
value of literal: ` \ `
88048804
"#]],
@@ -8814,7 +8814,7 @@ fn main() {
88148814
```rust
88158815
char
88168816
```
8817-
___
8817+
---
88188818
88198819
value of literal: ` 🦀 `
88208820
"#]],
@@ -8834,7 +8834,7 @@ fn main() {
88348834
```rust
88358835
f64
88368836
```
8837-
___
8837+
---
88388838
88398839
value of literal: ` 1 (bits: 0x3FF0000000000000) `
88408840
"#]],
@@ -8850,7 +8850,7 @@ fn main() {
88508850
```rust
88518851
f16
88528852
```
8853-
___
8853+
---
88548854
88558855
value of literal: ` 1 (bits: 0x3C00) `
88568856
"#]],
@@ -8866,7 +8866,7 @@ fn main() {
88668866
```rust
88678867
f32
88688868
```
8869-
___
8869+
---
88708870
88718871
value of literal: ` 1 (bits: 0x3F800000) `
88728872
"#]],
@@ -8882,7 +8882,7 @@ fn main() {
88828882
```rust
88838883
f128
88848884
```
8885-
___
8885+
---
88868886
88878887
value of literal: ` 1 (bits: 0x3FFF0000000000000000000000000000) `
88888888
"#]],
@@ -8898,7 +8898,7 @@ fn main() {
88988898
```rust
88998899
f64
89008900
```
8901-
___
8901+
---
89028902
89038903
value of literal: ` 134000000000000 (bits: 0x42DE77D399980000) `
89048904
"#]],
@@ -8914,7 +8914,7 @@ fn main() {
89148914
```rust
89158915
f64
89168916
```
8917-
___
8917+
---
89188918
89198919
value of literal: ` 1523527134274733600000000 (bits: 0x44F429E9249F629B) `
89208920
"#]],
@@ -8930,7 +8930,7 @@ fn main() {
89308930
```rust
89318931
f64
89328932
```
8933-
___
8933+
---
89348934
89358935
invalid literal: invalid float literal
89368936
"#]],
@@ -8950,7 +8950,7 @@ fn main() {
89508950
```rust
89518951
i32
89528952
```
8953-
___
8953+
---
89548954
89558955
value of literal: ` 34325236457856836345234 (0x744C659178614489D92|0b111010001001100011001011001000101111000011000010100010010001001110110010010) `
89568956
"#]],
@@ -8966,7 +8966,7 @@ fn main() {
89668966
```rust
89678967
i32
89688968
```
8969-
___
8969+
---
89708970
89718971
value of literal: ` 13412342421 (0x31F701A95|0b1100011111011100000001101010010101) `
89728972
"#]],
@@ -8982,7 +8982,7 @@ fn main() {
89828982
```rust
89838983
i32
89848984
```
8985-
___
8985+
---
89868986
89878987
value of literal: ` 306328611 (0x12423423|0b10010010000100011010000100011) `
89888988
"#]],
@@ -8998,7 +8998,7 @@ fn main() {
89988998
```rust
89998999
i32
90009000
```
9001-
___
9001+
---
90029002
90039003
value of literal: ` 255 (0xFF|0b11111111) `
90049004
"#]],
@@ -9014,7 +9014,7 @@ fn main() {
90149014
```rust
90159015
i32
90169016
```
9017-
___
9017+
---
90189018
90199019
value of literal: ` 5349 (0x14E5|0b1010011100101) `
90209020
"#]],
@@ -9030,7 +9030,7 @@ fn main() {
90309030
```rust
90319031
i32
90329032
```
9033-
___
9033+
---
90349034
90359035
invalid literal: number too large to fit in target type
90369036
"#]],
@@ -9186,7 +9186,7 @@ fn main() {
91869186
```rust
91879187
S
91889188
```
9189-
___
9189+
---
91909190
Implements notable traits: `Future<Output = u32>`, `Iterator<Item = S>`, `Notable`"#]],
91919191
);
91929192
}

0 commit comments

Comments
 (0)