Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 2dc8b65

Browse files
alanzalanz
authored
Merge pull request #1588 from alanz/1587-hlint-2.2.8
Update hlint to 2.2.8 and ormolu to 0.0.3
2 parents dbbaf4d + 948e792 commit 2dc8b65

13 files changed

+39
-26
lines changed

‎cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ constraints:
1616

1717
write-ghc-environment-files: never
1818

19-
index-state: 2020-01-07T22:09:46Z
19+
index-state: 2020-01-21T18:23:31Z
2020
allow-newer: ormolu:optparse-applicative

‎haskell-ide-engine.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ library
102102
, hie-bios >= 0.3.2 && < 0.4.0
103103
, bytestring-trie
104104
, unliftio
105-
, hlint >= 2.2.2
105+
, hlint >= 2.2.8
106106
if impl(ghc >= 8.6)
107107
build-depends: ormolu
108108

‎src/Haskell/Ide/Engine/Plugin/Ormolu.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import Control.Monad.IO.Class ( liftIO , MonadIO(..) )
1212
import Data.Aeson ( Value ( Null ) )
1313
import Data.Text
1414
import Ormolu
15+
#if __GLASGOW_HASKELL__ < 808
1516
import Ormolu.Config (defaultConfig)
1617
import Ormolu.Exception (OrmoluException)
18+
#endif
1719
import Haskell.Ide.Engine.PluginUtils
1820
#endif
1921

@@ -34,7 +36,7 @@ ormoluDescriptor plId = PluginDescriptor
3436
provider :: FormattingProvider
3537
provider _contents _uri _typ _opts =
3638
#if __GLASGOW_HASKELL__ >= 806
37-
case _typ of
39+
case _typ of
3840
FormatRange _ -> return $ IdeResultFail (IdeError PluginError (pack "Selection formatting for Ormolu is not currently supported.") Null)
3941
FormatText -> pluginGetFile _contents _uri $ \file -> do
4042
result <- liftIO $ try @OrmoluException (ormolu defaultConfig file (unpack _contents))
@@ -43,4 +45,4 @@ provider _contents _uri _typ _opts =
4345
Right new -> return $ IdeResultOk [TextEdit (fullRange _contents) new]
4446
#else
4547
return $ IdeResultOk [] -- NOP formatter
46-
#endif
48+
#endif

‎stack-8.4.2.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ extra-deps:
1919
- floskell-0.10.2
2020
- ghc-exactprint-0.6.2 # for HaRe
2121
- ghc-lib-parser-8.8.1
22+
- ghc-lib-parser-ex-8.8.2
2223
- haddock-api-2.20.0
2324
- haddock-library-1.6.0
2425
- haskell-lsp-0.19.0.0
2526
- haskell-lsp-types-0.19.0.0
2627
- haskell-src-exts-1.21.1
2728
- haskell-src-exts-util-0.2.5
2829
- hie-bios-0.3.2
29-
- hlint-2.2.4
30+
- hlint-2.2.8
3031
- hoogle-5.0.17.11
3132
- hsimport-0.11.0
3233
- hslogger-1.3.1.0
@@ -46,12 +47,12 @@ extra-deps:
4647
- unordered-containers-0.2.10.0
4748
- yaml-0.11.1.2
4849
# To make build work in windows 7
50+
- time-manager-0.0.0 # for http2
4951
- unix-time-0.4.7
52+
- wai-3.2.2.1 # for network and network-bsd
53+
- warp-3.2.28 # for network and network-bsd
5054
- windns-0.1.0.0
5155
- yi-rope-0.11
52-
- time-manager-0.0.0 # for http2
53-
- warp-3.2.28 # for network and network-bsd
54-
- wai-3.2.2.1 # for network and network-bsd
5556

5657

5758
flags:

‎stack-8.4.3.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ extra-deps:
1919
- floskell-0.10.2
2020
- ghc-exactprint-0.6.2 # for HaRe
2121
- ghc-lib-parser-8.8.1
22+
- ghc-lib-parser-ex-8.8.2
2223
- haddock-api-2.20.0
2324
- haddock-library-1.6.0
2425
- haskell-lsp-0.19.0.0
2526
- haskell-lsp-types-0.19.0.0
2627
- haskell-src-exts-1.21.1
2728
- haskell-src-exts-util-0.2.5
2829
- hie-bios-0.3.2
29-
- hlint-2.2.4
30+
- hlint-2.2.8
3031
- hoogle-5.0.17.11
3132
- hsimport-0.11.0
3233
- hslogger-1.3.1.0

