language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 14:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make TokenTextRange private

Browse source
This commit is contained in:
Jonas Schievink 2021-05-24 20:29:48 +02:00
parent 27bf62b70e
commit 489ae7a800
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/mbe/src/token_map.rs
View file

@ -2,13 +2,13 @@ use parser::{SyntaxKind, T};
use syntax::{TextRange, TextSize};
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum TokenTextRange {
enum TokenTextRange {
Token(TextRange),
Delimiter(TextRange),
}
impl TokenTextRange {
pub fn by_kind(self, kind: SyntaxKind) -> Option<TextRange> {
fn by_kind(self, kind: SyntaxKind) -> Option<TextRange> {
match self {
TokenTextRange::Token(it) => Some(it),
TokenTextRange::Delimiter(it) => match kind {
@ -42,9 +42,9 @@ impl TokenMap {
Some(token_id)
}
pub fn range_by_token(&self, token_id: tt::TokenId) -> Option<TokenTextRange> {
pub fn range_by_token(&self, token_id: tt::TokenId, kind: SyntaxKind) -> Option<TextRange> {
let &(_, range) = self.entries.iter().find(|(tid, _)| *tid == token_id)?;
Some(range)
range.by_kind(kind)
}
pub(crate) fn shrink_to_fit(&mut self) {