1 files changed, 18 insertions, 19 deletions

diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 123002825..330f68053 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -20,6 +20,7 @@
 #![allow(missing_docs)]
 //#![warn(unreachable_pub)] // rust-lang/rust#47816
 
+extern crate arrayvec;
 extern crate drop_bomb;
 extern crate itertools;
 extern crate parking_lot;
@@ -60,49 +61,47 @@ pub use crate::{
 
 use crate::yellow::GreenNode;
 
-/// File represents a parse tree for a single Rust file.
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct File {
-    root: SyntaxNode,
-}
+/// `SourceFileNode` represents a parse tree for a single Rust file.
+pub use crate::ast::SourceFileNode;
 
-impl File {
-    fn new(green: GreenNode, errors: Vec<SyntaxError>) -> File {
+impl SourceFileNode {
+    fn new(green: GreenNode, errors: Vec<SyntaxError>) -> SourceFileNode {
         let root = SyntaxNode::new(green, errors);
         if cfg!(debug_assertions) {
             utils::validate_block_structure(root.borrowed());
         }
-        File { root }
+        assert_eq!(root.kind(), SyntaxKind::SOURCE_FILE);
+        ast::SourceFileNode { syntax: root }
     }
-    pub fn parse(text: &str) -> File {
+    pub fn parse(text: &str) -> SourceFileNode {
         let tokens = tokenize(&text);
         let (green, errors) =
             parser_impl::parse_with(yellow::GreenBuilder::new(), text, &tokens, grammar::root);
-        File::new(green, errors)
+        SourceFileNode::new(green, errors)
     }
-    pub fn reparse(&self, edit: &AtomEdit) -> File {
+    pub fn reparse(&self, edit: &AtomEdit) -> SourceFileNode {
         self.incremental_reparse(edit)
             .unwrap_or_else(|| self.full_reparse(edit))
     }
-    pub fn incremental_reparse(&self, edit: &AtomEdit) -> Option<File> {
+    pub fn incremental_reparse(&self, edit: &AtomEdit) -> Option<SourceFileNode> {
         reparsing::incremental_reparse(self.syntax(), edit, self.errors())
-            .map(|(green_node, errors)| File::new(green_node, errors))
+            .map(|(green_node, errors)| SourceFileNode::new(green_node, errors))
     }
-    fn full_reparse(&self, edit: &AtomEdit) -> File {
+    fn full_reparse(&self, edit: &AtomEdit) -> SourceFileNode {
         let text =
             text_utils::replace_range(self.syntax().text().to_string(), edit.delete, &edit.insert);
-        File::parse(&text)
+        SourceFileNode::parse(&text)
     }
     /// Typed AST representation of the parse tree.
-    pub fn ast(&self) -> ast::Root {
-        ast::Root::cast(self.syntax()).unwrap()
+    pub fn ast(&self) -> ast::SourceFile {
+        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
     }