Separating parsing of `for` in predicates and types

3 files changed, 98 insertions, 8 deletions

diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index 568a4cc02..4d6461d1e 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -12,17 +12,16 @@ [email protected]
       [email protected] "where"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "for"
-          [email protected]
-            [email protected] "<"
-            [email protected]
-              [email protected] "\'a"
-            [email protected] ">"
+        [email protected] "for"
+        [email protected]
+          [email protected] "<"
+          [email protected]
+            [email protected] "\'a"
+          [email protected] ">"
     [email protected] "\n"
     [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-error 26..26: expected a path
+error 26..26: expected type
 error 26..26: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
new file mode 100644
index 000000000..3400beff0
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
@@ -0,0 +1,88 @@
+[email protected]
+  [email protected]
+    [email protected] "type"
+    [email protected] " "
+    [email protected]
+      [email protected] "A"
+    [email protected] " "
+    [email protected] "="
+    [email protected] " "
+    [email protected]
+      [email protected] "for"
+      [email protected]
+        [email protected] "<"
+        [email protected]
+          [email protected] "\'a"
+        [email protected] ">"
+      [email protected] " "
+      [email protected]
+        [email protected] "&"
+        [email protected] "\'a"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "u32"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "type"
+    [email protected] " "
+    [email protected]
+      [email protected] "B"
+    [email protected] " "
+    [email protected] "="
+    [email protected] " "
+    [email protected]
+      [email protected] "for"
+      [email protected]
+        [email protected] "<"
+        [email protected]
+          [email protected] "\'a"
+        [email protected] ">"
+      [email protected] " "
+      [email protected]
+        [email protected] "("
+        [email protected]
+          [email protected] "&"
+          [email protected] "\'a"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "u32"
+        [email protected] ","
+        [email protected] ")"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "type"
+    [email protected] " "
+    [email protected]
+      [email protected] "B"
+    [email protected] " "
+    [email protected] "="
+    [email protected] " "
+    [email protected]
+      [email protected] "for"
+      [email protected]
+        [email protected] "<"
+        [email protected]
+          [email protected] "\'a"
+        [email protected] ">"
+      [email protected] " "
+      [email protected]
+        [email protected] "["
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "u32"
+        [email protected] "]"
+    [email protected] ";"
+  [email protected] "\n"
+error 16..16: expected a function pointer or path
+error 42..42: expected a function pointer or path
+error 71..71: expected a function pointer or path
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs
new file mode 100644
index 000000000..f34ac7fc5
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs
@@ -0,0 +1,3 @@
+type A = for<'a> &'a u32;
+type B = for<'a> (&'a u32,);
+type B = for<'a> [u32];