Merge #211

211: ra_syntax::File is just RootNode r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 7 insertions, 8 deletions

diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 123002825..aa172ba42 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -60,11 +60,9 @@ pub use crate::{
 
 use crate::yellow::GreenNode;
 
+// TODO: pick a single name for everything. SourceFile maybe?
 /// File represents a parse tree for a single Rust file.
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct File {
-    root: SyntaxNode,
-}
+pub type File = ast::RootNode;
 
 impl File {
     fn new(green: GreenNode, errors: Vec<SyntaxError>) -> File {
@@ -72,7 +70,8 @@ impl File {
         if cfg!(debug_assertions) {
             utils::validate_block_structure(root.borrowed());
         }
-        File { root }
+        assert_eq!(root.kind(), SyntaxKind::ROOT);
+        ast::RootNode { syntax: root }
     }
     pub fn parse(text: &str) -> File {
         let tokens = tokenize(&text);
@@ -95,14 +94,14 @@ impl File {
     }
     /// Typed AST representation of the parse tree.
     pub fn ast(&self) -> ast::Root {
-        ast::Root::cast(self.syntax()).unwrap()
+        self.borrowed()
     }
     /// Untyped homogeneous representation of the parse tree.
     pub fn syntax(&self) -> SyntaxNodeRef {
-        self.root.borrowed()
+        self.syntax.borrowed()
     }
     pub fn errors(&self) -> Vec<SyntaxError> {
-        let mut errors = self.root.root_data().clone();
+        let mut errors = self.syntax.root_data().clone();
         errors.extend(validation::validate(self));
         errors
     }