language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add TokenText

Browse source
This commit is contained in:
Aleksey Kladov 2021-03-26 21:33:45 +03:00
parent 77a447dcda
commit 1bbac9053d
3 changed files with 89 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/syntax/src/ast/node_ext.rs
View file

@ -8,23 +8,23 @@ use parser::SyntaxKind;
use crate::{
ast::{self, support, AstNode, AstToken, AttrsOwner, NameOwner, SyntaxNode},
SmolStr, SyntaxElement, SyntaxToken, T,
SmolStr, SyntaxElement, SyntaxToken, TokenText, T,
};
impl ast::Lifetime {
pub fn text(&self) -> SmolStr {
pub fn text(&self) -> TokenText {
text_of_first_token(self.syntax())
}
}
impl ast::Name {
pub fn text(&self) -> SmolStr {
pub fn text(&self) -> TokenText {
text_of_first_token(self.syntax())
}
}
impl ast::NameRef {
pub fn text(&self) -> SmolStr {
pub fn text(&self) -> TokenText {
text_of_first_token(self.syntax())
}
@ -33,8 +33,11 @@ impl ast::NameRef {
}
}
fn text_of_first_token(node: &SyntaxNode) -> SmolStr {
node.green().children().next().and_then(|it| it.into_token()).unwrap().text().into()
fn text_of_first_token(node: &SyntaxNode) -> TokenText {
let first_token =
node.green().children().next().and_then(|it| it.into_token()).unwrap().to_owned();
TokenText(first_token)
}
pub enum Macro {
@ -376,7 +379,7 @@ impl fmt::Display for NameOrNameRef {
}
impl NameOrNameRef {
pub fn text(&self) -> SmolStr {
pub fn text(&self) -> TokenText {
match self {
NameOrNameRef::Name(name) => name.text(),
NameOrNameRef::NameRef(name_ref) => name_ref.text(),