fix: replace unescape fn with the one in ra-ap-rustc_lexer

Author: roife

crates/hir-expand/src/attrs.rs

@@ -8,6 +8,7 @@ use intern::Interned;
 use mbe::{syntax_node_to_token_tree,DelimiterKind,Punct};
 use smallvec::{smallvec,SmallVec};
 use span::{Span,SyntaxContextId};
+use syntax::unescape;
 use syntax::{ast, format_smolstr, match_ast,AstNode,AstToken,SmolStr,SyntaxNode};
 use triomphe::ThinArc;
 
@@ -54,8 +55,7 @@ impl RawAttrs {
 Attr{
  id,
 input:Some(Interned::new(AttrInput::Literal(tt::Literal{
-// FIXME: Escape quotes from comment content
-text:SmolStr::new(format_smolstr!("\"{doc}\"",)),
+text:SmolStr::new(format_smolstr!("\"{}\"",Self::escape_chars(doc))),
  span,
 }))),
 path:Interned::new(ModPath::from(crate::name!(doc))),
@@ -74,6 +74,10 @@ impl RawAttrs {
 RawAttrs{ entries }
 }
 
+fnescape_chars(s:&str) -> String{
+ s.replace('\\',r#"\\"#).replace('"',r#"\""#)
+}
+
 pubfnfrom_attrs_owner(
 db:&dynExpandDatabase,
 owner:InFile<&dyn ast::HasAttrs>,
@@ -303,9 +307,7 @@ impl Attr {
 Some(it) => {
  it.trim_matches('#').strip_prefix('"')?.strip_suffix('"').map(Cow::Borrowed)
 }
-None => {
- it.text.strip_prefix('"')?.strip_suffix('"').and_then(unescape).map(Cow::Owned)
-}
+None => it.text.strip_prefix('"')?.strip_suffix('"').and_then(unescape),
 },
  _ => None,
 }
@@ -360,37 +362,31 @@ impl Attr {
 }
 }
 
-fnunescape(s:&str) -> Option<String>{
-letmut res = String::with_capacity(s.len());
-letmut chars = s.chars();
-
-whileletSome(c) = chars.next(){
-if c == '\\'{
-match chars.next()? {
-'n' => res.push('\n'),
-'r' => res.push('\r'),
-'t' => res.push('\t'),
-'\\' => res.push('\\'),
-'\'' => res.push('\''),
-'"' => res.push('"'),
-'0' => res.push('\0'),
-'x' => {
-let hex = chars.by_ref().take(2).collect::<String>();
-let c = u8::from_str_radix(&hex,16).ok()?;
- res.push(c aschar);
-}
-'u' => {
-let hex = chars.by_ref().take(4).collect::<String>();
-let c = u32::from_str_radix(&hex,16).ok()?;
- res.push(char::from_u32(c)?);
-}
- _ => returnNone,
-}
-}else{
- res.push(c);
+fnunescape(s:&str) -> Option<Cow<'_,str>>{
+letmut buf = String::new();
+letmut prev_end = 0;
+letmut has_error = false;
+ unescape::unescape_unicode(s, unescape::Mode::Str,&mut |char_range, unescaped_char| match(
+ unescaped_char,
+ buf.capacity() == 0,
+){
+(Ok(c),false) => buf.push(c),
+(Ok(_),true)if char_range.len() == 1 && char_range.start == prev_end => {
+ prev_end = char_range.end
+}
+(Ok(c),true) => {
+ buf.reserve_exact(s.len());
+ buf.push_str(&s[..prev_end]);
+ buf.push(c);
 }
+(Err(_), _) => has_error = true,
+});
+
+match(has_error, buf.capacity() == 0){
+(true, _) => None,
+(false,false) => Some(Cow::Owned(buf)),
+(false,true) => Some(Cow::Borrowed(s)),
 }
-Some(res)
 }
 
 pubfncollect_attrs(

crates/syntax/src/lib.rs

@@ -65,6 +65,7 @@ pub use rowan::{
  api::Preorder,Direction,GreenNode,NodeOrToken,SyntaxText,TextRange,TextSize,
 TokenAtOffset,WalkEvent,
 };
+pubuse rustc_lexer::unescape;
 pubuse smol_str::{format_smolstr,SmolStr};
 
 /// `Parse` is the result of the parsing: a syntax tree and a collection of