abdfc9a...master · ormolu

git.iko.soy/ormolu

16 files changed+110−29

since splitsnapshots

unifiedsplit

.buildkite/pipeline.yml+2−2 .github/workflows/binaries.yml+39 .github/workflows/build.sh+7 CHANGELOG.md+5 README.md+1−1 app/Main.hs+10−6 default.nix+7−10 expected-failures/esqueleto.txt+1−1 expected-failures/hlint.txt+11 expected-failures/pandoc.txt+1−1 expected-failures/postgrest.txt+5 expected-failures/purescript.txt+2−2 expected-failures/tensorflow.txt+7 nix/nixpkgs/default.nix+7−3 ormolu.cabal+2−2 shell.nix+3−1

.buildkite/pipeline.yml+2−2

@@ -3,9 +3,9 @@ steps:

33 command: |

44 nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc865

55 timeout: 100

6− - label: Build and test with GHC 8.8.3

6+ - label: Build and test with GHC 8.8.4

77 command: |

8− nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc883

8+ nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc884

99 timeout: 100

1010 - label: Build and test with GHC 8.10.1

1111 command: |

.github/workflows/binaries.ymlnew file+39

@@ -0,0 +1,39 @@

1+name: Build binaries

2+on:

3+ release:

4+ types: [published]

5+jobs:

6+ build:

7+ strategy:

8+ fail-fast: false

9+ matrix:

10+ os: [ubuntu-latest, macOS-latest, windows-latest]

11+ runs-on: ${{ matrix.os }}

12+ steps:

13+ - uses: actions/checkout@v2

14+ - uses: actions/setup-haskell@v1

15+ if: runner.os != 'Linux'

16+ with:

17+ ghc-version: '8.10.1'

18+ cabal-version: '3.2'

19+ - name: Build Linux binary

20+ if: runner.os == 'Linux'

21+ run: |

22+ docker run \

23+ -v $(pwd):/mnt -w /mnt \

24+ utdemir/ghc-musl:v14-ghc8101 \

25+ bash .github/workflows/build.sh

26+ - name: Build ${{ runner.os }} binary

27+ if: runner.os != 'Linux'

28+ shell: bash

29+ run: |

30+ cabal build exe:ormolu

31+ cp $(find dist-newstyle $ -name ormolu -o -name ormolu.exe $ -type f) ormolu

32+ - uses: actions/upload-release-asset@v1

33+ env:

34+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

35+ with:

36+ upload_url: ${{ github.event.release.upload_url }}

37+ asset_path: ormolu

38+ asset_name: ormolu-${{ runner.os }}

39+ asset_content_type: application/octet-stream

.github/workflows/build.shnew file+7

@@ -0,0 +1,7 @@

1+set -e

3+cabal update

4+cabal build exe:ormolu --enable-executable-static --ghc-options="-split-sections"

6+cp $(find dist-newstyle -name ormolu -type f) .

7+strip -s ormolu

CHANGELOG.md+5

@@ -1,3 +1,8 @@

1+## Unreleased

