aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src/parsing.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_syntax/src/parsing.rs')
-rw-r--r--crates/ra_syntax/src/parsing.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_syntax/src/parsing.rs b/crates/ra_syntax/src/parsing.rs
index 0ed3c20ef..68a39eb21 100644
--- a/crates/ra_syntax/src/parsing.rs
+++ b/crates/ra_syntax/src/parsing.rs
@@ -1,4 +1,4 @@
1//! Lexing, bridging to ra_parser (which does the actual parsing) and 1//! Lexing, bridging to parser (which does the actual parsing) and
2//! incremental reparsing. 2//! incremental reparsing.
3 3
4mod lexer; 4mod lexer;
@@ -13,7 +13,7 @@ use text_tree_sink::TextTreeSink;
13pub use lexer::*; 13pub use lexer::*;
14 14
15pub(crate) use self::reparsing::incremental_reparse; 15pub(crate) use self::reparsing::incremental_reparse;
16use ra_parser::SyntaxKind; 16use parser::SyntaxKind;
17 17
18pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) { 18pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
19 let (tokens, lexer_errors) = tokenize(&text); 19 let (tokens, lexer_errors) = tokenize(&text);
@@ -21,7 +21,7 @@ pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
21 let mut token_source = TextTokenSource::new(text, &tokens); 21 let mut token_source = TextTokenSource::new(text, &tokens);
22 let mut tree_sink = TextTreeSink::new(text, &tokens); 22 let mut tree_sink = TextTreeSink::new(text, &tokens);
23 23
24 ra_parser::parse(&mut token_source, &mut tree_sink); 24 parser::parse(&mut token_source, &mut tree_sink);
25 25
26 let (tree, mut parser_errors) = tree_sink.finish(); 26 let (tree, mut parser_errors) = tree_sink.finish();
27 parser_errors.extend(lexer_errors); 27 parser_errors.extend(lexer_errors);
@@ -32,7 +32,7 @@ pub(crate) fn parse_text(text: &str) -> (GreenNode, Vec<SyntaxError>) {
32/// Returns `text` parsed as a `T` provided there are no parse errors. 32/// Returns `text` parsed as a `T` provided there are no parse errors.
33pub(crate) fn parse_text_fragment<T: AstNode>( 33pub(crate) fn parse_text_fragment<T: AstNode>(
34 text: &str, 34 text: &str,
35 fragment_kind: ra_parser::FragmentKind, 35 fragment_kind: parser::FragmentKind,
36) -> Result<T, ()> { 36) -> Result<T, ()> {
37 let (tokens, lexer_errors) = tokenize(&text); 37 let (tokens, lexer_errors) = tokenize(&text);
38 if !lexer_errors.is_empty() { 38 if !lexer_errors.is_empty() {
@@ -44,13 +44,13 @@ pub(crate) fn parse_text_fragment<T: AstNode>(
44 44
45 // TextTreeSink assumes that there's at least some root node to which it can attach errors and 45 // TextTreeSink assumes that there's at least some root node to which it can attach errors and
46 // tokens. We arbitrarily give it a SourceFile. 46 // tokens. We arbitrarily give it a SourceFile.
47 use ra_parser::TreeSink; 47 use parser::TreeSink;
48 tree_sink.start_node(SyntaxKind::SOURCE_FILE); 48 tree_sink.start_node(SyntaxKind::SOURCE_FILE);
49 ra_parser::parse_fragment(&mut token_source, &mut tree_sink, fragment_kind); 49 parser::parse_fragment(&mut token_source, &mut tree_sink, fragment_kind);
50 tree_sink.finish_node(); 50 tree_sink.finish_node();
51 51
52 let (tree, parser_errors) = tree_sink.finish(); 52 let (tree, parser_errors) = tree_sink.finish();
53 use ra_parser::TokenSource; 53 use parser::TokenSource;
54 if !parser_errors.is_empty() || token_source.current().kind != SyntaxKind::EOF { 54 if !parser_errors.is_empty() || token_source.current().kind != SyntaxKind::EOF {
55 return Err(()); 55 return Err(());
56 } 56 }