language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

support literal suffixes

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-27 15:03:18 +03:00
parent 73ded3c63c
commit 359e70d1b2
7 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_syntax/src/string_lexing/parser.rs
View file

@ -139,6 +139,16 @@ impl<'a> Parser<'a> {
))
}
}
pub fn parse_suffix(&mut self) -> Option<TextRange> {
let start = self.get_pos();
let _ = self.peek()?;
while let Some(_) = self.peek() {
self.advance();
}
let end = self.get_pos();
Some(TextRange::from_to(start, end))
}
}
#[derive(Debug, Eq, PartialEq, Clone)]

14
crates/ra_syntax/src/string_lexing/string.rs
View file

@ -1,12 +1,15 @@
use crate::string_lexing::{
use crate::{
TextRange,
string_lexing::{
parser::Parser,
StringComponent,
};
}};
pub fn parse_string_literal(src: &str) -> StringComponentIterator {
StringComponentIterator {
parser: Parser::new(src, b'"'),
has_closing_quote: false,
suffix: None,
prefix: None,
quote: b'"',
}
@ -16,6 +19,7 @@ pub fn parse_byte_string_literal(src: &str) -> StringComponentIterator {
StringComponentIterator {
parser: Parser::new(src, b'"'),
has_closing_quote: false,
suffix: None,
prefix: Some(b'b'),
quote: b'"',
}
@ -25,6 +29,7 @@ pub fn parse_char_literal(src: &str) -> StringComponentIterator {
StringComponentIterator {
parser: Parser::new(src, b'\''),
has_closing_quote: false,
suffix: None,
prefix: None,
quote: b'\'',
}
@ -34,6 +39,7 @@ pub fn parse_byte_literal(src: &str) -> StringComponentIterator {
StringComponentIterator {
parser: Parser::new(src, b'\''),
has_closing_quote: false,
suffix: None,
prefix: Some(b'b'),
quote: b'\'',
}
@ -42,6 +48,7 @@ pub fn parse_byte_literal(src: &str) -> StringComponentIterator {
pub struct StringComponentIterator<'a> {
parser: Parser<'a>,
pub has_closing_quote: bool,
pub suffix: Option<TextRange>,
prefix: Option<u8>,
quote: u8,
}
@ -72,6 +79,9 @@ impl<'a> Iterator for StringComponentIterator<'a> {
if self.parser.peek() == Some(self.quote as char) {
self.parser.advance();
self.has_closing_quote = true;
if let Some(range) = self.parser.parse_suffix() {
self.suffix = Some(range);
}
}
assert!(