Unnamed repository; edit this file 'description' to name the repository.
Lower string literals with real val, not default
Tianyi Song 2022-03-04
parent 9d473a0 · commit 89a19f5
-rw-r--r--crates/hir_def/src/body/lower.rs5
-rw-r--r--crates/ide/src/hover/tests.rs21
2 files changed, 25 insertions, 1 deletions
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index 06ad7ce4cd..085eea7fbd 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
@@ -923,7 +923,10 @@ impl From<ast::LiteralKind> for Literal {
let text = bs.value().map(Box::from).unwrap_or_else(Default::default);
Literal::ByteString(text)
}
- LiteralKind::String(_) => Literal::String(Default::default()),
+ LiteralKind::String(s) => {
+ let text = s.value().map(Box::from).unwrap_or_else(Default::default);
+ Literal::String(text)
+ }
LiteralKind::Byte => Literal::Uint(Default::default(), Some(BuiltinUint::U8)),
LiteralKind::Bool(val) => Literal::Bool(val),
LiteralKind::Char => Literal::Char(Default::default()),
diff --git a/crates/ide/src/hover/tests.rs b/crates/ide/src/hover/tests.rs
index df0ca941c9..d74666b514 100644
--- a/crates/ide/src/hover/tests.rs
+++ b/crates/ide/src/hover/tests.rs
@@ -3490,6 +3490,27 @@ const FOO$0: usize = 1 << 100;
This is a doc
"#]],
);
+ check(
+ r#"
+/// This is a doc
+const FOO$0: &str = "bar";
+"#,
+ expect![[r#"
+ *FOO*
+
+ ```rust
+ test
+ ```
+
+ ```rust
+ const FOO: &str = "bar"
+ ```
+
+ ---
+
+ This is a doc
+ "#]],
+ );
}
#[test]