‎stack-8.4.4.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ extra-deps:
1818
- floskell-0.10.2
1919
- ghc-exactprint-0.6.2 # for HaRe
2020
- ghc-lib-parser-8.8.1
21+
- ghc-lib-parser-ex-8.8.2
2122
- haddock-api-2.20.0
2223
- haddock-library-1.6.0
2324
- haskell-lsp-0.19.0.0
2425
- haskell-lsp-types-0.19.0.0
2526
- haskell-src-exts-1.21.1
2627
- haskell-src-exts-util-0.2.5
2728
- hie-bios-0.3.2
28-
- hlint-2.2.4
29+
- hlint-2.2.8
2930
- hoogle-5.0.17.11
3031
- hsimport-0.11.0
3132
- hslogger-1.3.1.0

‎stack-8.6.1.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ extra-deps:
2222
- floskell-0.10.2
2323
- ghc-exactprint-0.6.2 # for HaRe
2424
- ghc-lib-parser-8.8.1
25+
- ghc-lib-parser-ex-8.8.2
2526
- haddock-api-2.21.0
2627
- haskell-lsp-0.19.0.0
2728
- haskell-lsp-types-0.19.0.0
2829
- haskell-src-exts-1.21.1
2930
- haskell-src-exts-util-0.2.5
3031
- hie-bios-0.3.2
31-
- hlint-2.2.4
32+
- hlint-2.2.8
3233
- hoogle-5.0.17.11
3334
- hsimport-0.11.0
3435
- libyaml-0.1.1.0
@@ -38,7 +39,7 @@ extra-deps:
3839
- monoid-subclasses-0.4.6.1
3940
- multistate-0.8.0.1
4041
- parser-combinators-1.2.1
41-
- ormolu-0.0.2.0
42+
- ormolu-0.0.3.0
4243
- primes-0.2.1.0
4344
- resolv-0.1.1.2
4445
- rope-utf16-splay-0.3.1.0

‎stack-8.6.2.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ extra-deps:
1818
- floskell-0.10.2
1919
- ghc-exactprint-0.6.2 # for HaRe
2020
- ghc-lib-parser-8.8.1
21+
- ghc-lib-parser-ex-8.8.2
2122
- haddock-api-2.21.0
2223
- haskell-lsp-0.19.0.0
2324
- haskell-lsp-types-0.19.0.0
2425
- haskell-src-exts-1.21.1
2526
- haskell-src-exts-util-0.2.5
2627
- hie-bios-0.3.2
27-
- hlint-2.2.4
28+
- hlint-2.2.8
2829
- hoogle-5.0.17.11
2930
- hsimport-0.11.0
3031
- libyaml-0.1.1.0
@@ -33,7 +34,7 @@ extra-deps:
3334
- monad-memo-0.4.1
3435
- multistate-0.8.0.1
3536
- parser-combinators-1.2.1
36-
- ormolu-0.0.2.0
37+
- ormolu-0.0.3.0
3738
- rope-utf16-splay-0.3.1.0
3839
- strict-list-0.1.5
3940
- syz-0.2.0.0

‎stack-8.6.3.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,23 @@ extra-deps:
1616
- floskell-0.10.2
1717
- ghc-exactprint-0.6.2 # for HaRe
1818
- ghc-lib-parser-8.8.1
19+
- ghc-lib-parser-ex-8.8.2
1920
- haddock-api-2.21.0
2021
- haskell-lsp-0.19.0.0
2122
- haskell-lsp-types-0.19.0.0
2223
- haskell-src-exts-1.21.1
2324
- haskell-src-exts-util-0.2.5
2425
- hie-bios-0.3.2
25-
- hlint-2.2.4
26+
- hlint-2.2.8
2627
- hoogle-5.0.17.11
2728
- hsimport-0.11.0
2829
- lsp-test-0.10.0.0
2930
- monad-dijkstra-0.1.1.2
3031
- monad-memo-0.4.1
3132
- multistate-0.8.0.1
3233
- optparse-simple-0.1.0
34+
- ormolu-0.0.3.0
3335
- parser-combinators-1.2.1
34-
- ormolu-0.0.2.0
3536
- rope-utf16-splay-0.3.1.0
3637
- syz-0.2.0.0
3738
- temporary-1.2.1.1

