From 6be50f7d5de3737464853a589673375fc0cafa97 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 31 Oct 2018 23:41:43 +0300 Subject: Reformat all --- crates/ra_analysis/src/syntax_ptr.rs | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'crates/ra_analysis/src/syntax_ptr.rs') diff --git a/crates/ra_analysis/src/syntax_ptr.rs b/crates/ra_analysis/src/syntax_ptr.rs index c3c904633..612f75cd9 100644 --- a/crates/ra_analysis/src/syntax_ptr.rs +++ b/crates/ra_analysis/src/syntax_ptr.rs @@ -1,12 +1,12 @@ use std::marker::PhantomData; use ra_syntax::{ - File, TextRange, SyntaxKind, SyntaxNode, SyntaxNodeRef, ast::{self, AstNode}, + File, SyntaxKind, SyntaxNode, SyntaxNodeRef, TextRange, }; -use crate::FileId; use crate::db::SyntaxDatabase; +use crate::FileId; salsa::query_group! { pub(crate) trait SyntaxPtrDatabase: SyntaxDatabase { @@ -52,12 +52,10 @@ trait ToAst { impl<'a> ToAst for &'a OwnedAst> { type Ast = ast::FnDef<'a>; fn to_ast(self) -> ast::FnDef<'a> { - ast::FnDef::cast(self.syntax.borrowed()) - .unwrap() + ast::FnDef::cast(self.syntax.borrowed()).unwrap() } } - /// A pionter to a syntax node inside a file. #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub(crate) struct LocalSyntaxPtr { @@ -79,22 +77,29 @@ impl LocalSyntaxPtr { if curr.range() == self.range && curr.kind() == self.kind { return curr.owned(); } - curr = curr.children() + curr = curr + .children() .find(|it| self.range.is_subrange(&it.range())) .unwrap_or_else(|| panic!("can't resolve local ptr to SyntaxNode: {:?}", self)) } } pub(crate) fn into_global(self, file_id: FileId) -> SyntaxPtr { - SyntaxPtr { file_id, local: self} + SyntaxPtr { + file_id, + local: self, + } } } - #[test] fn test_local_syntax_ptr() { let file = File::parse("struct Foo { f: u32, }"); - let field = file.syntax().descendants().find_map(ast::NamedFieldDef::cast).unwrap(); + let field = file + .syntax() + .descendants() + .find_map(ast::NamedFieldDef::cast) + .unwrap(); let ptr = LocalSyntaxPtr::new(field.syntax()); let field_syntax = ptr.resolve(&file); assert_eq!(field.syntax(), field_syntax); -- cgit v1.2.3