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

assign ids to tokens

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-11 19:28:39 +03:00
parent b356ab46f2
commit 58897dd8dd
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_mbe/src/mbe_expander.rs
View file

@ -3,6 +3,7 @@
/// `tt::TokenTree` for the result of the expansion. /// `tt::TokenTree` for the result of the expansion.
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use ra_syntax::SmolStr; use ra_syntax::SmolStr;
use tt::TokenId;
use crate::tt_cursor::TtCursor; use crate::tt_cursor::TtCursor;
@ -185,7 +186,8 @@ fn expand_tt(
} }
crate::TokenTree::Leaf(leaf) => match leaf { crate::TokenTree::Leaf(leaf) => match leaf {
crate::Leaf::Ident(ident) => { crate::Leaf::Ident(ident) => {
tt::Leaf::from(tt::Ident { text: ident.text.clone() }).into() tt::Leaf::from(tt::Ident { text: ident.text.clone(), id: TokenId::unspecified() })
.into()
} }
crate::Leaf::Punct(punct) => tt::Leaf::from(punct.clone()).into(), crate::Leaf::Punct(punct) => tt::Leaf::from(punct.clone()).into(),
crate::Leaf::Var(v) => bindings.get(&v.text, nesting)?.clone(), crate::Leaf::Var(v) => bindings.get(&v.text, nesting)?.clone(),

2
crates/ra_mbe/src/mbe_parser.rs
View file

@ -41,7 +41,7 @@ fn parse_subtree(tt: &tt::Subtree) -> Option<crate::Subtree> {
} }
} }
tt::Leaf::Punct(punct) => crate::Leaf::from(*punct).into(), tt::Leaf::Punct(punct) => crate::Leaf::from(*punct).into(),
tt::Leaf::Ident(tt::Ident { text }) => { tt::Leaf::Ident(tt::Ident { text, id: _ }) => {
crate::Leaf::from(crate::Ident { text: text.clone() }).into() crate::Leaf::from(crate::Ident { text: text.clone() }).into()
} }
tt::Leaf::Literal(tt::Literal { text }) => { tt::Leaf::Literal(tt::Literal { text }) => {

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

@ -37,7 +37,7 @@ fn convert_tt(tt: &SyntaxNode) -> Option<tt::Subtree> {
convert_tt(child)?.into() convert_tt(child)?.into()
} else if child.kind().is_keyword() || child.kind() == IDENT { } else if child.kind().is_keyword() || child.kind() == IDENT {
let text = child.leaf_text().unwrap().clone(); let text = child.leaf_text().unwrap().clone();
tt::Leaf::from(tt::Ident { text }).into() tt::Leaf::from(tt::Ident { text, id: tt::TokenId::unspecified() }).into()
} else if child.kind().is_literal() { } else if child.kind().is_literal() {
tt::Leaf::from(tt::Literal { text: child.leaf_text().unwrap().clone() }).into() tt::Leaf::from(tt::Literal { text: child.leaf_text().unwrap().clone() }).into()
} else { } else {

10
crates/ra_tt/src/lib.rs
View file

@ -18,6 +18,15 @@ use std::fmt;
use smol_str::SmolStr; use smol_str::SmolStr;
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct TokenId(pub u32);
impl TokenId {
pub const fn unspecified() -> TokenId {
TokenId(!0)
}
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum TokenTree { pub enum TokenTree {
Leaf(Leaf), Leaf(Leaf),
@ -67,6 +76,7 @@ pub enum Spacing {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Ident { pub struct Ident {
pub text: SmolStr, pub text: SmolStr,
pub id: TokenId,
} }
impl fmt::Display for TokenTree { impl fmt::Display for TokenTree {