4 files changed, 59 insertions, 65 deletions

diff --git a/crates/ra_syntax/src/parsing.rs b/crates/ra_syntax/src/parsing.rs
index 761accd7b..6c2c5f78b 100644
--- a/crates/ra_syntax/src/parsing.rs
+++ b/crates/ra_syntax/src/parsing.rs
@@ -8,7 +8,7 @@ mod grammar;
 mod reparsing;
 
 use crate::{
-    SyntaxError,
+    SyntaxError, SyntaxKind, SmolStr,
     parsing::builder::GreenBuilder,
     syntax_node::GreenNode,
 };
@@ -23,3 +23,51 @@ pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
         parser_impl::parse_with(GreenBuilder::new(), text, &tokens, grammar::root);
     (green, errors)
 }
+
+/// `TreeSink` abstracts details of a particular syntax tree implementation.
+trait TreeSink {
+    type Tree;
+
+    /// Adds new leaf to the current branch.
+    fn leaf(&mut self, kind: SyntaxKind, text: SmolStr);
+
+    /// Start new branch and make it current.
+    fn start_branch(&mut self, kind: SyntaxKind);
+
+    /// Finish current branch and restore previous
+    /// branch as current.
+    fn finish_branch(&mut self);
+
+    fn error(&mut self, error: SyntaxError);
+
+    /// Complete tree building. Make sure that
+    /// `start_branch` and `finish_branch` calls
+    /// are paired!
+    fn finish(self) -> Self::Tree;
+}
+
+/// `TokenSource` abstracts the source of the tokens parser operates one.
+///
+/// Hopefully this will allow us to treat text and token trees in the same way!
+trait TokenSource {
+    fn token_kind(&self, pos: TokenPos) -> SyntaxKind;
+    fn is_token_joint_to_next(&self, pos: TokenPos) -> bool;
+    fn is_keyword(&self, pos: TokenPos, kw: &str) -> bool;
+}
+
+#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Default)]
+pub(crate) struct TokenPos(pub u32);
+
+impl std::ops::Add<u32> for TokenPos {
+    type Output = TokenPos;
+
+    fn add(self, rhs: u32) -> TokenPos {
+        TokenPos(self.0 + rhs)
+    }
+}
+
+impl std::ops::AddAssign<u32> for TokenPos {
+    fn add_assign(&mut self, rhs: u32) {
+        self.0 += rhs
+    }
+}
diff --git a/crates/ra_syntax/src/parsing/builder.rs b/crates/ra_syntax/src/parsing/builder.rs
index 118f43b2c..a05e7f84b 100644
--- a/crates/ra_syntax/src/parsing/builder.rs
+++ b/crates/ra_syntax/src/parsing/builder.rs
@@ -1,5 +1,5 @@
 use crate::{
-    parsing::parser_impl::TreeSink,
+    parsing::TreeSink,
     syntax_node::{GreenNode, RaTypes},
     SmolStr, SyntaxKind, SyntaxError,
 };
diff --git a/crates/ra_syntax/src/parsing/parser_impl.rs b/crates/ra_syntax/src/parsing/parser_impl.rs
index 96de32fc2..89439e074 100644
--- a/crates/ra_syntax/src/parsing/parser_impl.rs
+++ b/crates/ra_syntax/src/parsing/parser_impl.rs
@@ -4,47 +4,17 @@ pub(crate) mod input;
 use std::cell::Cell;
 
 use crate::{
-    SmolStr,
-    syntax_error::{ParseError, SyntaxError},
+    syntax_error::ParseError,
     parsing::{
+        TreeSink, TokenSource, TokenPos,
         lexer::Token,
         parser_api::Parser,
-        parser_impl::{
-            event::{Event, EventProcessor},
-            input::InputPosition,
-        },
+        parser_impl::event::{Event, EventProcessor},
     },
 };
 
 use crate::SyntaxKind::{self, EOF, TOMBSTONE};
 
