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

Fix bug and add expr , pat , ty matcher

Browse source
This commit is contained in:
Edwin Cheng 2019-04-13 18:38:31 +08:00
parent f66300ccd1
commit 6646d49f23
10 changed files with 307 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_mbe/src/subtree_source.rs
View file

@ -109,6 +109,8 @@ impl<'a> SubTreeWalker<'a> {
self.cursor = match self.ts.get(0) {
DelimToken::Token(token) => match token {
tt::TokenTree::Subtree(subtree) => {
let ts = TokenSeq::from(subtree);
self.stack.push((ts, 0));
WalkCursor::Token(0, convert_delim(subtree.delimiter, false))
}
tt::TokenTree::Leaf(leaf) => {
@ -254,7 +256,7 @@ impl<'a> WalkerOwner<'a> {
}
}
} else if walker.stack.len() == 1 {
if let DelimToken::Delim(_, is_end) = walker.ts.get(*u) {
if let DelimToken::Delim(_, is_end) = walker.top().get(*u) {
if !is_end {
let (_, last_idx) = &walker.stack[0];
if let DelimToken::Token(token) = walker.ts.get(*last_idx) {
@ -310,10 +312,16 @@ impl<'a> TokenSource for SubtreeTokenSource<'a> {
}
}
fn is_token_joint_to_next(&self, pos: usize) -> bool {
self.walker.get(pos).unwrap().is_joint_to_next
match self.walker.get(pos) {
Some(t) => t.is_joint_to_next,
_ => false,
}
}
fn is_keyword(&self, pos: usize, kw: &str) -> bool {
self.walker.get(pos).unwrap().text == *kw
match self.walker.get(pos) {
Some(t) => t.text == *kw,
_ => false,
}
}
}