Remove "Case 1"

Author: piegamesde

src/Nixfmt/Pretty.hs

@@ -636,13 +636,6 @@ absorbRHS expr = case expr of
   (With{}) -> nest $ group' RegularG $ line <> pretty expr
   -- Special case `//` and `++` operations to be more compact in some cases
   -- Case 1: two arguments, LHS is absorbable term, RHS fits onto the last line
-  (Operation (Term t) (LoneAnn op) b)
-    | isAbsorbable t
-        && isUpdateOrConcat op
-        -- Exclude further operations on the RHS
-        -- Hotfix for https://github.com/NixOS/nixfmt/issues/198
-        && case b of (Operation{}) -> False; _ -> True ->
-        hardspace <> (prettyTermWide t) <> group' RegularG (line <> pretty op <> hardspace <> pretty b)
   -- Unindent concatenations
   -- https://github.com/NixOS/nixfmt/issues/228
   (Operation (Term t) op@(Ann{value}) _)

test/diff/attr_set/out-pure.nix

@@ -414,16 +414,15 @@
         list
       ];
     some.long.attribute # with a comment
-      = [
-        stuff
-      ] ++ more stuff;
+      = [ stuff ] ++ more stuff;
     some.long.attribute1 # with a comment
       = [
         stuff
         a
         b
         c
-      ] ++ more stuff;
+      ]
+      ++ more stuff;
 
     foo4 # nasty
       = # comments

test/diff/attr_set/out.nix

@@ -431,16 +431,15 @@
         list
       ];
     some.long.attribute # with a comment
-      = [
-        stuff
-      ] ++ more stuff;
+      = [ stuff ] ++ more stuff;
     some.long.attribute1 # with a comment
       = [
         stuff
         a
         b
         c
-      ] ++ more stuff;
+      ]
+      ++ more stuff;
 
     foo4 # nasty
       = # comments

test/diff/idioms_pkgs_3/out-pure.nix

@@ -573,7 +573,8 @@ buildStdenv.mkDerivation ({
     inherit tests;
     inherit gtk3;
     inherit wasiSysRoot;
-  } // extraPassthru;
+  }
+  // extraPassthru;
 
   hardeningDisable = [ "format" ]; # -Werror=format-security
 

test/diff/idioms_pkgs_3/out.nix

@@ -239,7 +239,8 @@ buildStdenv.mkDerivation ({
 
   outputs = [
     "out"
-  ] ++ lib.optionals crashreporterSupport [ "symbols" ];
+  ]
+  ++ lib.optionals crashreporterSupport [ "symbols" ];
 
   # Add another configure-build-profiling run before the final configure phase if we build with pgo
   preConfigurePhases = lib.optionals pgoSupport [
@@ -575,7 +576,8 @@ buildStdenv.mkDerivation ({
     inherit tests;
     inherit gtk3;
     inherit wasiSysRoot;
-  } // extraPassthru;
+  }
+  // extraPassthru;
 
   hardeningDisable = [ "format" ]; # -Werror=format-security