Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 14:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1826

Browse source 
1826: don't break parser error recovery in presence of macros r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-09-12 09:40:16 +00:00 committed by GitHub
commit fd9e6c649f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_batch/src/lib.rs
View file

@ -89,6 +89,10 @@ pub fn load(
vfs.root2path(root) vfs.root2path(root)
); );
analysis_change.add_root(source_root_id, is_local); analysis_change.add_root(source_root_id, is_local);
analysis_change.set_debug_root_path(
source_root_id,
source_roots[&source_root_id].path().display().to_string(),
);
let mut file_map = FxHashMap::default(); let mut file_map = FxHashMap::default();
for (vfs_file, path, text) in files { for (vfs_file, path, text) in files {

4
crates/ra_parser/src/parser.rs
View file

@ -5,7 +5,7 @@ use drop_bomb::DropBomb;
use crate::{ use crate::{
event::Event, event::Event,
ParseError, ParseError,
SyntaxKind::{self, EOF, ERROR, L_DOLLAR, R_DOLLAR, TOMBSTONE}, SyntaxKind::{self, EOF, ERROR, TOMBSTONE},
TokenSet, TokenSource, T, TokenSet, TokenSource, T,
}; };
@ -212,7 +212,7 @@ impl<'t> Parser<'t> {
/// Create an error node and consume the next token. /// Create an error node and consume the next token.
pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) { pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) {
match self.current() { match self.current() {
T!['{'] | T!['}'] | L_DOLLAR | R_DOLLAR => { T!['{'] | T!['}'] => {
self.error(message); self.error(message);
return; return;
} }