Update to hlint 2.1.14 for all barGHC 8.2.1

alanz · alanz · commit 6564a6699c81 · 2019-01-28T22:17:40.000+02:00
diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal
@@ -71,8 +71,7 @@ library
                      , haskell-lsp >= 0.8
                      , haskell-src-exts
                      , hie-plugin-api
-                     -- , hlint >= 2.0.11
-                     , hlint >= 2.1.13
+                     , hlint >= 2.0.11
                      , hoogle >= 5.0.13
                      , hsimport
                      , hslogger
diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml
@@ -21,6 +21,9 @@ extra-deps:
 - haddock-library-1.4.4
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
 - lsp-test-0.5.0.2
 - pretty-show-1.8.2
diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml
@@ -19,7 +19,9 @@ extra-deps:
 - haddock-library-1.6.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
-- hlint-2.1.13
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
 - lsp-test-0.5.0.2
 - pretty-show-1.8.2
diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml
@@ -18,6 +18,9 @@ extra-deps:
 - haddock-library-1.6.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
 - lsp-test-0.5.0.2
 - pretty-show-1.8.2
diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml
@@ -18,6 +18,9 @@ extra-deps:
 - haddock-library-1.6.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
 - lsp-test-0.5.0.2
 - optparse-simple-0.1.0
diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml
@@ -20,6 +20,9 @@ extra-deps:
 - haddock-api-2.21.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
 - lsp-test-0.5.0.2
 - monad-memo-0.4.1
diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml
@@ -14,8 +14,10 @@ extra-deps:
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - haddock-api-2.21.0
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
-- lsp-test-0.5.0.2
 - monad-memo-0.4.1
 - multistate-0.8.0.1
 - syz-0.2.0.0
diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml
@@ -1,4 +1,4 @@
-resolver: lts-13.0
+resolver: lts-13.5
 packages:
 - .
 - hie-plugin-api
@@ -10,20 +10,20 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 
-- hlint-2.1.13
+- butcher-1.3.2.1
+- cabal-plan-0.4.0.0
+- constrained-dynamic-0.1.0.0
+- haddock-api-2.21.0
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
 - hsimport-0.8.8
-
-# - haskell-src-exts-1.21.0
-# - monad-memo-0.4.1
-# - multistate-0.8.0.1
-# - syz-0.2.0.0
-# - temporary-1.2.1.1
-# - yaml-0.8.32
-
-####################################
-
-####################################
-
+- monad-memo-0.4.1
+- multistate-0.8.0.1
+- optparse-simple-0.1.0
+- syz-0.2.0.0
+- temporary-1.2.1.1
+- yaml-0.8.32
 
 flags:
   haskell-ide-engine:
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2019-01-27 # GHC 8.6.3
+resolver: nightly-2019-01-28 # GHC 8.6.3
 packages:
 - .
 - hie-plugin-api
@@ -15,7 +15,7 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - haddock-api-2.21.0
 - haskell-src-exts-1.21.0
-- hlint-2.1.13
+- hlint-2.1.14
 - hsimport-0.8.8
 - hoogle-5.0.17.5
 - monad-memo-0.4.1
diff --git a/test/testdata/HlintParseFail.hs b/test/testdata/HlintParseFail.hs
@@ -10,4 +10,4 @@ import           Data.Singletons.TypeLits
 import           Data.Type.Equality            ((:~:) (..), (:~~:) (..))
 
 data instance Sing (z :: (a :~: b)) where
-    SRefl :: Sing Refl
+    SRefl :: Sing Refl +
diff --git a/test/unit/ApplyRefactPluginSpec.hs b/test/unit/ApplyRefactPluginSpec.hs
@@ -96,13 +96,13 @@ applyRefactSpec = do
           res = IdeResultOk
             PublishDiagnosticsParams
              { _uri = filePath
-             , _diagnostics = List $
-               [Diagnostic {_range = Range { _start = Position {_line = 11, _character = 28}
-                                           , _end = Position {_line = 11, _character = 100000}}
+             , _diagnostics = List
+               [Diagnostic {_range = Range { _start = Position {_line = 13, _character = 0}
+                                           , _end = Position {_line = 13, _character = 100000}}
                            , _severity = Just DsInfo
                            , _code = Just "parser"
                            , _source = Just "hlint"
-                           , _message = "Parse error: :~:\n  import           Data.Type.Equality            ((:~:) (..), (:~~:) (..))\n  \n> data instance Sing (z :: (a :~: b)) where\n      SRefl :: Sing Refl\n\n"
+                           , _message = "Parse error: virtual }\n  data instance Sing (z :: (a :~: b)) where\n      SRefl :: Sing Refl +\n> \n\n"
                            , _relatedInformation = Nothing }]}
       testCommand testPlugins act "applyrefact" "lint" arg res
 
