Auto merge of #17464 - wyatt-herkamp:fix-actix-macro, r=lnicola

bors · bors · commit 9b8b6f92b21e · 2024-06-20T12:59:02.000Z
Check that Expr is none before adding fixup Closes #17463
diff --git a/src/tools/rust-analyzer/crates/hir-expand/src/fixup.rs b/src/tools/rust-analyzer/crates/hir-expand/src/fixup.rs
@@ -277,7 +277,7 @@ pub(crate) fn fixup_syntax(
                 },
                 ast::RecordExprField(it) => {
                     if let Some(colon) = it.colon_token() {
-                        if it.name_ref().is_some() {
+                        if it.name_ref().is_some() && it.expr().is_none() {
                             append.insert(colon.into(), vec![
                                 Leaf::Ident(Ident {
                                     text: "__ra_fixup".into(),
@@ -843,6 +843,20 @@ fn foo () {R {f : __ra_fixup}}
         )
     }
 
+    #[test]
+    fn no_fixup_record_ctor_field() {
+        check(
+            r#"
+fn foo() {
+    R { f: a }
+}
+"#,
+            expect![[r#"
+fn foo () {R {f : a}}
+"#]],
+        )
+    }
+
     #[test]
     fn fixup_arg_list() {
         check(
