language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve/fix type bound lowering

Browse source
This commit is contained in:
Florian Diebold 2019-08-22 17:43:09 +02:00
parent b1a40042e8
commit 4768f5e717
3 changed files with 64 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -382,7 +382,36 @@ impl ast::WherePred {
}
}
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum TypeBoundKind {
/// Trait
PathType(ast::PathType),
/// for<'a> ...
ForType(ast::ForType),
/// 'a
Lifetime(ast::SyntaxToken),
}
impl ast::TypeBound {
pub fn kind(&self) -> TypeBoundKind {
if let Some(path_type) = children(self).next() {
TypeBoundKind::PathType(path_type)
} else if let Some(for_type) = children(self).next() {
TypeBoundKind::ForType(for_type)
} else if let Some(lifetime) = self.lifetime() {
TypeBoundKind::Lifetime(lifetime)
} else {
unreachable!()
}
}
fn lifetime(&self) -> Option<SyntaxToken> {
self.syntax()
.children_with_tokens()
.filter_map(|it| it.into_token())
.find(|it| it.kind() == LIFETIME)
}
pub fn question_mark_token(&self) -> Option<SyntaxToken> {
self.syntax()
.children_with_tokens()
@ -399,29 +428,3 @@ impl ast::TraitDef {
self.syntax().children_with_tokens().any(|t| t.kind() == T![auto])
}
}
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum TypeBoundKind {
/// Trait
PathType(ast::PathType),
/// for<'a> ...
ForType(ast::ForType),
/// 'a
Lifetime(ast::SyntaxToken),
}
impl ast::TypeBound {
pub fn kind(&self) -> Option<TypeBoundKind> {
let child = self.syntax.first_child_or_token()?;
match child.kind() {
PATH_TYPE => Some(TypeBoundKind::PathType(
ast::PathType::cast(child.into_node().unwrap()).unwrap(),
)),
FOR_TYPE => Some(TypeBoundKind::ForType(
ast::ForType::cast(child.into_node().unwrap()).unwrap(),
)),
LIFETIME => Some(TypeBoundKind::Lifetime(child.into_token().unwrap())),
_ => unreachable!(),
}
}
}