7 files changed, 66 insertions, 4 deletions

diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 0ead277b2..d3a8b516a 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/rust-analyzer/rust-analyzer"
 [dependencies]
 itertools = "0.8.0"
 rowan = "0.6.1"
-ra_rustc_lexer = { version = "0.1.0-pre.3", features = ["unicode-xid"] }
+rustc_lexer = "0.1.0"
 
 # ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
 # to reduce number of compilations
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index e2a92ae60..bcf753f78 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -934,6 +934,7 @@ impl AstNode for ExternCrateItem {
         &self.syntax
     }
 }
+impl ast::AttrsOwner for ExternCrateItem {}
 impl ExternCrateItem {
     pub fn name_ref(&self) -> Option<NameRef> {
         AstChildren::new(&self.syntax).next()
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index c14ee0e85..3e6c2d3f3 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -669,6 +669,7 @@ Grammar(
             collections: [("use_trees", "UseTree")]
         ),
         "ExternCrateItem": (
+            traits: ["AttrsOwner"],
             options: ["NameRef", "Alias"],
         ),
         "ArgList": (
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index 80e55d2aa..992034ef0 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -15,8 +15,9 @@ impl SyntaxNodePtr {
         SyntaxNodePtr { range: node.text_range(), kind: node.kind() }
     }
 
-    pub fn to_node(self, parent: &SyntaxNode) -> SyntaxNode {
-        successors(Some(parent.clone()), |node| {
+    pub fn to_node(self, root: &SyntaxNode) -> SyntaxNode {
+        assert!(root.parent().is_none());
+        successors(Some(root.clone()), |node| {
             node.children().find(|it| self.range.is_subrange(&it.text_range()))
         })
         .find(|it| it.text_range() == self.range && it.kind() == self.kind)
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
index 84867026f..bdb5fa6c5 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
@@ -28,7 +28,7 @@ SOURCE_FILE@[0; 42)
   WHITESPACE@[41; 42) "\n"
 error 23: expected `[`
 error 23: expected an item
-error 27: expected one of `*`, `::`, `{`, `self`, `super` or an indentifier
+error 27: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
 error 28: expected SEMI
 error 31: expected EXCL
 error 31: expected `{`, `[`, `(`
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rs b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rs
new file mode 100644
index 000000000..4a2668126
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rs
@@ -0,0 +1,5 @@
+use foo::bar;
+use
+use crate::baz;
+use
+fn f() {}
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt b/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt
new file mode 100644
index 000000000..636840828
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.txt
@@ -0,0 +1,54 @@
+SOURCE_FILE@[0; 48)
+  USE_ITEM@[0; 13)
+    USE_KW@[0; 3) "use"
+    WHITESPACE@[3; 4) " "
+    USE_TREE@[4; 12)
+      PATH@[4; 12)
+        PATH@[4; 7)
+          PATH_SEGMENT@[4; 7)
+            NAME_REF@[4; 7)
+              IDENT@[4; 7) "foo"
+        COLONCOLON@[7; 9) "::"
+        PATH_SEGMENT@[9; 12)
+          NAME_REF@[9; 12)
+            IDENT@[9; 12) "bar"
+    SEMI@[12; 13) ";"
+  WHITESPACE@[13; 14) "\n"
+  USE_ITEM@[14; 17)
+    USE_KW@[14; 17) "use"
+  WHITESPACE@[17; 18) "\n"
+  USE_ITEM@[18; 33)
+    USE_KW@[18; 21) "use"
+    WHITESPACE@[21; 22) " "
+    USE_TREE@[22; 32)
+      PATH@[22; 32)
+        PATH@[22; 27)
+          PATH_SEGMENT@[22; 27)
+            CRATE_KW@[22; 27) "crate"
+        COLONCOLON@[27; 29) "::"
+        PATH_SEGMENT@[29; 32)
+          NAME_REF@[29; 32)
+            IDENT@[29; 32) "baz"
+    SEMI@[32; 33) ";"
+  WHITESPACE@[33; 34) "\n"
+  USE_ITEM@[34; 37)
+    USE_KW@[34; 37) "use"
+  WHITESPACE@[37; 38) "\n"
+  FN_DEF@[38; 47)
+    FN_KW@[38; 40) "fn"
+    WHITESPACE@[40; 41) " "
+    NAME@[41; 42)
+      IDENT@[41; 42) "f"
+    PARAM_LIST@[42; 44)
+      L_PAREN@[42; 43) "("
+      R_PAREN@[43; 44) ")"
+    WHITESPACE@[44; 45) " "
+    BLOCK_EXPR@[45; 47)
+      BLOCK@[45; 47)
+        L_CURLY@[45; 46) "{"
+        R_CURLY@[46; 47) "}"
+  WHITESPACE@[47; 48) "\n"
+error 17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error 17: expected SEMI
+error 37: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error 37: expected SEMI