Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 05:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix render of literal to be rendered in codeblock

Browse source
This commit is contained in:
dfireBird 2024-12-30 18:44:38 +05:30
parent 2e13684be1
commit 92f8fef527
No known key found for this signature in database
GPG key ID: 26D522CA5FC2B93D
2 changed files with 65 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -715,10 +715,17 @@ pub(super) fn literal(
let mut s = format!("```rust\n{ty}\n```\n___\n\n"); let mut s = format!("```rust\n{ty}\n```\n___\n\n");
match value { match value {
Ok(value) => { Ok(value) => {
let backtick_len = value.chars().filter(|c| *c == '`').count();
let backticks = "`".repeat(backtick_len + 1);
if let Some(newline) = value.find('\n') { if let Some(newline) = value.find('\n') {
format_to!(s, "value of literal (truncated up to newline): {}", &value[..newline]) format_to!(
s,
"value of literal (truncated up to newline): {backticks} {} {backticks}",
&value[..newline]
)
} else { } else {
format_to!(s, "value of literal: {value}") format_to!(s, "value of literal: {backticks} {value} {backticks}")
} }
} }
Err(error) => format_to!(s, "invalid literal: {error}"), Err(error) => format_to!(s, "invalid literal: {error}"),

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

@ -8157,7 +8157,7 @@ fn main() {
``` ```
___ ___
value of literal: 🦀🦀\A value of literal: ` 🦀🦀\A `
"#]], "#]],
); );
check( check(
@ -8173,7 +8173,7 @@ fn main() {
``` ```
___ ___
value of literal: 🦀\u{1f980}\\\x41 value of literal: ` 🦀\u{1f980}\\\x41 `
"#]], "#]],
); );
check( check(
@ -8195,7 +8195,7 @@ fsdghs";
``` ```
___ ___
value of literal (truncated up to newline): 🦀\u{1f980}\\\x41 value of literal (truncated up to newline): ` 🦀\u{1f980}\\\x41 `
"#]], "#]],
); );
} }
@ -8215,7 +8215,41 @@ fn main() {
``` ```
___ ___
value of literal: 🦀🦀\A value of literal: ` 🦀🦀\A `
"#]],
);
}
#[test]
fn rawstring_literal() {
check(
r#"
fn main() {
$0r"`[^`]*`";
}"#,
expect![[r#"
*r"`[^`]*`"*
```rust
&str
```
___
value of literal: ```` `[^`]*` ````
"#]],
);
check(
r#"
fn main() {
$0r"`";
}"#,
expect![[r#"
*r"`"*
```rust
&str
```
___
value of literal: `` ` ``
"#]], "#]],
); );
} }
@ -8235,7 +8269,7 @@ fn main() {
``` ```
___ ___
value of literal: [240, 159, 166, 128, 92] value of literal: ` [240, 159, 166, 128, 92] `
"#]], "#]],
); );
check( check(
@ -8251,7 +8285,7 @@ fn main() {
``` ```
___ ___
value of literal: [92, 120, 70, 48, 92, 120, 57, 70, 92, 120, 65, 54, 92, 120, 56, 48, 92, 92] value of literal: ` [92, 120, 70, 48, 92, 120, 57, 70, 92, 120, 65, 54, 92, 120, 56, 48, 92, 92] `
"#]], "#]],
); );
} }
@ -8271,7 +8305,7 @@ fn main() {
``` ```
___ ___
value of literal: 0xF0 value of literal: ` 0xF0 `
"#]], "#]],
); );
check( check(
@ -8287,7 +8321,7 @@ fn main() {
``` ```
___ ___
value of literal: 0x5C value of literal: ` 0x5C `
"#]], "#]],
); );
} }
@ -8307,7 +8341,7 @@ fn main() {
``` ```
___ ___
value of literal: A value of literal: ` A `
"#]], "#]],
); );
check( check(
@ -8323,7 +8357,7 @@ fn main() {
``` ```
___ ___
value of literal: \ value of literal: ` \ `
"#]], "#]],
); );
check( check(
@ -8339,7 +8373,7 @@ fn main() {
``` ```
___ ___
value of literal: 🦀 value of literal: ` 🦀 `
"#]], "#]],
); );
} }
@ -8359,7 +8393,7 @@ fn main() {
``` ```
___ ___
value of literal: 1 (bits: 0x3FF0000000000000) value of literal: ` 1 (bits: 0x3FF0000000000000) `
"#]], "#]],
); );
check( check(
@ -8375,7 +8409,7 @@ fn main() {
``` ```
___ ___
value of literal: 1 (bits: 0x3C00) value of literal: ` 1 (bits: 0x3C00) `
"#]], "#]],
); );
check( check(
@ -8391,7 +8425,7 @@ fn main() {
``` ```
___ ___
value of literal: 1 (bits: 0x3F800000) value of literal: ` 1 (bits: 0x3F800000) `
"#]], "#]],
); );
check( check(
@ -8407,7 +8441,7 @@ fn main() {
``` ```
___ ___
value of literal: 1 (bits: 0x3FFF0000000000000000000000000000) value of literal: ` 1 (bits: 0x3FFF0000000000000000000000000000) `
"#]], "#]],
); );
check( check(
@ -8423,7 +8457,7 @@ fn main() {
``` ```
___ ___
value of literal: 134000000000000 (bits: 0x42DE77D399980000) value of literal: ` 134000000000000 (bits: 0x42DE77D399980000) `
"#]], "#]],
); );
check( check(
@ -8439,7 +8473,7 @@ fn main() {
``` ```
___ ___
value of literal: 1523527134274733600000000 (bits: 0x44F429E9249F629B) value of literal: ` 1523527134274733600000000 (bits: 0x44F429E9249F629B) `
"#]], "#]],
); );
check( check(
@ -8475,7 +8509,7 @@ fn main() {
``` ```
___ ___
value of literal: 34325236457856836345234 (0x744C659178614489D92|0b111010001001100011001011001000101111000011000010100010010001001110110010010) value of literal: ` 34325236457856836345234 (0x744C659178614489D92|0b111010001001100011001011001000101111000011000010100010010001001110110010010) `
"#]], "#]],
); );
check( check(
@ -8491,7 +8525,7 @@ fn main() {
``` ```
___ ___
value of literal: 13412342421 (0x31F701A95|0b1100011111011100000001101010010101) value of literal: ` 13412342421 (0x31F701A95|0b1100011111011100000001101010010101) `
"#]], "#]],
); );
check( check(
@ -8507,7 +8541,7 @@ fn main() {
``` ```
___ ___
value of literal: 306328611 (0x12423423|0b10010010000100011010000100011) value of literal: ` 306328611 (0x12423423|0b10010010000100011010000100011) `
"#]], "#]],
); );
check( check(
@ -8523,7 +8557,7 @@ fn main() {
``` ```
___ ___
value of literal: 255 (0xFF|0b11111111) value of literal: ` 255 (0xFF|0b11111111) `
"#]], "#]],
); );
check( check(
@ -8539,7 +8573,7 @@ fn main() {
``` ```
___ ___
value of literal: 5349 (0x14E5|0b1010011100101) value of literal: ` 5349 (0x14E5|0b1010011100101) `
"#]], "#]],
); );
check( check(