aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-02-20 13:48:06 +0000
committerAleksey Kladov <[email protected]>2019-02-20 13:48:06 +0000
commit86a67dce25f11ba9803a5727f77c02fd1f49e2c0 (patch)
treed02a22f02908fd3c89e50845a06a89b997220fc2 /crates/ra_syntax/src
parent45fc91cc470fa91d5b8905fea2cab4d42bbe72b3 (diff)
fix tests
Diffstat (limited to 'crates/ra_syntax/src')
-rw-r--r--crates/ra_syntax/src/parsing/reparsing.rs8
-rw-r--r--crates/ra_syntax/src/syntax_kinds.rs3
2 files changed, 7 insertions, 4 deletions
diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/ra_syntax/src/parsing/reparsing.rs
index a88f53dae..edf3fa291 100644
--- a/crates/ra_syntax/src/parsing/reparsing.rs
+++ b/crates/ra_syntax/src/parsing/reparsing.rs
@@ -79,10 +79,12 @@ fn is_contextual_kw(text: &str) -> bool {
79 } 79 }
80} 80}
81 81
82type ParseFn = fn(&mut Parser); 82fn find_reparsable_node(
83fn find_reparsable_node(node: &SyntaxNode, range: TextRange) -> Option<(&SyntaxNode, ParseFn)> { 83 node: &SyntaxNode,
84 range: TextRange,
85) -> Option<(&SyntaxNode, fn(&mut Parser))> {
84 let node = algo::find_covering_node(node, range); 86 let node = algo::find_covering_node(node, range);
85 node.ancestors().find_map(grammar::reparser).map(|r| (node, r)) 87 node.ancestors().find_map(|node| grammar::reparser(node).map(|r| (node, r)))
86} 88}
87 89
88fn is_balanced(tokens: &[Token]) -> bool { 90fn is_balanced(tokens: &[Token]) -> bool {
diff --git a/crates/ra_syntax/src/syntax_kinds.rs b/crates/ra_syntax/src/syntax_kinds.rs
index d53886676..c1118c5ab 100644
--- a/crates/ra_syntax/src/syntax_kinds.rs
+++ b/crates/ra_syntax/src/syntax_kinds.rs
@@ -1,8 +1,9 @@
1mod generated; 1mod generated;
2 2
3use crate::SyntaxKind::*;
4use std::fmt; 3use std::fmt;
5 4
5use crate::SyntaxKind::*;
6
6pub use self::generated::SyntaxKind; 7pub use self::generated::SyntaxKind;
7 8
8impl fmt::Debug for SyntaxKind { 9impl fmt::Debug for SyntaxKind {