-pub(super) trait TreeSink {
-    type Tree;
-
-    /// Adds new leaf to the current branch.
-    fn leaf(&mut self, kind: SyntaxKind, text: SmolStr);
-
-    /// Start new branch and make it current.
-    fn start_branch(&mut self, kind: SyntaxKind);
-
-    /// Finish current branch and restore previous
-    /// branch as current.
-    fn finish_branch(&mut self);
-
-    fn error(&mut self, error: SyntaxError);
-
-    /// Complete tree building. Make sure that
-    /// `start_branch` and `finish_branch` calls
-    /// are paired!
-    fn finish(self) -> Self::Tree;
-}
-
-pub(super) trait TokenSource {
-    fn token_kind(&self, pos: InputPosition) -> SyntaxKind;
-    fn is_token_joint_to_next(&self, pos: InputPosition) -> bool;
-    fn is_keyword(&self, pos: InputPosition, kw: &str) -> bool;
-}
-
 /// Parse a sequence of tokens into the representative node tree
 pub(super) fn parse_with<S: TreeSink>(
     sink: S,
@@ -67,7 +37,7 @@ pub(super) fn parse_with<S: TreeSink>(
 /// the public API of the `Parser`.
 pub(super) struct ParserImpl<'a> {
     token_source: &'a dyn TokenSource,
-    pos: InputPosition,
+    pos: TokenPos,
     events: Vec<Event>,
     steps: Cell<u32>,
 }
@@ -76,7 +46,7 @@ impl<'a> ParserImpl<'a> {
     fn new(token_source: &'a dyn TokenSource) -> ParserImpl<'a> {
         ParserImpl {
             token_source,
-            pos: InputPosition::new(),
+            pos: TokenPos::default(),
             events: Vec::new(),
             steps: Cell::new(0),
         }
diff --git a/crates/ra_syntax/src/parsing/parser_impl/input.rs b/crates/ra_syntax/src/parsing/parser_impl/input.rs
index 8ebbd3825..e9735e526 100644
--- a/crates/ra_syntax/src/parsing/parser_impl/input.rs
+++ b/crates/ra_syntax/src/parsing/parser_impl/input.rs
@@ -1,22 +1,21 @@
 use crate::{
     SyntaxKind, SyntaxKind::EOF, TextRange, TextUnit,
     parsing::{
+        TokenPos,
         parser_impl::TokenSource,
         lexer::Token,
     },
 };
 
-use std::ops::{Add, AddAssign};
-
 impl<'t> TokenSource for ParserInput<'t> {
-    fn token_kind(&self, pos: InputPosition) -> SyntaxKind {
+    fn token_kind(&self, pos: TokenPos) -> SyntaxKind {
         let idx = pos.0 as usize;
         if !(idx < self.tokens.len()) {
             return EOF;
         }
         self.tokens[idx].kind
     }
-    fn is_token_joint_to_next(&self, pos: InputPosition) -> bool {
+    fn is_token_joint_to_next(&self, pos: TokenPos) -> bool {
         let idx_curr = pos.0 as usize;
         let idx_next = pos.0 as usize;
         if !(idx_next < self.tokens.len()) {
@@ -24,7 +23,7 @@ impl<'t> TokenSource for ParserInput<'t> {
         }
         self.start_offsets[idx_curr] + self.tokens[idx_curr].len == self.start_offsets[idx_next]
     }
-    fn is_keyword(&self, pos: InputPosition, kw: &str) -> bool {
+    fn is_keyword(&self, pos: TokenPos, kw: &str) -> bool {
         let idx = pos.0 as usize;
         if !(idx < self.tokens.len()) {
             return false;
@@ -72,26 +71,3 @@ impl<'t> ParserInput<'t> {
         ParserInput { text, start_offsets, tokens }
     }
 }
-
-#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
-pub(crate) struct InputPosition(u32);
-
-impl InputPosition {
-    pub fn new() -> Self {
-        InputPosition(0)
-    }
-}
-
-impl Add<u32> for InputPosition {
-    type Output = InputPosition;
-
-    fn add(self, rhs: u32) -> InputPosition {
-        InputPosition(self.0 + rhs)
-    }
-}
-
-impl AddAssign<u32> for InputPosition {
-    fn add_assign(&mut self, rhs: u32) {
-        self.0 += rhs
-    }
-}