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

Fix text range bug and reorder

Browse source
This commit is contained in:
Edwin Cheng 2020-03-21 04:22:21 +08:00
parent 622c843a4c
commit 6bcaa1d7d1
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
crates/ra_mbe/src/syntax_bridge.rs
View file

@ -237,12 +237,16 @@ impl TokenIdAlloc {
fn open_delim(&mut self, open_abs_range: TextRange) -> tt::TokenId { fn open_delim(&mut self, open_abs_range: TextRange) -> tt::TokenId {
let token_id = tt::TokenId(self.next_id); let token_id = tt::TokenId(self.next_id);
self.next_id += 1; self.next_id += 1;
self.map.insert_delim(token_id, open_abs_range, open_abs_range); self.map.insert_delim(
token_id,
open_abs_range - self.global_offset,
open_abs_range - self.global_offset,
);
token_id token_id
} }
fn close_delim(&mut self, id: tt::TokenId, close_abs_range: TextRange) { fn close_delim(&mut self, id: tt::TokenId, close_abs_range: TextRange) {
self.map.update_close_delim(id, close_abs_range); self.map.update_close_delim(id, close_abs_range - self.global_offset);
} }
} }
@ -297,6 +301,7 @@ trait TokenConvertor {
} }
result.push(if k.is_punct() { result.push(if k.is_punct() {
assert_eq!(range.len().to_usize(), 1);
let delim = match k { let delim = match k {
T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])), T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])),
T!['{'] => Some((tt::DelimiterKind::Brace, T!['}'])), T!['{'] => Some((tt::DelimiterKind::Brace, T!['}'])),
@ -461,25 +466,25 @@ impl TokenConvertor for Convertor {
} }
fn bump(&mut self) -> Option<(Self::Token, TextRange)> { fn bump(&mut self) -> Option<(Self::Token, TextRange)> {
let curr = self.current.clone()?;
if !curr.text_range().is_subrange(&self.range) {
return None;
}
if let Some((punct, offset)) = self.punct_offset.clone() { if let Some((punct, offset)) = self.punct_offset.clone() {
if offset.to_usize() + 1 < punct.text().len() { if offset.to_usize() + 1 < punct.text().len() {
let offset = offset + TextUnit::from_usize(1); let offset = offset + TextUnit::from_usize(1);
let range = punct.text_range(); let range = punct.text_range();
self.punct_offset = Some((punct, offset)); self.punct_offset = Some((punct.clone(), offset));
let range = TextRange::offset_len(range.start() + offset, TextUnit::from_usize(1)); let range = TextRange::offset_len(range.start() + offset, TextUnit::from_usize(1));
return Some((SynToken::Punch(curr, offset), range)); return Some((SynToken::Punch(punct, offset), range));
} }
} }
let curr = self.current.clone()?;
if !curr.text_range().is_subrange(&self.range) {
return None;
}
self.current = curr.next_token(); self.current = curr.next_token();
let token = if curr.kind().is_punct() { let token = if curr.kind().is_punct() {
let range = curr.text_range(); let range = curr.text_range();
let range = TextRange::offset_len(range.start(), TextUnit::from_usize(1));
self.punct_offset = Some((curr.clone(), TextUnit::from_usize(0))); self.punct_offset = Some((curr.clone(), TextUnit::from_usize(0)));
(SynToken::Punch(curr, TextUnit::from_usize(0)), range) (SynToken::Punch(curr, TextUnit::from_usize(0)), range)
} else { } else {
@ -492,11 +497,6 @@ impl TokenConvertor for Convertor {
} }
fn peek(&self) -> Option<Self::Token> { fn peek(&self) -> Option<Self::Token> {
let curr = self.current.clone()?;
if !curr.text_range().is_subrange(&self.range) {
return None;
}
if let Some((punct, mut offset)) = self.punct_offset.clone() { if let Some((punct, mut offset)) = self.punct_offset.clone() {
offset = offset + TextUnit::from_usize(1); offset = offset + TextUnit::from_usize(1);
if offset.to_usize() < punct.text().len() { if offset.to_usize() < punct.text().len() {
@ -504,6 +504,11 @@ impl TokenConvertor for Convertor {
} }
} }
let curr = self.current.clone()?;
if !curr.text_range().is_subrange(&self.range) {
return None;
}
let token = if curr.kind().is_punct() { let token = if curr.kind().is_punct() {
SynToken::Punch(curr, TextUnit::from_usize(0)) SynToken::Punch(curr, TextUnit::from_usize(0))
} else { } else {