4 files changed, 49 insertions, 70 deletions
diff --git a/crates/syntax/src/ast/expr_ext.rs b/crates/syntax/src/ast/expr_ext.rs
index 3d33cd1cf..eb44bb2ab 100644
--- a/crates/syntax/src/ast/expr_ext.rs
+++ b/crates/syntax/src/ast/expr_ext.rs
@@ -320,6 +320,13 @@ impl ast::Literal {
        ast::IntNumber::cast(self.token())
    }
+    pub fn as_string(&self) -> Option<ast::String> {
+        ast::String::cast(self.token())
+    }
+    pub fn as_byte_string(&self) -> Option<ast::ByteString> {
+        ast::ByteString::cast(self.token())
+    }
    fn find_suffix(text: &str, possible_suffixes: &[&str]) -> Option<SmolStr> {
        possible_suffixes
            .iter()
@@ -351,10 +358,10 @@ impl ast::Literal {
                    suffix: Self::find_suffix(&text, &ast::FloatNumber::SUFFIXES),
                }
            }
-            STRING | RAW_STRING => LiteralKind::String,
+            STRING => LiteralKind::String,
            T![true] => LiteralKind::Bool(true),
            T![false] => LiteralKind::Bool(false),
-            BYTE_STRING | RAW_BYTE_STRING => LiteralKind::ByteString,
+            BYTE_STRING => LiteralKind::ByteString,
            CHAR => LiteralKind::Char,
            BYTE => LiteralKind::Byte,
            _ => unreachable!(),
