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

ra_syntax: changed added diagnostics information returned from tokenize() (implemented with iterators)

Browse source
This commit is contained in:
Veetaha 2020-01-24 03:39:23 +02:00
parent b090ee5a65
commit ad24976da3
4 changed files with 242 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_syntax/src/syntax_error.rs
View file

@ -4,7 +4,7 @@ use std::fmt;
use ra_parser::ParseError;
use crate::{validation::EscapeError, TextRange, TextUnit};
use crate::{validation::EscapeError, TextRange, TextUnit, TokenizeError};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct SyntaxError {
@ -12,6 +12,10 @@ pub struct SyntaxError {
location: Location,
}
// FIXME: Location should be just `Location(TextRange)`
// TextUnit enum member just unnecessarily compicates things,
// we should'n treat it specially, it just as a `TextRange { start: x, end: x + 1 }`
// see `location_to_range()` in ra_ide/src/diagnostics
#[derive(Clone, PartialEq, Eq, Hash)]
pub enum Location {
Offset(TextUnit),
@ -79,6 +83,7 @@ impl fmt::Display for SyntaxError {
pub enum SyntaxErrorKind {
ParseError(ParseError),
EscapeError(EscapeError),
TokenizeError(TokenizeError),
InvalidBlockAttr,
InvalidMatchInnerAttr,
InvalidTupleIndexFormat,