Skip to content

Commit 2f0fa18

Browse files
authored
Merge branch 'master' into refactor-pragmas
2 parents c728684 + 9d21805 commit 2f0fa18

File tree

5 files changed

+17
-140
lines changed

5 files changed

+17
-140
lines changed

.stylish-haskell.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,22 @@ columns: 80
5656
newline: native
5757

5858
language_extensions:
59+
- BangPatterns
5960
- DataKinds
61+
- DeriveFunctor
62+
- DeriveGeneric
63+
- FlexibleContexts
64+
- GeneralizedNewtypeDeriving
65+
- KindSignatures
66+
- LambdaCase
67+
- NamedFieldPuns
6068
- OverloadedStrings
69+
- RecordWildCards
70+
- ScopedTypeVariables
71+
- StandaloneDeriving
72+
- TupleSections
73+
- TypeApplications
6174
- TypeOperators
75+
- ViewPatterns
6276

6377
cabal: true

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ If you don't want to use [nix](https://nixos.org/guides/install-nix.html), you c
1717
{
1818
"hooks": [
1919
{
20-
"entry": "stylish-haskell -i ",
21-
"exclude": "(/test/testdata/*)",
20+
"entry": "stylish-haskell --inplace",
21+
"exclude": "(test/testdata/.*|hie-compat/.*)",
2222
"files": "\\.l?hs$",
2323
"id": "stylish-haskell",
2424
"language": "system",

ghcide/.stylish-haskell.yaml

Lines changed: 0 additions & 74 deletions
This file was deleted.

hls-plugin-api/.stylish-haskell.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

nix/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ in (import sources.nixpkgs
5454
# default_stages = ["manual" "push"];
5555
hooks = {
5656
stylish-haskell.enable = true;
57-
stylish-haskell.excludes = [ "/test/testdata/*" "/hie-compat/*" ];
57+
stylish-haskell.excludes = [ "test/testdata/.*" "hie-compat/.*" ];
5858
};
5959
};
6060
}

0 commit comments

Comments
 (0)