bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-expand/src/attrs.rs')
-rw-r--r--crates/hir-expand/src/attrs.rs44
1 files changed, 21 insertions, 23 deletions
diff --git a/crates/hir-expand/src/attrs.rs b/crates/hir-expand/src/attrs.rs
index 36636a228f..4fce7c1fde 100644
--- a/crates/hir-expand/src/attrs.rs
+++ b/crates/hir-expand/src/attrs.rs
@@ -5,11 +5,14 @@ use base_db::CrateId;
use cfg::CfgExpr;
use either::Either;
use intern::{sym, Interned};
-use mbe::{syntax_node_to_token_tree, DelimiterKind, DocCommentDesugarMode, Punct};
+use mbe::{
+ desugar_doc_comment_text, syntax_node_to_token_tree, token_to_literal, DelimiterKind,
+ DocCommentDesugarMode, Punct,
+};
use smallvec::{smallvec, SmallVec};
use span::{Span, SyntaxContextId};
use syntax::unescape;
-use syntax::{ast, format_smolstr, match_ast, AstNode, AstToken, SmolStr, SyntaxNode};
+use syntax::{ast, match_ast, AstNode, AstToken, SyntaxNode};
use triomphe::ThinArc;
use crate::name::Name;
@@ -53,11 +56,15 @@ impl RawAttrs {
}
Either::Right(comment) => comment.doc_comment().map(|doc| {
let span = span_map.span_for_range(comment.syntax().text_range());
+ let (text, kind) =
+ desugar_doc_comment_text(doc, DocCommentDesugarMode::ProcMacro);
Attr {
id,
input: Some(Box::new(AttrInput::Literal(tt::Literal {
- text: SmolStr::new(format_smolstr!("\"{}\"", Self::escape_chars(doc))),
+ text,
span,
+ kind,
+ suffix: None,
}))),
path: Interned::new(ModPath::from(Name::new_symbol(
sym::doc.clone(),
@@ -78,10 +85,6 @@ impl RawAttrs {
RawAttrs { entries }
}
- fn escape_chars(s: &str) -> String {
- s.replace('\\', r#"\\"#).replace('"', r#"\""#)
- }
-
pub fn from_attrs_owner(
db: &dyn ExpandDatabase,
owner: InFile<&dyn ast::HasAttrs>,
@@ -238,10 +241,8 @@ impl Attr {
})?);
let span = span_map.span_for_range(range);
let input = if let Some(ast::Expr::Literal(lit)) = ast.expr() {
- Some(Box::new(AttrInput::Literal(tt::Literal {
- text: lit.token().text().into(),
- span,
- })))
+ let token = lit.token();
+ Some(Box::new(AttrInput::Literal(token_to_literal(token.text().into(), span))))
} else if let Some(tt) = ast.token_tree() {
let tree = syntax_node_to_token_tree(
tt.syntax(),
@@ -310,12 +311,11 @@ impl Attr {
/// #[path = "string"]
pub fn string_value(&self) -> Option<&str> {
match self.input.as_deref()? {
- AttrInput::Literal(it) => match it.text.strip_prefix('r') {
- Some(it) => it.trim_matches('#'),
- None => it.text.as_str(),
- }
- .strip_prefix('"')?
- .strip_suffix('"'),
+ AttrInput::Literal(tt::Literal {
+ text,
+ kind: tt::LitKind::Str | tt::LitKind::StrRaw(_),
+ ..
+ }) => Some(text),
_ => None,
}
}
@@ -336,12 +336,10 @@ impl Attr {
pub fn string_value_unescape(&self) -> Option<Cow<'_, str>> {
match self.input.as_deref()? {
- AttrInput::Literal(it) => match it.text.strip_prefix('r') {
- Some(it) => {
- it.trim_matches('#').strip_prefix('"')?.strip_suffix('"').map(Cow::Borrowed)
- }
- None => it.text.strip_prefix('"')?.strip_suffix('"').and_then(unescape),
- },
+ AttrInput::Literal(tt::Literal { text, kind: tt::LitKind::StrRaw(_), .. }) => {
+ Some(Cow::Borrowed(text))
+ }
+ AttrInput::Literal(tt::Literal { text, kind: tt::LitKind::Str, .. }) => unescape(text),
_ => None,
}
}