language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated Ptr methods to better match Parser method names.

Browse source
This commit is contained in:
Zach Lute 2018-09-04 22:56:16 -07:00
parent f87771092c
commit af0ae9ee04
5 changed files with 59 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/libsyntax2/src/lexer/strings.rs
View file

@ -15,11 +15,11 @@ pub(crate) fn is_string_literal_start(c: char, c1: Option<char>, c2: Option<char
}
pub(crate) fn scan_char(ptr: &mut Ptr) {
while let Some(c) = ptr.next() {
while let Some(c) = ptr.current() {
match c {
'\\' => {
ptr.bump();
if ptr.next_is('\\') || ptr.next_is('\'') {
if ptr.at('\\') || ptr.at('\'') {
ptr.bump();
}
}
@ -57,11 +57,11 @@ pub(crate) fn scan_byte_char_or_string(ptr: &mut Ptr) -> SyntaxKind {
}
pub(crate) fn scan_string(ptr: &mut Ptr) {
while let Some(c) = ptr.next() {
while let Some(c) = ptr.current() {
match c {
'\\' => {
ptr.bump();
if ptr.next_is('\\') || ptr.next_is('"') {
if ptr.at('\\') || ptr.at('"') {
ptr.bump();
}
}
@ -78,11 +78,11 @@ pub(crate) fn scan_string(ptr: &mut Ptr) {
pub(crate) fn scan_raw_string(ptr: &mut Ptr) {
let mut hashes = 0;
while ptr.next_is('#') {
while ptr.at('#') {
hashes += 1;
ptr.bump();
}
if !ptr.next_is('"') {
if !ptr.at('"') {
return;
}
ptr.bump();
@ -90,7 +90,7 @@ pub(crate) fn scan_raw_string(ptr: &mut Ptr) {
while let Some(c) = ptr.bump() {
if c == '"' {
let mut hashes_left = hashes;
while ptr.next_is('#') && hashes_left > 0{
while ptr.at('#') && hashes_left > 0{
hashes_left -= 1;
ptr.bump();
}
@ -110,7 +110,7 @@ fn scan_byte_string(ptr: &mut Ptr) {
}
fn scan_raw_byte_string(ptr: &mut Ptr) {
if !ptr.next_is('"') {
if !ptr.at('"') {
return;
}
ptr.bump();