6 files changed, 134 insertions, 8 deletions

diff --git a/crates/ra_parser/src/grammar/items/use_item.rs b/crates/ra_parser/src/grammar/items/use_item.rs
index 2af2ad315..63ac37e9e 100644
--- a/crates/ra_parser/src/grammar/items/use_item.rs
+++ b/crates/ra_parser/src/grammar/items/use_item.rs
@@ -3,7 +3,7 @@ use super::*;
 pub(super) fn use_item(p: &mut Parser, m: Marker) {
     assert!(p.at(T![use]));
     p.bump(T![use]);
-    use_tree(p);
+    use_tree(p, true);
     p.expect(T![;]);
     m.complete(p, USE_ITEM);
 }
@@ -12,7 +12,7 @@ pub(super) fn use_item(p: &mut Parser, m: Marker) {
 /// Note that this is called both by `use_item` and `use_tree_list`,
 /// so handles both `some::path::{inner::path}` and `inner::path` in
 /// `use some::path::{inner::path};`
-fn use_tree(p: &mut Parser) {
+fn use_tree(p: &mut Parser, top_level: bool) {
     let m = p.start();
     match p.current() {
         // Finish the use_tree for cases of e.g.
@@ -101,10 +101,14 @@ fn use_tree(p: &mut Parser) {
         }
         _ => {
             m.abandon(p);
-            p.err_recover(
-                "expected one of `*`, `::`, `{`, `self`, `super` or an identifier",
-                ITEM_RECOVERY_SET,
-            );
+            let msg = "expected one of `*`, `::`, `{`, `self`, `super` or an identifier";
+            if top_level {
+                p.err_recover(msg, ITEM_RECOVERY_SET);
+            } else {
+                // if we are parsing a nested tree, we have to eat a token to
+                // main balanced `{}`
+                p.err_and_bump(msg);
+            }
             return;
         }
     }
@@ -116,7 +120,7 @@ pub(crate) fn use_tree_list(p: &mut Parser) {
     let m = p.start();
     p.bump(T!['{']);
     while !p.at(EOF) && !p.at(T!['}']) {
-        use_tree(p);
+        use_tree(p, false);
         if !p.at(T!['}']) {
             p.expect(T![,]);
         }
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index bd3829f41..4e3522d48 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -256,7 +256,7 @@ fn path_or_macro_type_(p: &mut Parser, allow_bounds: bool) {
     let m = p.start();
     paths::type_path(p);
 
-    let kind = if p.at(T![!]) {
+    let kind = if p.at(T![!]) && !p.at(T![!=]) {
         items::macro_call_after_excl(p);
         MACRO_CALL
     } else {
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rs b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rs
new file mode 100644
index 000000000..d521a5bb2
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rs
@@ -0,0 +1,2 @@
+use std::{error::Error;
+use std::io;
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt b/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt
new file mode 100644
index 000000000..181f408c8
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.txt
@@ -0,0 +1,51 @@
+SOURCE_FILE@[0; 37)
+  USE_ITEM@[0; 36)
+    USE_KW@[0; 3) "use"
+    WHITESPACE@[3; 4) " "
+    USE_TREE@[4; 36)
+      PATH@[4; 7)
+        PATH_SEGMENT@[4; 7)
+          NAME_REF@[4; 7)
+            IDENT@[4; 7) "std"
+      COLONCOLON@[7; 9) "::"
+      USE_TREE_LIST@[9; 36)
+        L_CURLY@[9; 10) "{"
+        USE_TREE@[10; 22)
+          PATH@[10; 22)
+            PATH@[10; 15)
+              PATH_SEGMENT@[10; 15)
+                NAME_REF@[10; 15)
+                  IDENT@[10; 15) "error"
+            COLONCOLON@[15; 17) "::"
+            PATH_SEGMENT@[17; 22)
+              NAME_REF@[17; 22)
+                IDENT@[17; 22) "Error"
+        ERROR@[22; 23)
+          SEMI@[22; 23) ";"
+        WHITESPACE@[23; 24) "\n"
+        ERROR@[24; 27)
+          USE_KW@[24; 27) "use"
+        WHITESPACE@[27; 28) " "
+        USE_TREE@[28; 35)
+          PATH@[28; 35)
+            PATH@[28; 31)
+              PATH_SEGMENT@[28; 31)
+                NAME_REF@[28; 31)
+                  IDENT@[28; 31) "std"
+            COLONCOLON@[31; 33) "::"
+            PATH_SEGMENT@[33; 35)
+              NAME_REF@[33; 35)
+                IDENT@[33; 35) "io"
+        ERROR@[35; 36)
+          SEMI@[35; 36) ";"
+  WHITESPACE@[36; 37) "\n"
+error 22: expected COMMA
+error 22: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error 23: expected COMMA
+error 24: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error 27: expected COMMA
+error 35: expected COMMA
+error 35: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
+error 36: expected COMMA
+error 36: expected R_CURLY
+error 36: expected SEMI
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs
new file mode 100644
index 000000000..6210683ce
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs
@@ -0,0 +1,3 @@
+fn main() {
+    if 1.0f32.floor() as i64 != 1.0f32.floor() as i64 {}
+}
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.txt b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.txt
new file mode 100644
index 000000000..4a4ad84ca
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.txt
@@ -0,0 +1,66 @@
+SOURCE_FILE@[0; 71)
+  FN_DEF@[0; 70)
+    FN_KW@[0; 2) "fn"
+    WHITESPACE@[2; 3) " "
+    NAME@[3; 7)
+      IDENT@[3; 7) "main"
+    PARAM_LIST@[7; 9)
+      L_PAREN@[7; 8) "("
+      R_PAREN@[8; 9) ")"
+    WHITESPACE@[9; 10) " "
+    BLOCK_EXPR@[10; 70)
+      BLOCK@[10; 70)
+        L_CURLY@[10; 11) "{"
+        WHITESPACE@[11; 16) "\n    "
+        IF_EXPR@[16; 68)
+          IF_KW@[16; 18) "if"
+          WHITESPACE@[18; 19) " "
+          CONDITION@[19; 65)
+            BIN_EXPR@[19; 65)
+              CAST_EXPR@[19; 40)
+                METHOD_CALL_EXPR@[19; 33)
+                  LITERAL@[19; 25)
+                    FLOAT_NUMBER@[19; 25) "1.0f32"
+                  DOT@[25; 26) "."
+                  NAME_REF@[26; 31)
+                    IDENT@[26; 31) "floor"
+                  ARG_LIST@[31; 33)
+                    L_PAREN@[31; 32) "("
+                    R_PAREN@[32; 33) ")"
+                WHITESPACE@[33; 34) " "
+                AS_KW@[34; 36) "as"
+                WHITESPACE@[36; 37) " "
+                PATH_TYPE@[37; 40)
+                  PATH@[37; 40)
+                    PATH_SEGMENT@[37; 40)
+                      NAME_REF@[37; 40)
+                        IDENT@[37; 40) "i64"
+              WHITESPACE@[40; 41) " "
+              NEQ@[41; 43) "!="
+              WHITESPACE@[43; 44) " "
+              CAST_EXPR@[44; 65)
+                METHOD_CALL_EXPR@[44; 58)
+                  LITERAL@[44; 50)
+                    FLOAT_NUMBER@[44; 50) "1.0f32"
+                  DOT@[50; 51) "."
+                  NAME_REF@[51; 56)
+                    IDENT@[51; 56) "floor"
+                  ARG_LIST@[56; 58)
+                    L_PAREN@[56; 57) "("
+                    R_PAREN@[57; 58) ")"
+                WHITESPACE@[58; 59) " "
+                AS_KW@[59; 61) "as"
+                WHITESPACE@[61; 62) " "
+                PATH_TYPE@[62; 65)
+                  PATH@[62; 65)
+                    PATH_SEGMENT@[62; 65)
+                      NAME_REF@[62; 65)
+                        IDENT@[62; 65) "i64"
+          WHITESPACE@[65; 66) " "
+          BLOCK_EXPR@[66; 68)
+            BLOCK@[66; 68)
+              L_CURLY@[66; 67) "{"
+              R_CURLY@[67; 68) "}"
+        WHITESPACE@[68; 69) "\n"
+        R_CURLY@[69; 70) "}"
+  WHITESPACE@[70; 71) "\n"