Merge #8068

8068: Correctly handle `#[cfg]` on function parameters r=jonas-schievink a=jonas-schievink

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/5649

Co-authored-by: Jonas Schievink <[email protected]>

2 files changed, 49 insertions, 49 deletions

diff --git a/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index 495e4c51b..a84088bf3 100644
--- a/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -6,16 +6,16 @@ [email protected]
       [email protected] "f"
     [email protected]
       [email protected] "("
-      ATTR@5..13
-        POUND@5..6 "#"
-        L_BRACK@6..7 "["
-        PATH@7..12
-          PATH_SEGMENT@7..12
-            NAME_REF@7..12
-              IDENT@7..12 "attr1"
-        R_BRACK@12..13 "]"
-      WHITESPACE@13..14 " "
-      PARAM@14..23
+      PARAM@5..23
+        ATTR@5..13
+          POUND@5..6 "#"
+          L_BRACK@6..7 "["
+          [email protected]
+            PATH_SEGMENT@7..12
+              NAME_REF@7..12
+                IDENT@7..12 "attr1"
+          R_BRACK@12..13 "]"
+        WHITESPACE@13..14 " "
         [email protected]
           [email protected]
             [email protected] "pat"
diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
index e10521d85..88470c41c 100644
--- a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -6,25 +6,25 @@ [email protected]
       [email protected] "g1"
     [email protected]
       [email protected] "("
-      ATTR@6..14
-        POUND@6..7 "#"
-        L_BRACK@7..8 "["
-        PATH@8..13
-          PATH_SEGMENT@8..13
-            NAME_REF@8..13
-              IDENT@8..13 "attr1"
-        R_BRACK@13..14 "]"
-      WHITESPACE@14..15 " "
-      ATTR@15..23
-        POUND@15..16 "#"
-        L_BRACK@16..17 "["
-        PATH@17..22
-          PATH_SEGMENT@17..22
-            NAME_REF@17..22
-              IDENT@17..22 "attr2"
-        R_BRACK@22..23 "]"
-      WHITESPACE@23..24 " "
-      PARAM@24..33
+      PARAM@6..33
+        ATTR@6..14
+          POUND@6..7 "#"
+          L_BRACK@7..8 "["
+          [email protected]
+            PATH_SEGMENT@8..13
+              NAME_REF@8..13
+                IDENT@8..13 "attr1"
+          R_BRACK@13..14 "]"
+        WHITESPACE@14..15 " "
+        ATTR@15..23
+          POUND@15..16 "#"
+          L_BRACK@16..17 "["
+          [email protected]
+            PATH_SEGMENT@17..22
+              NAME_REF@17..22
+                IDENT@17..22 "attr2"
+          R_BRACK@22..23 "]"
+        WHITESPACE@23..24 " "
         [email protected]
           [email protected]
             [email protected] "pat"
@@ -48,16 +48,16 @@ [email protected]
       [email protected] "g2"
     [email protected]
       [email protected] "("
-      ATT[email protected]2
-        POUND@44..45 "#"
-        L_BRACK@45..46 "["
-        PATH@46..51
-          PATH_SEGMENT@46..51
-            NAME_REF@46..51
-              IDENT@46..51 "attr1"
-        R_BRACK@51..52 "]"
-      WHITESPACE@52..53 " "
-      PARAM@53..58
+      PARAM@44..58
+        ATTR@44..52
+          POUND@44..45 "#"
+          L_BRACK@45..46 "["
+          [email protected]
+            PATH_SEGMENT@46..51
+              NAME_REF@46..51
+                IDENT@46..51 "attr1"
+          R_BRACK@51..52 "]"
+        WHITESPACE@52..53 " "
         [email protected]
           [email protected]
             [email protected] "x"
@@ -203,16 +203,16 @@ [email protected]
           [email protected] "bar"
         [email protected]
           [email protected] "("
-          ATT[email protected]04
-            POUND@197..198 "#"
-            L_BRACK@198..199 "["
-            PATH@199..203
-              PATH_SEGMENT@199..203
-                NAME_REF@199..203
-                  IDENT@199..203 "attr"
-            R_BRACK@203..204 "]"
-          WHITESPACE@204..205 " "
-          PARAM@205..211
+          PARAM@197..211
+            ATTR@197..204
+              POUND@197..198 "#"
+              L_BRACK@198..199 "["
+              [email protected]
+                PATH_SEGMENT@199..203
+                  NAME_REF@199..203
+                    IDENT@199..203 "attr"
+              R_BRACK@203..204 "]"
+            WHITESPACE@204..205 " "
             [email protected]
               [email protected] "_"
             [email protected] ":"