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

Commit 6564a66

Browse files
alanzalanz
committed
Update to hlint 2.1.14 for all barGHC 8.2.1
1 parent f02fcb7 commit 6564a66

11 files changed

+40
-25
lines changed

‎haskell-ide-engine.cabal

+1-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ library
7171
, haskell-lsp >= 0.8
7272
, haskell-src-exts
7373
, hie-plugin-api
74-
-- , hlint >= 2.0.11
75-
, hlint >= 2.1.13
74+
, hlint >= 2.0.11
7675
, hoogle >= 5.0.13
7776
, hsimport
7877
, hslogger

‎stack-8.2.2.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ extra-deps:
2121
- haddock-library-1.4.4
2222
- haskell-lsp-0.8.0.1
2323
- haskell-lsp-types-0.8.0.1
24+
- haskell-src-exts-1.21.0
25+
- hlint-2.1.14
26+
- hoogle-5.0.17.5
2427
- hsimport-0.8.8
2528
- lsp-test-0.5.0.2
2629
- pretty-show-1.8.2

‎stack-8.4.2.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ extra-deps:
1919
- haddock-library-1.6.0
2020
- haskell-lsp-0.8.0.1
2121
- haskell-lsp-types-0.8.0.1
22-
- hlint-2.1.13
22+
- haskell-src-exts-1.21.0
23+
- hlint-2.1.14
24+
- hoogle-5.0.17.5
2325
- hsimport-0.8.8
2426
- lsp-test-0.5.0.2
2527
- pretty-show-1.8.2

‎stack-8.4.3.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ extra-deps:
1818
- haddock-library-1.6.0
1919
- haskell-lsp-0.8.0.1
2020
- haskell-lsp-types-0.8.0.1
21+
- haskell-src-exts-1.21.0
22+
- hlint-2.1.14
23+
- hoogle-5.0.17.5
2124
- hsimport-0.8.8
2225
- lsp-test-0.5.0.2
2326
- pretty-show-1.8.2

‎stack-8.4.4.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ extra-deps:
1818
- haddock-library-1.6.0
1919
- haskell-lsp-0.8.0.1
2020
- haskell-lsp-types-0.8.0.1
21+
- haskell-src-exts-1.21.0
22+
- hlint-2.1.14
23+
- hoogle-5.0.17.5
2124
- hsimport-0.8.8
2225
- lsp-test-0.5.0.2
2326
- optparse-simple-0.1.0

‎stack-8.6.1.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ extra-deps:
2020
- haddock-api-2.21.0
2121
- haskell-lsp-0.8.0.1
2222
- haskell-lsp-types-0.8.0.1
23+
- haskell-src-exts-1.21.0
24+
- hlint-2.1.14
25+
- hoogle-5.0.17.5
2326
- hsimport-0.8.8
2427
- lsp-test-0.5.0.2
2528
- monad-memo-0.4.1

‎stack-8.6.2.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ extra-deps:
1414
- cabal-plan-0.4.0.0
1515
- constrained-dynamic-0.1.0.0
1616
- haddock-api-2.21.0
17+
- haskell-src-exts-1.21.0
18+
- hlint-2.1.14
19+
- hoogle-5.0.17.5
1720
- hsimport-0.8.8
18-
- lsp-test-0.5.0.2
1921
- monad-memo-0.4.1
2022
- multistate-0.8.0.1
2123
- syz-0.2.0.0

‎stack-8.6.3.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-13.0
1+
resolver: lts-13.5
22
packages:
33
- .
44
- hie-plugin-api
@@ -10,20 +10,20 @@ extra-deps:
1010
- ./submodules/ghc-mod
1111
- ./submodules/ghc-mod/core
1212

13-
- hlint-2.1.13
13+
- butcher-1.3.2.1
14+
- cabal-plan-0.4.0.0
15+
- constrained-dynamic-0.1.0.0
16+
- haddock-api-2.21.0
17+
- haskell-src-exts-1.21.0
18+
- hlint-2.1.14
19+
- hoogle-5.0.17.5
1420
- hsimport-0.8.8
15-
16-
# - haskell-src-exts-1.21.0
17-
# - monad-memo-0.4.1
18-
# - multistate-0.8.0.1
19-
# - syz-0.2.0.0
20-
# - temporary-1.2.1.1
21-
# - yaml-0.8.32
22-
23-
####################################
24-
25-
####################################
26-
21+
- monad-memo-0.4.1
22+
- multistate-0.8.0.1
23+
- optparse-simple-0.1.0
24+
- syz-0.2.0.0
25+
- temporary-1.2.1.1
26+
- yaml-0.8.32
2727

2828
flags:
2929
haskell-ide-engine:

‎stack.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2019-01-27 # GHC 8.6.3
1+
resolver: nightly-2019-01-28 # GHC 8.6.3
22
packages:
33
- .
44
- hie-plugin-api
@@ -15,7 +15,7 @@ extra-deps:
1515
- constrained-dynamic-0.1.0.0
1616
- haddock-api-2.21.0
1717
- haskell-src-exts-1.21.0
18-
- hlint-2.1.13
18+
- hlint-2.1.14
1919
- hsimport-0.8.8
2020
- hoogle-5.0.17.5
2121
- monad-memo-0.4.1

‎test/testdata/HlintParseFail.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ import Data.Singletons.TypeLits
1010
import Data.Type.Equality ((:~:) (..), (:~~:) (..))
1111

1212
data instance Sing (z :: (a :~: b)) where
13-
SRefl :: Sing Refl
13+
SRefl :: Sing Refl +

‎test/unit/ApplyRefactPluginSpec.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ applyRefactSpec = do
9696
res = IdeResultOk
9797
PublishDiagnosticsParams
9898
{ _uri = filePath
99-
, _diagnostics = List $
100-
[Diagnostic {_range = Range { _start = Position {_line = 11, _character = 28}
101-
, _end = Position {_line = 11, _character = 100000}}
99+
, _diagnostics = List
100+
[Diagnostic {_range = Range { _start = Position {_line = 13, _character = 0}
101+
, _end = Position {_line = 13, _character = 100000}}
102102
, _severity = Just DsInfo
103103
, _code = Just "parser"
104104
, _source = Just "hlint"
105-
, _message = "Parse error: :~:\n import Data.Type.Equality ((:~:) (..), (:~~:) (..))\n \n> data instance Sing (z :: (a :~: b)) where\n SRefl :: Sing Refl\n\n"
105+
, _message = "Parse error: virtual }\n data instance Sing (z :: (a :~: b)) where\n SRefl :: Sing Refl +\n> \n\n"
106106
, _relatedInformation = Nothing }]}
107107
testCommand testPlugins act "applyrefact" "lint" arg res
108108

0 commit comments

Comments
 (0)