diff --git a/crates/syntax/src/ast/generated/tokens.rs b/crates/syntax/src/ast/generated/tokens.rs
index 1b8449221..728b72cd7 100644
--- a/crates/syntax/src/ast/generated/tokens.rs
+++ b/crates/syntax/src/ast/generated/tokens.rs
@@ -70,16 +70,16 @@ impl AstToken for String {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RawString {
+pub struct ByteString {
    pub(crate) syntax: SyntaxToken,
 }
-impl std::fmt::Display for RawString {
+impl std::fmt::Display for ByteString {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(&self.syntax, f)
    }
 }
-impl AstToken for RawString {
+impl AstToken for ByteString {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RAW_STRING }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BYTE_STRING }
    fn cast(syntax: SyntaxToken) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index c5cd1c504..ce35ac01a 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -7,7 +7,7 @@ use itertools::Itertools;
 use parser::SyntaxKind;
 use crate::{
-    ast::{self, support, token_ext::HasStringValue, AstNode, AstToken, NameOwner, SyntaxNode},
+    ast::{self, support, AstNode, AstToken, NameOwner, SyntaxNode},
    SmolStr, SyntaxElement, SyntaxToken, T,
 };
@@ -55,13 +55,7 @@ impl ast::Attr {
        let key = self.simple_name()?;
        let value_token = lit.syntax().first_token()?;
-        let value: SmolStr = if let Some(s) = ast::String::cast(value_token.clone()) {
+        let value: SmolStr = ast::String::cast(value_token.clone())?.value()?.into();
-            s.value()?.into()
-        } else if let Some(s) = ast::RawString::cast(value_token) {
-            s.value()?.into()
-        } else {
-            return None;
-        };
        Some((key, value))
    }
diff --git a/crates/syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs
index 8d3fad5a6..bf0035986 100644
--- a/crates/syntax/src/ast/token_ext.rs
+++ b/crates/syntax/src/ast/token_ext.rs
@@ -114,39 +114,24 @@ impl QuoteOffsets {
    }
 }
-pub trait HasQuotes: AstToken {
+impl ast::String {
-    fn quote_offsets(&self) -> Option<QuoteOffsets> {
+    pub fn is_raw(&self) -> bool {
-        let text = self.text().as_str();
+        self.text().starts_with('r')
-        let offsets = QuoteOffsets::new(text)?;
-        let o = self.syntax().text_range().start();
-        let offsets = QuoteOffsets {
-            quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
-            contents: offsets.contents + o,
-        };
-        Some(offsets)
-    }
-    fn open_quote_text_range(&self) -> Option<TextRange> {
-        self.quote_offsets().map(|it| it.quotes.0)
    }
+    pub fn map_range_up(&self, range: TextRange) -> Option<TextRange> {
-    fn close_quote_text_range(&self) -> Option<TextRange> {
+        let contents_range = self.text_range_between_quotes()?;
-        self.quote_offsets().map(|it| it.quotes.1)
+        assert!(TextRange::up_to(contents_range.len()).contains_range(range));
-    }
+        Some(range + contents_range.start())
-    fn text_range_between_quotes(&self) -> Option<TextRange> {
-        self.quote_offsets().map(|it| it.contents)
    }
-}
-impl HasQuotes for ast::String {}
-impl HasQuotes for ast::RawString {}
-pub trait HasStringValue: HasQuotes {
+    pub fn value(&self) -> Option<Cow<'_, str>> {
-    fn value(&self) -> Option<Cow<'_, str>>;
+        if self.is_raw() {
-}
+            let text = self.text().as_str();
+            let text =
+                &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
+            return Some(Cow::Borrowed(text));
+        }
-impl HasStringValue for ast::String {
-    fn value(&self) -> Option<Cow<'_, str>> {
        let text = self.text().as_str();
        let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
@@ -164,22 +149,31 @@ impl HasStringValue for ast::String {
        let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };
        Some(res)
    }
-}
-// FIXME: merge `ast::RawString` and `ast::String`.
+    pub fn quote_offsets(&self) -> Option<QuoteOffsets> {
-impl HasStringValue for ast::RawString {
-    fn value(&self) -> Option<Cow<'_, str>> {
        let text = self.text().as_str();
-        let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
+        let offsets = QuoteOffsets::new(text)?;
-        Some(Cow::Borrowed(text))
+        let o = self.syntax().text_range().start();
+        let offsets = QuoteOffsets {
+            quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
+            contents: offsets.contents + o,
+        };
+        Some(offsets)
+    }
+    pub fn text_range_between_quotes(&self) -> Option<TextRange> {
+        self.quote_offsets().map(|it| it.contents)
+    }
+    pub fn open_quote_text_range(&self) -> Option<TextRange> {
+        self.quote_offsets().map(|it| it.quotes.0)
+    }
+    pub fn close_quote_text_range(&self) -> Option<TextRange> {
+        self.quote_offsets().map(|it| it.quotes.1)
    }
 }
-impl ast::RawString {
+impl ast::ByteString {
-    pub fn map_range_up(&self, range: TextRange) -> Option<TextRange> {
+    pub fn is_raw(&self) -> bool {
-        let contents_range = self.text_range_between_quotes()?;
+        self.text().starts_with("br")
-        assert!(TextRange::up_to(contents_range.len()).contains_range(range));
-        Some(range + contents_range.start())
    }
 }
@@ -522,22 +516,6 @@ impl HasFormatSpecifier for ast::String {
    }
 }
-impl HasFormatSpecifier for ast::RawString {
-    fn char_ranges(
-        &self,
-    ) -> Option<Vec<(TextRange, Result<char, rustc_lexer::unescape::EscapeError>)>> {
-        let text = self.text().as_str();
-        let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
-        let offset = self.text_range_between_quotes()?.start() - self.syntax().text_range().start();
-        let mut res = Vec::with_capacity(text.len());
-        for (idx, c) in text.char_indices() {
-            res.push((TextRange::at(idx.try_into().unwrap(), TextSize::of(c)) + offset, Ok(c)));
-        }
-        Some(res)
-    }
-}
 impl ast::IntNumber {
    #[rustfmt::skip]
    pub(crate) const SUFFIXES: &'static [&'static str] = &[

diff --git a/crates/syntax/src/ast/expr_ext.rs b/crates/syntax/src/ast/expr_ext.rs index 3d33cd1cf..eb44bb2ab 100644 --- a/crates/syntax/src/ast/expr_ext.rs +++ b/crates/syntax/src/ast/expr_ext.rs
@@ -320,6 +320,13 @@ impl ast::Literal {
320	ast::IntNumber::cast(self.token())	320	ast::IntNumber::cast(self.token())
321	}	321	}
322		322
		323	pub fn as_string(&self) -> Option<ast::String> {
		324	ast::String::cast(self.token())
		325	}
		326	pub fn as_byte_string(&self) -> Option<ast::ByteString> {
		327	ast::ByteString::cast(self.token())
		328	}
		329
323	fn find_suffix(text: &str, possible_suffixes: &[&str]) -> Option<SmolStr> {	330	fn find_suffix(text: &str, possible_suffixes: &[&str]) -> Option<SmolStr> {
324	possible_suffixes	331	possible_suffixes
325	.iter()	332	.iter()
@@ -351,10 +358,10 @@ impl ast::Literal {
351	suffix: Self::find_suffix(&text, &ast::FloatNumber::SUFFIXES),	358	suffix: Self::find_suffix(&text, &ast::FloatNumber::SUFFIXES),
352	}	359	}
353	}	360	}
354	STRING \| RAW_STRING => LiteralKind::String,	361	STRING => LiteralKind::String,
355	T![true] => LiteralKind::Bool(true),	362	T![true] => LiteralKind::Bool(true),
356	T![false] => LiteralKind::Bool(false),	363	T![false] => LiteralKind::Bool(false),
357	BYTE_STRING \| RAW_BYTE_STRING => LiteralKind::ByteString,	364	BYTE_STRING => LiteralKind::ByteString,
358	CHAR => LiteralKind::Char,	365	CHAR => LiteralKind::Char,
359	BYTE => LiteralKind::Byte,	366	BYTE => LiteralKind::Byte,
360	_ => unreachable!(),	367	_ => unreachable!(),


diff --git a/crates/syntax/src/ast/generated/tokens.rs b/crates/syntax/src/ast/generated/tokens.rs index 1b8449221..728b72cd7 100644 --- a/crates/syntax/src/ast/generated/tokens.rs +++ b/crates/syntax/src/ast/generated/tokens.rs
@@ -70,16 +70,16 @@ impl AstToken for String {
70	}	70	}
71		71
72	#[derive(Debug, Clone, PartialEq, Eq, Hash)]	72	#[derive(Debug, Clone, PartialEq, Eq, Hash)]
73	pub struct RawString {	73	pub struct ByteString {
74	pub(crate) syntax: SyntaxToken,	74	pub(crate) syntax: SyntaxToken,
75	}	75	}
76	impl std::fmt::Display for RawString {	76	impl std::fmt::Display for ByteString {
77	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {	77	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
78	std::fmt::Display::fmt(&self.syntax, f)	78	std::fmt::Display::fmt(&self.syntax, f)
79	}	79	}
80	}	80	}
81	impl AstToken for RawString {	81	impl AstToken for ByteString {
82	fn can_cast(kind: SyntaxKind) -> bool { kind == RAW_STRING }	82	fn can_cast(kind: SyntaxKind) -> bool { kind == BYTE_STRING }
83	fn cast(syntax: SyntaxToken) -> Option<Self> {	83	fn cast(syntax: SyntaxToken) -> Option<Self> {
84	if Self::can_cast(syntax.kind()) {	84	if Self::can_cast(syntax.kind()) {
85	Some(Self { syntax })	85	Some(Self { syntax })


diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs index c5cd1c504..ce35ac01a 100644 --- a/crates/syntax/src/ast/node_ext.rs +++ b/crates/syntax/src/ast/node_ext.rs
@@ -7,7 +7,7 @@ use itertools::Itertools;
7	use parser::SyntaxKind;	7	use parser::SyntaxKind;
8		8
9	use crate::{	9	use crate::{
10	ast::{self, support, token_ext::HasStringValue, AstNode, AstToken, NameOwner, SyntaxNode},	10	ast::{self, support, AstNode, AstToken, NameOwner, SyntaxNode},
11	SmolStr, SyntaxElement, SyntaxToken, T,	11	SmolStr, SyntaxElement, SyntaxToken, T,
12	};	12	};
13		13
@@ -55,13 +55,7 @@ impl ast::Attr {
55	let key = self.simple_name()?;	55	let key = self.simple_name()?;
56	let value_token = lit.syntax().first_token()?;	56	let value_token = lit.syntax().first_token()?;
57		57
58	let value: SmolStr = if let Some(s) = ast::String::cast(value_token.clone()) {	58	let value: SmolStr = ast::String::cast(value_token.clone())?.value()?.into();
59	s.value()?.into()
60	} else if let Some(s) = ast::RawString::cast(value_token) {
61	s.value()?.into()
62	} else {
63	return None;
64	};
65		59
66	Some((key, value))	60	Some((key, value))
67	}	61	}


diff --git a/crates/syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs index 8d3fad5a6..bf0035986 100644 --- a/crates/syntax/src/ast/token_ext.rs +++ b/crates/syntax/src/ast/token_ext.rs
@@ -114,39 +114,24 @@ impl QuoteOffsets {
114	}	114	}
115	}	115	}
116		116
117	pub trait HasQuotes: AstToken {	117	impl ast::String {
118	fn quote_offsets(&self) -> Option<QuoteOffsets> {	118	pub fn is_raw(&self) -> bool {
119	let text = self.text().as_str();	119	self.text().starts_with('r')
120	let offsets = QuoteOffsets::new(text)?;
121	let o = self.syntax().text_range().start();
122	let offsets = QuoteOffsets {
123	quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
124	contents: offsets.contents + o,
125	};
126	Some(offsets)
127	}
128	fn open_quote_text_range(&self) -> Option<TextRange> {
129	self.quote_offsets().map(\|it\| it.quotes.0)
130	}	120	}
131		121	pub fn map_range_up(&self, range: TextRange) -> Option<TextRange> {
132	fn close_quote_text_range(&self) -> Option<TextRange> {	122	let contents_range = self.text_range_between_quotes()?;
133	self.quote_offsets().map(\|it\| it.quotes.1)	123	assert!(TextRange::up_to(contents_range.len()).contains_range(range));
134	}	124	Some(range + contents_range.start())
135
136	fn text_range_between_quotes(&self) -> Option<TextRange> {
137	self.quote_offsets().map(\|it\| it.contents)
138	}	125	}
139	}
140
141	impl HasQuotes for ast::String {}
142	impl HasQuotes for ast::RawString {}
143		126
144	pub trait HasStringValue: HasQuotes {	127	pub fn value(&self) -> Option<Cow<'_, str>> {
145	fn value(&self) -> Option<Cow<'_, str>>;	128	if self.is_raw() {
146	}	129	let text = self.text().as_str();
		130	let text =
		131	&text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
		132	return Some(Cow::Borrowed(text));
		133	}
147		134
148	impl HasStringValue for ast::String {
149	fn value(&self) -> Option<Cow<'_, str>> {
150	let text = self.text().as_str();	135	let text = self.text().as_str();
151	let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];	136	let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
152		137
@@ -164,22 +149,31 @@ impl HasStringValue for ast::String {
164	let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };	149	let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };
165	Some(res)	150	Some(res)
166	}	151	}
167	}
168		152
169	// FIXME: merge `ast::RawString` and `ast::String`.	153	pub fn quote_offsets(&self) -> Option<QuoteOffsets> {
170	impl HasStringValue for ast::RawString {
171	fn value(&self) -> Option<Cow<'_, str>> {
172	let text = self.text().as_str();	154	let text = self.text().as_str();
173	let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];	155	let offsets = QuoteOffsets::new(text)?;
174	Some(Cow::Borrowed(text))	156	let o = self.syntax().text_range().start();
		157	let offsets = QuoteOffsets {
		158	quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
		159	contents: offsets.contents + o,
		160	};
		161	Some(offsets)
		162	}
		163	pub fn text_range_between_quotes(&self) -> Option<TextRange> {
		164	self.quote_offsets().map(\|it\| it.contents)
		165	}
		166	pub fn open_quote_text_range(&self) -> Option<TextRange> {
		167	self.quote_offsets().map(\|it\| it.quotes.0)
		168	}
		169	pub fn close_quote_text_range(&self) -> Option<TextRange> {
		170	self.quote_offsets().map(\|it\| it.quotes.1)
175	}	171	}
176	}	172	}
177		173
178	impl ast::RawString {	174	impl ast::ByteString {
179	pub fn map_range_up(&self, range: TextRange) -> Option<TextRange> {	175	pub fn is_raw(&self) -> bool {
180	let contents_range = self.text_range_between_quotes()?;	176	self.text().starts_with("br")
181	assert!(TextRange::up_to(contents_range.len()).contains_range(range));
182	Some(range + contents_range.start())
183	}	177	}
184	}	178	}
185		179
@@ -522,22 +516,6 @@ impl HasFormatSpecifier for ast::String {
522	}	516	}
523	}	517	}
524		518
525	impl HasFormatSpecifier for ast::RawString {
526	fn char_ranges(
527	&self,
528	) -> Option<Vec<(TextRange, Result<char, rustc_lexer::unescape::EscapeError>)>> {
529	let text = self.text().as_str();
530	let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
531	let offset = self.text_range_between_quotes()?.start() - self.syntax().text_range().start();
532
533	let mut res = Vec::with_capacity(text.len());
534	for (idx, c) in text.char_indices() {
535	res.push((TextRange::at(idx.try_into().unwrap(), TextSize::of(c)) + offset, Ok(c)));
536	}
537	Some(res)
538	}
539	}
540
541	impl ast::IntNumber {	519	impl ast::IntNumber {
542	#[rustfmt::skip]	520	#[rustfmt::skip]
543	pub(crate) const SUFFIXES: &'static [&'static str] = &[	521	pub(crate) const SUFFIXES: &'static [&'static str] = &[