Skip to content

Commit

Permalink
Format with fourmolu-0.12.0.0, Use GHC2021
Browse files Browse the repository at this point in the history
  • Loading branch information
jhrcek committed Sep 2, 2023
1 parent 3bad009 commit d4d792e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ script=dist/main.js

.PHONY: format
format:
git ls-files '*.hs' | xargs fourmolu -i
git ls-files '*.hs' | xargs fourmolu -i --unsafe
cabal-fmt --inplace fundeps.cabal

.PHONY: client
Expand Down
13 changes: 11 additions & 2 deletions fourmolu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@ indentation: 4
comma-style: leading # for lists, tuples etc. - can also be 'trailing'
record-brace-space: false # rec {x = 1} vs. rec{x = 1}
indent-wheres: false # 'false' means save space by only half-indenting the 'where' keyword
diff-friendly-import-export: false # 'false' uses Ormolu-style lists
respectful: true # don't be too opinionated about newlines etc.
haddock-style: multi-line # '--' vs. '{-'
haddock-style-module: multi-line
newlines-between-decls: 2 # number of newlines between top-level declarations
import-export-comma-style: leading
import-export-style: leading
let-style: auto
in-style: right-align
fixities:
- infixl 5 .= # both in tomland (fixyty 5) and aeson (fixity 8)
unicode: never
column-limit: none # Disclaimer: enabling column-limit breaks idempotence in a few cases.
function-arrows: trailing
single-constraint-parens: never

2 changes: 1 addition & 1 deletion fundeps-hs/Main.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Main (main) where

import qualified FunDeps
import FunDeps qualified


main :: IO ()
Expand Down
5 changes: 2 additions & 3 deletions fundeps.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ description:
category: Web
build-type: Simple
extra-source-files: README.md
tested-with: GHC ==8.10.3
tested-with: GHC ==9.2.8

source-repository head
type: git
Expand All @@ -30,8 +30,7 @@ flag WithJS

common common-options
build-depends: base >=4.7 && <5
default-language: Haskell2010
default-extensions: ImportQualifiedPost
default-language: GHC2021
ghc-options:
-fwrite-ide-info -hiedir=hie -Wall -Wcompat -Widentities
-Wincomplete-record-updates -Wincomplete-uni-patterns
Expand Down
2 changes: 1 addition & 1 deletion fundeps/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module Main (main) where

import qualified FunDeps
import FunDeps qualified
import Turtle


Expand Down
1 change: 1 addition & 0 deletions src/FunDeps/Server.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeOperators #-}

#ifdef WithJS
{-# LANGUAGE TemplateHaskell #-}
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/Spec.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import qualified TUI.CommandsSpec
import TUI.CommandsSpec qualified
import Test.Hspec


Expand Down
2 changes: 1 addition & 1 deletion test/TUI/CommandsSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module TUI.CommandsSpec (spec) where

import Data.Declaration
import qualified Data.GraphViz.Commands as Gv
import Data.GraphViz.Commands qualified as Gv
import TUI.Commands (Command (..), CommandParseError (..), QueryItem (..), parseCommand)
import Test.Hspec

Expand Down

0 comments on commit d4d792e

Please sign in to comment.