mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-27 12:29:21 +00:00
Introduce SyntaxErrorKind and TextRange in SyntaxError
This commit is contained in:
parent
576b9a0727
commit
3b42ddae60
10 changed files with 159 additions and 68 deletions
|
@ -1,40 +1,93 @@
|
|||
use crate::{
|
||||
algo::visit::{visitor_ctx, VisitorCtx},
|
||||
ast::{self, AstNode},
|
||||
File,
|
||||
string_lexing,
|
||||
string_lexing::{self, CharComponentKind},
|
||||
yellow::{
|
||||
SyntaxError,
|
||||
SyntaxErrorKind::*,
|
||||
},
|
||||
};
|
||||
|
||||
pub(crate) fn validate(file: &File) -> Vec<SyntaxError> {
|
||||
let mut errors = Vec::new();
|
||||
for d in file.root.borrowed().descendants() {
|
||||
if let Some(c) = ast::Char::cast(d) {
|
||||
let components = &mut string_lexing::parse_char_literal(c.text());
|
||||
let len = components.count();
|
||||
|
||||
if !components.has_closing_quote {
|
||||
errors.push(SyntaxError {
|
||||
msg: "Unclosed char literal".to_string(),
|
||||
offset: d.range().start(),
|
||||
});
|
||||
}
|
||||
|
||||
if len == 0 {
|
||||
errors.push(SyntaxError {
|
||||
msg: "Empty char literal".to_string(),
|
||||
offset: d.range().start(),
|
||||
});
|
||||
}
|
||||
|
||||
if len > 1 {
|
||||
errors.push(SyntaxError {
|
||||
msg: "Character literal should be only one character long".to_string(),
|
||||
offset: d.range().start(),
|
||||
});
|
||||
}
|
||||
}
|
||||
for node in file.root.borrowed().descendants() {
|
||||
let _ = visitor_ctx(&mut errors)
|
||||
.visit::<ast::Char, _>(validate_char)
|
||||
.accept(node);
|
||||
}
|
||||
errors
|
||||
}
|
||||
|
||||
fn validate_char(node: ast::Char, errors: &mut Vec<SyntaxError>) {
|
||||
let mut components = string_lexing::parse_char_literal(node.text());
|
||||
let mut len = 0;
|
||||
for component in &mut components {
|
||||
len += 1;
|
||||
|
||||
// Validate escapes
|
||||
let text = &node.text()[component.range];
|
||||
let range = component.range + node.syntax().range().start();
|
||||
use self::CharComponentKind::*;
|
||||
match component.kind {
|
||||
AsciiEscape => {
|
||||
if text.len() == 1 {
|
||||
// Escape sequence consists only of leading `\`
|
||||
errors.push(SyntaxError {
|
||||
kind: EmptyAsciiEscape,
|
||||
range: range,
|
||||
});
|
||||
} else {
|
||||
let escape_code = text.chars().skip(1).next().unwrap();
|
||||
if !is_ascii_escape(escape_code) {
|
||||
errors.push(SyntaxError {
|
||||
kind: InvalidAsciiEscape,
|
||||
range: range,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
AsciiCodeEscape => {
|
||||
// TODO:
|
||||
// * First digit is octal
|
||||
// * Second digit is hex
|
||||
}
|
||||
UnicodeEscape => {
|
||||
// TODO:
|
||||
// * Only hex digits or underscores allowed
|
||||
// * Max 6 chars
|
||||
// * Within allowed range (must be at most 10FFFF)
|
||||
}
|
||||
// Code points are always valid
|
||||
CodePoint => (),
|
||||
}
|
||||
}
|
||||
|
||||
if !components.has_closing_quote {
|
||||
errors.push(SyntaxError {
|
||||
kind: UnclosedChar,
|
||||
range: node.syntax().range(),
|
||||
});
|
||||
}
|
||||
|
||||
if len == 0 {
|
||||
errors.push(SyntaxError {
|
||||
kind: EmptyChar,
|
||||
range: node.syntax().range(),
|
||||
});
|
||||
}
|
||||
|
||||
if len > 1 {
|
||||
errors.push(SyntaxError {
|
||||
kind: LongChar,
|
||||
range: node.syntax().range(),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
fn is_ascii_escape(code: char) -> bool {
|
||||
match code {
|
||||
'\'' | '"' | 'n' | 'r' | 't' | '0' => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue