aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_syntax/src/ast/expr_extensions.rs15
1 files changed, 13 insertions, 2 deletions
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index 17763809d..d88671d45 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -229,8 +229,12 @@ pub enum LiteralKind {
229 229
230impl ast::Literal { 230impl ast::Literal {
231 pub fn token(&self) -> SyntaxToken { 231 pub fn token(&self) -> SyntaxToken {
232 match self.syntax().first_child_or_token().unwrap() { 232 let elem = self
233 SyntaxElement::Token(token) => token, 233 .syntax()
234 .children_with_tokens()
235 .find(|e| e.kind() != ATTR && !e.kind().is_trivia());
236 match elem {
237 Some(SyntaxElement::Token(token)) => token,
234 _ => unreachable!(), 238 _ => unreachable!(),
235 } 239 }
236 } 240 }
@@ -268,6 +272,13 @@ impl ast::Literal {
268 } 272 }
269} 273}
270 274
275#[test]
276fn test_literal_with_attr() {
277 let parse = ast::SourceFile::parse(r#"const _: &str = { #[attr] "Hello" };"#);
278 let lit = parse.tree.syntax().descendants().find_map(ast::Literal::cast).unwrap();
279 assert_eq!(lit.token().text(), r#""Hello""#);
280}
281
271impl ast::NamedField { 282impl ast::NamedField {
272 pub fn parent_struct_lit(&self) -> &ast::StructLit { 283 pub fn parent_struct_lit(&self) -> &ast::StructLit {
273 self.syntax().ancestors().find_map(ast::StructLit::cast).unwrap() 284 self.syntax().ancestors().find_map(ast::StructLit::cast).unwrap()