Apply fourmolu

Author: zeme-wana

.cursorignore

@@ -0,0 +1,22 @@
+*.uplc
+*.plc
+*.pir
+*.plc-agda
+*.sig
+*.size 
+*.budget
+*.golden
+*.type
+*.eval
+*.benchmark
+*.astsize
+*.tex
+*.json
+*.js 
+*.err
+*.expected
+*.stat 
+*.show 
+*.golden.txt
+*.golden.tsv
+*.golden.tplc

.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
@@ -11,22 +11,22 @@ function-arrows: leading
 comma-style: leading
 
 # Styling of import/export lists (choices: leading, trailing, or diff-friendly)
-import-export-style: diff-friendly
+import-export-style: leading
 
 # 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,28 @@
+# We maintain a fork of fourmolu that fixes some issues with the upstream version.
+
+{ pkgs, lib }:
+
+ghc:
+
+let
+
+  attrs = {
+    "ghc96".rev = "0.17.0.0";
+    "ghc96".sha256 = "sha256-SzPmmpLOkRF6eLSSFzw/ZV1ERPvQOuIPfhZ/gpNpfZQ=";
+
+    "ghc912".rev = "0.19.0.1";
+    "ghc912".sha256 = "sha256-8A+LkCoXJj0edVe6lYEk5o0Nra+MC2Qm6i5Bribp1g4=";
+  }.${ghc};
+
+  fourmolu-project = pkgs.haskell-nix.cabalProject' {
+    src = pkgs.fetchFromGitHub {
+      owner = "zeme-wana";
+      repo = "fourmolu";
+      inherit (attrs) rev sha256;
+    };
+    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 = ghc: import ./shell.nix
-    { inherit inputs pkgs lib project agda-tools metatheory r-with-packages ghc; };
+    { inherit inputs pkgs lib project agda-tools metatheory r-with-packages ghc mkFourmolu; };
 
   exposed-haskell-packages = {
     plutus-core-test = project.flake'.packages."plutus-core:test:plutus-core-test";

nix/outputs.nix

@@ -1,6 +1,6 @@
 # editorconfig-checker-disable-file
 
-{ inputs, pkgs, lib, project, agda-tools, metatheory, r-with-packages, ghc }:
+{ inputs, pkgs, lib, project, agda-tools, metatheory, r-with-packages, ghc, mkFourmolu }:
 
 let
 
@@ -10,14 +10,14 @@ let
     "ghc96".cabal-fmt = project.projectVariants.ghc96.tool "cabal-fmt" "latest";
     "ghc96".haskell-language-server = project.projectVariants.ghc96.tool "haskell-language-server" "latest";
     "ghc96".stylish-haskell = project.projectVariants.ghc96.tool "stylish-haskell" "latest";
-    "ghc96".fourmolu = project.projectVariants.ghc96.tool "fourmolu" "0.17.0.0"; # fourmolu 0.18.0.0 and hlint 3.10 require GHC >=9.8
+    "ghc96".fourmolu = mkFourmolu ghc;
     "ghc96".hlint = project.projectVariants.ghc96.tool "hlint" "3.8";
 
     "ghc912".cabal = project.projectVariants.ghc912.tool "cabal" "latest";
     "ghc912".cabal-fmt = project.projectVariants.ghc96.tool "cabal-fmt" "latest"; # cabal-fmt not buildable with ghc9122
     "ghc912".haskell-language-server = project.projectVariants.ghc912.tool "haskell-language-server" "latest";
     "ghc912".stylish-haskell = project.projectVariants.ghc912.tool "stylish-haskell" "latest";
-    "ghc912".fourmolu = project.projectVariants.ghc912.tool "fourmolu" "latest";
+    "ghc912".fourmolu = mkFourmolu ghc;
     "ghc912".hlint = project.projectVariants.ghc912.tool "hlint" "latest";
   };
 
@@ -36,15 +36,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;