print valid syntax for the corner case (1).a (#2653)

v-gb · web-flow · commit bbfd8f2cd9f9 · 2025-02-17T11:45:08.000+01:00
Not that I need this syntax, but I was wondering if my use of ocamlformat was adding
parens properly, tried this as a tricky example, only to realize that ocamlformat
doesn't handle it correctly in the first place. Considering this is handled correctly
for Pexp_index_op 5 lines above, might as well handle it here as well.
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,8 @@ profile. This started with version 0.26.0.
 - Fixed the AST generated for bindings of the form `let pattern : type = function ...`
   (#2651, @v-gb)
 
+- Print valid syntax for the corner case (1).a (#2653, @v-gb)
+
 ## 0.27.0
 
 ### Highlight
diff --git a/lib/Ast.ml b/lib/Ast.ml
@@ -2338,7 +2338,10 @@ end = struct
       when exp == lhs ->
         true
     | ( Exp {pexp_desc= Pexp_field (e, _); _}
-      , {pexp_desc= Pexp_construct _ | Pexp_cons _; _} )
+      , { pexp_desc=
+            ( Pexp_construct _ | Pexp_cons _
+            | Pexp_constant {pconst_desc= Pconst_integer (_, None); _} )
+        ; _ } )
       when e == exp ->
         true
     | ( Exp {pexp_desc= Pexp_function (_, _, Pfunction_body e); _}
diff --git a/test/passing/refs.default/record-402.ml.ref b/test/passing/refs.default/record-402.ml.ref
@@ -78,3 +78,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.default/record-loose.ml.ref b/test/passing/refs.default/record-loose.ml.ref
@@ -78,3 +78,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.default/record-tight_decl.ml.ref b/test/passing/refs.default/record-tight_decl.ml.ref
@@ -78,3 +78,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.default/record.ml.ref b/test/passing/refs.default/record.ml.ref
@@ -78,3 +78,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.janestreet/record-402.ml.ref b/test/passing/refs.janestreet/record-402.ml.ref
@@ -102,3 +102,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.janestreet/record-loose.ml.ref b/test/passing/refs.janestreet/record-loose.ml.ref
@@ -102,3 +102,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.janestreet/record-tight_decl.ml.ref b/test/passing/refs.janestreet/record-tight_decl.ml.ref
@@ -102,3 +102,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.janestreet/record.ml.ref b/test/passing/refs.janestreet/record.ml.ref
@@ -102,3 +102,4 @@ let foo
 
 let x = (A B).a
 let x = A (B).a
+let x = (1).a
diff --git a/test/passing/refs.ocamlformat/record-402.ml.ref b/test/passing/refs.ocamlformat/record-402.ml.ref
@@ -78,3 +78,5 @@ let foo
 let x = (A B).a
 
 let x = A (B).a
+
+let x = (1).a
diff --git a/test/passing/refs.ocamlformat/record-loose.ml.ref b/test/passing/refs.ocamlformat/record-loose.ml.ref
@@ -78,3 +78,5 @@ let foo
 let x = (A B).a
 
 let x = A (B).a
+
+let x = (1).a
diff --git a/test/passing/refs.ocamlformat/record-tight_decl.ml.ref b/test/passing/refs.ocamlformat/record-tight_decl.ml.ref
@@ -78,3 +78,5 @@ let foo
 let x = (A B).a
 
 let x = A (B).a
+
+let x = (1).a
diff --git a/test/passing/refs.ocamlformat/record.ml.ref b/test/passing/refs.ocamlformat/record.ml.ref
@@ -78,3 +78,5 @@ let foo
 let x = (A B).a
 
 let x = A (B).a
+
+let x = (1).a
diff --git a/test/passing/tests/record.ml b/test/passing/tests/record.ml
@@ -86,3 +86,6 @@ let foo
 let x = (A(B)).a
 
 let x = A(B).a
+
+let x = (1).a
+

Original file line number	Diff line number	Diff line change
`@@ -78,3 +78,4 @@ let foo`
`78`	`78`
`79`	`79`	`let x = (A B).a`
`80`	`80`	`let x = A (B).a`
	`81`	`+let x = (1).a`
Original file line number	Diff line number	Diff line change
`@@ -102,3 +102,4 @@ let foo`
`102`	`102`
`103`	`103`	`let x = (A B).a`
`104`	`104`	`let x = A (B).a`
	`105`	`+let x = (1).a`