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

Commit 0a87cf1

Browse files
alanzalanz
authored
Merge pull request #1067 from alanz/bump-hlint
Bump hlint to 2.1.14
2 parents fc7c220 + 26d370c commit 0a87cf1

11 files changed

+50
-16
lines changed

‎stack-8.2.2.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ extra-deps:
2121
- haddock-library-1.4.4
2222
- haskell-lsp-0.8.0.1
2323
- haskell-lsp-types-0.8.0.1
24-
- hsimport-0.8.6
24+
- haskell-src-exts-1.21.0
25+
- hlint-2.1.14
26+
- hoogle-5.0.17.5
27+
- hsimport-0.8.8
2528
- lsp-test-0.5.0.2
2629
- pretty-show-1.8.2
2730
- sorted-list-0.2.1.0

‎stack-8.4.2.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ 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.8
23-
- hsimport-0.8.6
22+
- haskell-src-exts-1.21.0
23+
- hlint-2.1.14
24+
- hoogle-5.0.17.5
25+
- hsimport-0.8.8
2426
- lsp-test-0.5.0.2
2527
- pretty-show-1.8.2
2628
- syz-0.2.0.0

‎stack-8.4.3.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ extra-deps:
1818
- haddock-library-1.6.0
1919
- haskell-lsp-0.8.0.1
2020
- haskell-lsp-types-0.8.0.1
21-
- hsimport-0.8.6
21+
- haskell-src-exts-1.21.0
22+
- hlint-2.1.14
23+
- hoogle-5.0.17.5
24+
- hsimport-0.8.8
2225
- lsp-test-0.5.0.2
2326
- pretty-show-1.8.2
2427
- syz-0.2.0.0

‎stack-8.4.4.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ extra-deps:
1818
- haddock-library-1.6.0
1919
- haskell-lsp-0.8.0.1
2020
- haskell-lsp-types-0.8.0.1
21-
- hsimport-0.8.6
21+
- haskell-src-exts-1.21.0
22+
- hlint-2.1.14
23+
- hoogle-5.0.17.5
24+
- hsimport-0.8.8
2225
- lsp-test-0.5.0.2
2326
- optparse-simple-0.1.0
2427
- pretty-show-1.9.5

‎stack-8.6.1.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ extra-deps:
2020
- haddock-api-2.21.0
2121
- haskell-lsp-0.8.0.1
2222
- haskell-lsp-types-0.8.0.1
23-
- hsimport-0.8.6
23+
- haskell-src-exts-1.21.0
24+
- hlint-2.1.14
25+
- hoogle-5.0.17.5
26+
- hsimport-0.8.8
2427
- lsp-test-0.5.0.2
2528
- monad-memo-0.4.1
2629
- monoid-subclasses-0.4.6.1

‎stack-8.6.2.yaml

+4-2
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-
- hsimport-0.8.6
18-
- lsp-test-0.5.0.2
17+
- haskell-src-exts-1.21.0
18+
- hlint-2.1.14
19+
- hoogle-5.0.17.5
20+
- hsimport-0.8.8
1921
- monad-memo-0.4.1
2022
- multistate-0.8.0.1
2123
- syz-0.2.0.0

‎stack-8.6.3.yaml

+6-2
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
@@ -14,9 +14,13 @@ extra-deps:
1414
- cabal-plan-0.4.0.0
1515
- constrained-dynamic-0.1.0.0
1616
- haddock-api-2.21.0
17-
- hsimport-0.8.6
17+
- haskell-src-exts-1.21.0
18+
- hlint-2.1.14
19+
- hoogle-5.0.17.5
20+
- hsimport-0.8.8
1821
- monad-memo-0.4.1
1922
- multistate-0.8.0.1
23+
- optparse-simple-0.1.0
2024
- syz-0.2.0.0
2125
- temporary-1.2.1.1
2226
- yaml-0.8.32

‎stack.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2018-12-31 # GHC 8.6.3
1+
resolver: nightly-2019-01-28 # GHC 8.6.3
22
packages:
33
- .
44
- hie-plugin-api
@@ -14,7 +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-
- hsimport-0.8.6
17+
- haskell-src-exts-1.21.0
18+
- hlint-2.1.14
19+
- hsimport-0.8.8
20+
- hoogle-5.0.17.5
1821
- monad-memo-0.4.1
1922
- multistate-0.8.0.1
2023
- optparse-simple-0.1.0

‎submodules/ghc-mod

‎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

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DuplicateRecordFields #-}
23
{-# LANGUAGE OverloadedStrings #-}
34
module ApplyRefactPluginSpec where
@@ -96,14 +97,24 @@ applyRefactSpec = do
9697
res = IdeResultOk
9798
PublishDiagnosticsParams
9899
{ _uri = filePath
99-
, _diagnostics = List $
100+
, _diagnostics = List
101+
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))
102+
[Diagnostic {_range = Range { _start = Position {_line = 13, _character = 0}
103+
, _end = Position {_line = 13, _character = 100000}}
104+
, _severity = Just DsInfo
105+
, _code = Just "parser"
106+
, _source = Just "hlint"
107+
, _message = "Parse error: virtual }\n data instance Sing (z :: (a :~: b)) where\n SRefl :: Sing Refl +\n> \n\n"
108+
, _relatedInformation = Nothing }]}
109+
#else
100110
[Diagnostic {_range = Range { _start = Position {_line = 11, _character = 28}
101111
, _end = Position {_line = 11, _character = 100000}}
102112
, _severity = Just DsInfo
103113
, _code = Just "parser"
104114
, _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"
115+
, _message = "Parse error: :~:\n import Data.Type.Equality ((:~:) (..), (:~~:) (..))\n \n> data instance Sing (z :: (a :~: b)) where\n SRefl :: Sing Refl +\n\n"
106116
, _relatedInformation = Nothing }]}
117+
#endif
107118
testCommand testPlugins act "applyrefact" "lint" arg res
108119

109120
-- ---------------------------------

0 commit comments

Comments
 (0)