5 files changed, 30 insertions, 14 deletions

diff --git a/crates/ra_syntax/src/parsing.rs b/crates/ra_syntax/src/parsing.rs
index 6c2c5f78b..f74c365d5 100644
--- a/crates/ra_syntax/src/parsing.rs
+++ b/crates/ra_syntax/src/parsing.rs
@@ -2,14 +2,20 @@
 mod token_set;
 mod builder;
 mod lexer;
-mod parser_impl;
+mod event;
+mod input;
 mod parser_api;
 mod grammar;
 mod reparsing;
 
 use crate::{
     SyntaxError, SyntaxKind, SmolStr,
-    parsing::builder::GreenBuilder,
+    parsing::{
+        builder::GreenBuilder,
+        input::ParserInput,
+        event::EventProcessor,
+        parser_api::Parser,
+    },
     syntax_node::GreenNode,
 };
 
@@ -19,9 +25,22 @@ pub(crate) use self::reparsing::incremental_reparse;
 
 pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
     let tokens = tokenize(&text);
-    let (green, errors) =
-        parser_impl::parse_with(GreenBuilder::new(), text, &tokens, grammar::root);
-    (green, errors)
+    parse_with(GreenBuilder::new(), text, &tokens, grammar::root)
+}
+
+fn parse_with<S: TreeSink>(
+    tree_sink: S,
+    text: &str,
+    tokens: &[Token],
+    f: fn(&mut Parser),
+) -> S::Tree {
+    let mut events = {
+        let input = ParserInput::new(text, &tokens);
+        let mut p = Parser::new(&input);
+        f(&mut p);
+        p.finish()
+    };
+    EventProcessor::new(tree_sink, text, tokens, &mut events).process().finish()
 }
 
 /// `TreeSink` abstracts details of a particular syntax tree implementation.
diff --git a/crates/ra_syntax/src/parsing/parser_impl/event.rs b/crates/ra_syntax/src/parsing/event.rs
index 9663fba35..893a42e9a 100644
--- a/crates/ra_syntax/src/parsing/parser_impl/event.rs
+++ b/crates/ra_syntax/src/parsing/event.rs
@@ -20,7 +20,7 @@ use crate::{
     },
     parsing::{
         lexer::Token,
-        parser_impl::TreeSink,
+        TreeSink,
     },
 };
 
@@ -113,7 +113,7 @@ impl<'a, S: TreeSink> EventProcessor<'a, S> {
     }
 
     /// Generate the syntax tree with the control of events.
-    pub(super) fn process(mut self) -> S {
+    pub(crate) fn process(mut self) -> S {
         let mut forward_parents = Vec::new();
 
         for i in 0..self.events.len() {
diff --git a/crates/ra_syntax/src/parsing/parser_impl/input.rs b/crates/ra_syntax/src/parsing/input.rs
index 11b32b9ce..0f1810df5 100644
--- a/crates/ra_syntax/src/parsing/parser_impl/input.rs
+++ b/crates/ra_syntax/src/parsing/input.rs
@@ -1,8 +1,7 @@
 use crate::{
     SyntaxKind, SyntaxKind::EOF, TextRange, TextUnit,
     parsing::{
-        TokenPos,
-        parser_impl::TokenSource,
+        TokenPos, TokenSource,
         lexer::Token,
     },
 };
diff --git a/crates/ra_syntax/src/parsing/parser_api.rs b/crates/ra_syntax/src/parsing/parser_api.rs
index 92d7895d3..99f6183a4 100644
--- a/crates/ra_syntax/src/parsing/parser_api.rs
+++ b/crates/ra_syntax/src/parsing/parser_api.rs
@@ -8,7 +8,7 @@ use crate::{
     parsing::{
         TokenSource, TokenPos,
         token_set::TokenSet,
-        parser_impl::event::Event,
+        event::Event,
     },
 };
 
diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/ra_syntax/src/parsing/reparsing.rs
index edf3fa291..f45326dff 100644
--- a/crates/ra_syntax/src/parsing/reparsing.rs
+++ b/crates/ra_syntax/src/parsing/reparsing.rs
@@ -4,8 +4,7 @@ use crate::{
     syntax_node::{GreenNode, SyntaxNode},
     syntax_error::SyntaxError,
     parsing::{
-        grammar,
-        parser_impl,
+        grammar, parse_with,
         builder::GreenBuilder,
         parser_api::Parser,
         lexer::{tokenize, Token},
@@ -62,8 +61,7 @@ fn reparse_block<'node>(
     if !is_balanced(&tokens) {
         return None;
     }
-    let (green, new_errors) =
-        parser_impl::parse_with(GreenBuilder::new(), &text, &tokens, reparser);
+    let (green, new_errors) = parse_with(GreenBuilder::new(), &text, &tokens, reparser);
     Some((node, green, new_errors))
 }