mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use From to get an owned AST

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-01 13:41:04 +03:00
parent 3ec9f958b3
commit d685a9b564
3 changed files with 701 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/ra_analysis/src/descriptors/function/imp.rs
View file

@ -11,8 +11,7 @@ use crate::descriptors::{
/// TODO: this should return something more type-safe then `SyntaxNode`
pub(crate) fn fn_syntax(db: &impl DescriptorDatabase, fn_id: FnId) -> FnDefNode {
let syntax = db.resolve_syntax_ptr(fn_id.0);
let fn_def = FnDef::cast(syntax.borrowed()).unwrap();
FnDefNode::new(fn_def)
FnDef::cast(syntax.borrowed()).unwrap().into()
}
pub(crate) fn fn_scopes(db: &impl DescriptorDatabase, fn_id: FnId) -> Arc<FnScopes> {

1089
crates/ra_syntax/src/ast/generated.rs
View file

File diff suppressed because it is too large Load diff

11
crates/ra_syntax/src/ast/generated.rs.tera
View file

@ -17,15 +17,18 @@ use crate::{
pub struct {{ node }}Node(SyntaxNode);
impl {{ node }}Node {
pub fn new(ast: {{ node }}) -> {{ node }}Node {
let syntax = ast.syntax().owned();
{{ node }}Node(syntax)
}
pub fn ast(&self) -> {{ node }} {
{{ node }}::cast(self.0.borrowed()).unwrap()
}
}
impl<'a> From<{{ node }}<'a>> for {{ node }}Node {
fn from(ast: {{ node}}<'a>) -> {{ node }}Node {
let syntax = ast.syntax().owned();
{{ node }}Node(syntax)
}
}
{%- if methods.enum %}
#[derive(Debug, Clone, Copy)]
pub enum {{ node }}<'a> {