Merge #3558

3558: Fix parsing of stement-ish binary expressions r=matklad a=matklad

closes #3512



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 41 insertions, 0 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs
new file mode 100644
index 000000000..05acc30f1
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs
@@ -0,0 +1,3 @@
+fn foo() {
+    v = {1}&2;
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.txt b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.txt
new file mode 100644
index 000000000..d568a1d45
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.txt
@@ -0,0 +1,38 @@
+SOURCE_FILE@[0; 28)
+  FN_DEF@[0; 27)
+    FN_KW@[0; 2) "fn"
+    WHITESPACE@[2; 3) " "
+    NAME@[3; 6)
+      IDENT@[3; 6) "foo"
+    PARAM_LIST@[6; 8)
+      L_PAREN@[6; 7) "("
+      R_PAREN@[7; 8) ")"
+    WHITESPACE@[8; 9) " "
+    BLOCK_EXPR@[9; 27)
+      BLOCK@[9; 27)
+        L_CURLY@[9; 10) "{"
+        WHITESPACE@[10; 15) "\n    "
+        EXPR_STMT@[15; 25)
+          BIN_EXPR@[15; 24)
+            PATH_EXPR@[15; 16)
+              PATH@[15; 16)
+                PATH_SEGMENT@[15; 16)
+                  NAME_REF@[15; 16)
+                    IDENT@[15; 16) "v"
+            WHITESPACE@[16; 17) " "
+            EQ@[17; 18) "="
+            WHITESPACE@[18; 19) " "
+            BIN_EXPR@[19; 24)
+              BLOCK_EXPR@[19; 22)
+                BLOCK@[19; 22)
+                  L_CURLY@[19; 20) "{"
+                  LITERAL@[20; 21)
+                    INT_NUMBER@[20; 21) "1"
+                  R_CURLY@[21; 22) "}"
+              AMP@[22; 23) "&"
+              LITERAL@[23; 24)
+                INT_NUMBER@[23; 24) "2"
+          SEMI@[24; 25) ";"
+        WHITESPACE@[25; 26) "\n"
+        R_CURLY@[26; 27) "}"
+  WHITESPACE@[27; 28) "\n"