‎stack-8.6.4.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@ extra-deps:
1616
- floskell-0.10.2
1717
- ghc-exactprint-0.6.2 # for HaRe
1818
- ghc-lib-parser-8.8.1
19+
- ghc-lib-parser-ex-8.8.2
1920
- haddock-api-2.22.0
2021
- haskell-lsp-0.19.0.0
2122
- haskell-lsp-types-0.19.0.0
2223
- haskell-src-exts-1.21.1
2324
- hie-bios-0.3.2
24-
- hlint-2.2.4
25+
- hlint-2.2.8
2526
- hoogle-5.0.17.11
2627
- hsimport-0.11.0
2728
- lsp-test-0.10.0.0
2829
- monad-dijkstra-0.1.1.2@rev:1
2930
- monad-memo-0.4.1
3031
- multistate-0.8.0.1
32+
- ormolu-0.0.3.0
3133
- parser-combinators-1.2.1
32-
- ormolu-0.0.2.0
3334
- rope-utf16-splay-0.3.1.0
3435
- syz-0.2.0.0
3536
- temporary-1.2.1.1

‎stack-8.6.5.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ extra-deps:
1717
- floskell-0.10.2
1818
- ghc-exactprint-0.6.2 # for HaRe
1919
- ghc-lib-parser-8.8.1
20+
- ghc-lib-parser-ex-8.8.2
2021
- haddock-api-2.22.0
2122
- haskell-lsp-0.19.0.0
2223
- haskell-lsp-types-0.19.0.0
2324
- hie-bios-0.3.2
24-
- hlint-2.2.4
25+
- hlint-2.2.8
2526
- hoogle-5.0.17.11
2627
- hsimport-0.11.0
2728
- lsp-test-0.10.0.0
2829
- monad-dijkstra-0.1.1.2@rev:1
30+
- ormolu-0.0.3.0
2931
- parser-combinators-1.2.1
30-
- ormolu-0.0.2.0
3132
- syz-0.2.0.0
3233
- temporary-1.2.1.1
3334

‎stack-8.8.1.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,20 @@ extra-deps:
1212
- clock-0.7.2
1313
- constrained-dynamic-0.1.0.0
1414
- floskell-0.10.2
15+
- ghc-lib-parser-ex-8.8.2
1516
- haddock-api-2.23.0
1617
- haddock-library-1.8.0
18+
- haskell-src-exts-1.21.1
1719
- hie-bios-0.3.2
20+
- hlint-2.2.8
1821
- hoogle-5.0.17.11
1922
- hsimport-0.11.0
20-
- semigroups-0.18.5
21-
- temporary-1.2.1.1
22-
- haskell-src-exts-1.21.1
2323
- ilist-0.3.1.0
2424
- monad-dijkstra-0.1.1.2
25-
- ormolu-0.0.3.0
2625
- optparse-applicative-0.15.1.0
26+
- ormolu-0.0.3.0
27+
- semigroups-0.18.5
28+
- temporary-1.2.1.1
2729

2830
flags:
2931
haskell-ide-engine:

‎stack.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ extra-deps:
1919
- floskell-0.10.2
2020
- ghc-exactprint-0.6.2 # for HaRe
2121
- ghc-lib-parser-8.8.1
22+
- ghc-lib-parser-ex-8.8.2
2223
- haddock-api-2.22.0
2324
- haskell-lsp-0.19.0.0
2425
- haskell-lsp-types-0.19.0.0
2526
- hie-bios-0.3.2
26-
- hlint-2.2.4
27+
- hlint-2.2.8
2728
- hsimport-0.11.0
2829
- lsp-test-0.10.0.0
2930
- monad-dijkstra-0.1.1.2@rev:1
3031
- parser-combinators-1.2.1
31-
- ormolu-0.0.2.0
32+
- ormolu-0.0.3.0
3233
- syz-0.2.0.0
3334
- temporary-1.2.1.1
3435
- unix-compat-0.5.2

0 commit comments

Comments
 (0)