before formatting everything

Author: zeme-wana

.stylish-haskell.yaml

@@ -2,7 +2,7 @@
 indentation: 2
 
 # Max line length for automatic line breaking
-column-limit: 100
+column-limit: none
 
 # Styling of arrows in type signatures (choices: trailing, leading, or leading-args)
 function-arrows: leading
@@ -14,19 +14,19 @@ comma-style: leading
 import-export-style: diff-friendly
 
 # Whether to full-indent or half-indent 'where' bindings past the preceding body
-indent-wheres: false
+indent-wheres: true
 
 # Whether to leave a space before an opening record brace
-record-brace-space: false
+record-brace-space: true
 
 # Number of spaces between top-level declarations
 newlines-between-decls: 1
 
 # How to print Haddock comments (choices: single-line, multi-line, or multi-line-compact)
-haddock-style: multi-line-compact
+haddock-style: multi-line
 
 # How to print module docstring
-haddock-style-module: null
+haddock-style-module: multi-line
 
 # Styling of let blocks (choices: auto, inline, newline, or mixed)
 let-style: auto
@@ -35,10 +35,10 @@ let-style: auto
 in-style: right-align
 
 # Whether to put parentheses around a single constraint (choices: auto, always, or never)
-single-constraint-parens: always
+single-constraint-parens: never
 
 # Whether to put parentheses around a single deriving class (choices: auto, always, or never)
-single-deriving-parens: auto
+single-deriving-parens: always
 
 # Output Unicode syntax (choices: detect, always, or never)
 unicode: never

fourmolu.yaml

@@ -0,0 +1,19 @@
+# We maintain a fork of fourmolu that fixes some issues with the upstream version.
+
+{ pkgs, lib }:
+
+ghc:
+
+let
+  fourmolu-project = pkgs.haskell-nix.cabalProject' {
+    src = pkgs.fetchFromGitHub {
+      owner = "zeme-wana";
+      repo = "fourmolu";
+      rev = "3644b248a6ce19a85cce46edb20f5de08cb7546a";
+      sha256 = "sha256-zyEkx4oKHQepPb+52dNVkg93SZHWeVf6JqM5WFOmqJE=";
+    };
+    compiler-nix-name = ghc;
+  };
+in
+
+fourmolu-project.hsPkgs.fourmolu.components.exes.fourmolu

nix/fourmolu.nix

@@ -32,8 +32,11 @@ let
   project = import ./project.nix
     { inherit inputs pkgs lib metatheory r-with-packages utils; };
 
+  mkFourmolu = import ./fourmolu.nix
+    { inherit pkgs lib; };
+
   mkShell = project: import ./shell.nix
-    { inherit inputs pkgs lib project agda-tools metatheory r-with-packages; };
+    { inherit inputs pkgs lib project agda-tools metatheory r-with-packages mkFourmolu; };
 
   exposed-haskell-packages = {
     plutus-core-test = project.flake'.packages."plutus-core:test:plutus-core-test";

nix/outputs.nix

@@ -1,18 +1,19 @@
-{ inputs, pkgs, lib, project, agda-tools, metatheory, r-with-packages }:
+{ inputs, pkgs, lib, project, agda-tools, metatheory, r-with-packages, mkFourmolu }:
 
 let
 
   # Toolchain versions used in dev shells. Consumed by `project.shellFor`.
-  tools = project.tools {
-    # "latest" cabal would be 3.14.1.0 which breaks haddock generation.
-    # TODO update cabal version once haddock generation is fixed upstream.
-    cabal = "3.12.1.0";
-    cabal-fmt = "latest";
-    haskell-language-server = "latest";
-    # fourmolu 0.18.0.0 and hlint 3.10 require GHC >=9.8
-    fourmolu = "0.17.0.0";
-    hlint = "3.8";
-    stylish-haskell = "latest";
+  tools = project.tools
+    {
+      # "latest" cabal would be 3.14.1.0 which breaks haddock generation.
+      # TODO update cabal version once haddock generation is fixed upstream.
+      cabal = "3.12.1.0";
+      cabal-fmt = "latest";
+      haskell-language-server = "latest";
+      hlint = "3.8";
+      stylish-haskell = "latest";
+    } // {
+    fourmolu = mkFourmolu project.args.compiler-nix-name;
   };
 
   # Pre-commit hooks for the repo. Injects into shell via shellHook.
@@ -28,15 +29,16 @@ let
         package = tools.cabal-fmt;
       };
       stylish-haskell = {
-        enable = true;
+        enable = false;
         package = tools.stylish-haskell;
         args = [ "--config" ".stylish-haskell.yaml" ];
         excludes = [ "^plutus-metatheory/src/MAlonzo" ];
       };
       fourmolu = {
-        enable = false;
+        enable = true;
         package = tools.fourmolu;
-        args = [ "--mode" "inplace" ];
+        args = [ "--unsafe" ];
+        excludes = [ "^plutus-metatheory/src/MAlonzo" ];
       };
       hlint = {
         enable = false;