3+* Ormolu no longer overwrites already formatted files. [PR

4+ 649](https://github.com/tweag/ormolu/pull/649).

16## Ormolu 0.1.2.0

38* Fixed the bug when comments in different styles got glued together after

README.md+1−1

@@ -22,7 +22,7 @@ the following goals in mind:

2222* That formatting style aims to result in minimal diffs while still

2323 remaining very close to “conventional” Haskell formatting people use.

2424* Choose a style compatible with modern dialects of Haskell. As new Haskell

25− extensions enter broad use, we may change the style to accomodate them.

25+ extensions enter broad use, we may change the style to accommodate them.

2626* Idempotence: formatting already formatted code doesn't change it.

2727* Be well-tested and robust to the point that it can be used in large

2828 projects without exposing unfortunate, disappointing bugs here and there.

app/Main.hs+10−6

@@ -61,15 +61,19 @@ formatOne mode config = \case

6161 -- 101 is different from all the other exit codes we already use.

6262 exitWith (ExitFailure 101)

6363 Just inputFile -> do

64− r <- ormoluFile config inputFile

64+ originalInput <- TIO.readFile inputFile

65+ formattedInput <- ormoluFile config inputFile

6566 case mode of

6667 Stdout ->

67− TIO.putStr r

68− InPlace ->

69− TIO.writeFile inputFile r

68+ TIO.putStr formattedInput

69+ InPlace -> do

70+ -- Only write when the contents have changed, in order to avoid

71+ -- updating the modified timestamp if the file was already correctly

72+ -- formatted.

73+ when (formattedInput /= originalInput) $

74+ TIO.writeFile inputFile formattedInput

7075 Check -> do

71− r' <- TIO.readFile inputFile

72− when (r /= r') $

76+ when (formattedInput /= originalInput) $

7377 -- 100 is different to all the other exit code that are emitted

7478 -- either from an 'OrmoluException' or from 'error' and

7579 -- 'notImplemented'.

default.nix+7−10

@@ -1,5 +1,6 @@

1−{ pkgs ? (import ./nix/nixpkgs)

2−, ormoluCompiler ? "ghc883" # the shell doesn't work with ghc8101 yet

1+{ pkgs ? (import ./nix/nixpkgs { inherit system; })

2+, system ? builtins.currentSystem

3+, ormoluCompiler ? "ghc884" # the shell doesn't work with ghc8101 yet

34}:

56let

@@ -16,12 +17,6 @@ let

1617 };

1718 ormoluOverlay = self: super: {

1819 "ormolu" = super.callCabal2nixWithOptions "ormolu" source "-fdev" { };

19− "ghc-lib-parser" = pkgs.haskell.lib.dontHaddock

20− (super.callHackageDirect {

21− pkg = "ghc-lib-parser";

22− ver = "8.10.1.20200412";

23− sha256 = "sha256-EjMzp8xRT3xVFKDI1fAfopkylGB0hv35Av2+uZeETRU=";

24− } {});

2520 };

2621 ormolize = import ./nix/ormolize {

2722 inherit pkgs;

@@ -33,14 +28,16 @@ let

3328 "distributed-process"

3429 "esqueleto"

3530 "fay"

31+ "hlint"

3632 "idris"

3733 "intero"

3834 "leksah"

39− "lens"

4035 "pandoc"

4136 "pipes"

37+ "postgrest"

4238 "purescript"

43− ];

39+ "tensorflow"

40+ ] ++ (if ormoluCompiler == "ghc8101" then [] else ["lens"]);

4441 ormolizedPackages = doCheck:

4542 pkgs.lib.mapAttrs (name: p: ormolize {

4643 package = p;

expected-failures/esqueleto.txt+1−1

@@ -3,5 +3,5 @@ The GHC parser (in Haddock mode) failed:

33 lexical error in string/character literal at character 's'

55The GHC parser (in Haddock mode) failed:

6− test/PostgreSQL/Test.hs:510:9-41

6+ test/PostgreSQL/Test.hs:562:9-41

77 parse error on input `-- | Check the result is not null'

expected-failures/hlint.txtnew file+11

@@ -0,0 +1,11 @@

1+Formatting is not idempotent:

2+ src/Extension.hs<rendered>:19:22

3+ before: "DoRec , -} Recursive"

4+ after: "DoRec , -}\n "

5+Please, consider reporting the bug.

7+Formatting is not idempotent:

8+ src/Hint/Bracket.hs<rendered>:249:50

9+ before: "\" x y [r]) {ideaSpan"

10+ after: "\" x y [r])\n "

11+Please, consider reporting the bug.

expected-failures/pandoc.txt+1−1

@@ -3,7 +3,7 @@ The GHC parser (in Haddock mode) failed:

33 parse error on input `import'

55Formatting is not idempotent:

6− src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:615:19

6+ src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:613:19

77 before: ".softbreak <$ endlin"

88 after: ".softbreak\n <$ en"

99Please, consider reporting the bug.

expected-failures/postgrest.txtnew file+5

@@ -0,0 +1,5 @@

1+Formatting is not idempotent:

2+ src/PostgREST/DbRequestBuilder.hs<rendered>:149:24

3+ before: " || -- clients"

4+ after: " || ( origin ="

5+Please, consider reporting the bug.

expected-failures/purescript.txt+2−2

@@ -1,10 +1,10 @@

11The GHC parser (in Haddock mode) failed:

2− src/Language/PureScript/AST/Declarations.hs:478:1-17

2+ src/Language/PureScript/AST/Declarations.hs:479:1-17

33 Invalid type signature: pattern ValueDecl :: ...

44Perhaps you meant to use PatternSynonyms?

66The GHC parser (in Haddock mode) failed:

7− src/Language/PureScript/AST/SourcePos.hs:101:1-22

7+ src/Language/PureScript/AST/SourcePos.hs:99:1-22

88 Invalid type signature: pattern NullSourceSpan :: ...

99Perhaps you meant to use PatternSynonyms?

1010

expected-failures/tensorflow.txtnew file+7

@@ -0,0 +1,7 @@

1+The GHC parser (in Haddock mode) failed:

2+ tensorflow-mnist/app/Main.hs:50:13-14

3+ parse error on input `->'

5+The GHC parser (in Haddock mode) failed:

6+ tensorflow-ops/tests/RegressionTest.hs:3:1-6

7+ parse error on input `import'

nix/nixpkgs/default.nix+7−3

@@ -1,9 +1,13 @@

1+{ system ? builtins.currentSystem }:

12let

2− rev = "807ca93fadd5197c2260490de0c76e500562dc05";

3− sha256 = "10yq8bnls77fh3pk5chkkb1sv5lbdgyk1rr2v9xn71rr1k2x563p";

3+ rev = "32b46dd897ab2143a609988a04d87452f0bbef59";

4+ sha256 = "1gzfrpjnr1bz9zljsyg3a4zrhk8r927sz761mrgcg56dwinkhpjk";

45 nixpkgs = builtins.fetchTarball {

56 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";

67 inherit sha256;

78 };

8− pkgs = import nixpkgs { config.allowUnfree = true; };

9+ pkgs = import nixpkgs {

10+ inherit system;

11+ config.allowUnfree = true;

12+ };

913in pkgs

ormolu.cabal+2−2

@@ -4,7 +4,7 @@ version: 0.1.2.0

44license: BSD3

55license-file: LICENSE.md

66maintainer: Mark Karpov <mark.karpov@tweag.io>

7−tested-with: ghc ==8.6.5 ghc ==8.8.3 ghc ==8.10.1

7+tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.1

88homepage: https://github.com/tweag/ormolu

99bug-reports: https://github.com/tweag/ormolu/issues

1010synopsis: A formatter for Haskell source code

@@ -144,7 +144,7 @@ executable ormolu

144144 base >=4.12 && <5.0,

145145 ghc-lib-parser >=8.10 && <8.11,

146146 gitrev >=1.3 && <1.4,

147− optparse-applicative >=0.14 && <0.16,

147+ optparse-applicative >=0.14 && <0.17,

148148 ormolu -any,

149149 text >=0.2 && <1.3

150150

shell.nix+3−1

@@ -1,3 +1,5 @@

1−{ pkgs ? (import ./nix/nixpkgs) }:

1+{ pkgs ? (import ./nix/nixpkgs { inherit system; })

2+, system ? builtins.currentSystem

3+}:

35(import ./default.nix { inherit pkgs; }).dev.ormoluShell