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

Introduce AttrKind

Browse source
This commit is contained in:
Kirill Bulatov 2020-02-12 16:44:52 +02:00
parent 1596b31698
commit 848c576266
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
View file

@ -434,8 +434,7 @@ fn best_action_for_target(
let add_after_anchor = anchor let add_after_anchor = anchor
.clone() .clone()
.and_then(ast::Attr::cast) .and_then(ast::Attr::cast)
.as_ref() .map(|attr| attr.kind() == ast::AttrKind::Inner)
.map(ast::Attr::is_inner_attribute)
.unwrap_or(false); .unwrap_or(false);
ImportAction::add_new_use(anchor, add_after_anchor) ImportAction::add_new_use(anchor, add_after_anchor)
} }

6
crates/ra_syntax/src/ast.rs
View file

@ -18,8 +18,8 @@ use crate::{
pub use self::{ pub use self::{
expr_extensions::{ArrayExprKind, BinOp, ElseBranch, LiteralKind, PrefixOp, RangeOp}, expr_extensions::{ArrayExprKind, BinOp, ElseBranch, LiteralKind, PrefixOp, RangeOp},
extensions::{ extensions::{
FieldKind, PathSegmentKind, SelfParamKind, SlicePatComponents, StructKind, TypeBoundKind, AttrKind, FieldKind, PathSegmentKind, SelfParamKind, SlicePatComponents, StructKind,
VisibilityKind, TypeBoundKind, VisibilityKind,
}, },
generated::*, generated::*,
tokens::*, tokens::*,
@ -218,7 +218,7 @@ fn test_doc_comment_multi_line_block_strips_suffix() {
fn test_comments_preserve_trailing_whitespace() { fn test_comments_preserve_trailing_whitespace() {
let file = SourceFile::parse( let file = SourceFile::parse(
r#" r#"
/// Representation of a Realm. /// Representation of a Realm.
/// In the specification these are called Realm Records. /// In the specification these are called Realm Records.
struct Realm {}"#, struct Realm {}"#,
) )

15
crates/ra_syntax/src/ast/extensions.rs
View file

@ -37,6 +37,12 @@ fn text_of_first_token(node: &SyntaxNode) -> &SmolStr {
node.green().children().next().and_then(|it| it.into_token()).unwrap().text() node.green().children().next().and_then(|it| it.into_token()).unwrap().text()
} }
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum AttrKind {
Inner,
Outer,
}
impl ast::Attr { impl ast::Attr {
pub fn as_simple_atom(&self) -> Option<SmolStr> { pub fn as_simple_atom(&self) -> Option<SmolStr> {
match self.input() { match self.input() {
@ -72,13 +78,16 @@ impl ast::Attr {
} }
} }
pub fn is_inner_attribute(&self) -> bool { pub fn kind(&self) -> AttrKind {
let first_token = self.syntax().first_token(); let first_token = self.syntax().first_token();
let first_token_kind = first_token.as_ref().map(SyntaxToken::kind); let first_token_kind = first_token.as_ref().map(SyntaxToken::kind);
let second_token_kind = let second_token_kind =
first_token.and_then(|token| token.next_token()).as_ref().map(SyntaxToken::kind); first_token.and_then(|token| token.next_token()).as_ref().map(SyntaxToken::kind);
return first_token_kind == Some(SyntaxKind::POUND)
&& second_token_kind == Some(SyntaxKind::EXCL); match (first_token_kind, second_token_kind) {
(Some(SyntaxKind::POUND), Some(SyntaxKind::EXCL)) => AttrKind::Inner,
_ => AttrKind::Outer,
}
} }
} }