Merge pull request #1067 from alanz/bump-hlint

alanz · web-flow · commit 0a87cf1cb3a3 · 2019-01-29T16:29:32.000+02:00
Bump hlint to 2.1.14
diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml
@@ -21,7 +21,10 @@ extra-deps:
 - haddock-library-1.4.4
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
-- hsimport-0.8.6
+- 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
 - sorted-list-0.2.1.0
diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml
@@ -19,8 +19,10 @@ extra-deps:
 - haddock-library-1.6.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
-- hlint-2.1.8
-- hsimport-0.8.6
+- 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
 - syz-0.2.0.0
diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml
@@ -18,7 +18,10 @@ extra-deps:
 - haddock-library-1.6.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
-- hsimport-0.8.6
+- 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
 - syz-0.2.0.0
diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml
@@ -18,7 +18,10 @@ extra-deps:
 - haddock-library-1.6.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
-- hsimport-0.8.6
+- 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
 - pretty-show-1.9.5
diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml
@@ -20,7 +20,10 @@ extra-deps:
 - haddock-api-2.21.0
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
-- hsimport-0.8.6
+- 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
 - monoid-subclasses-0.4.6.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
-- hsimport-0.8.6
-- lsp-test-0.5.0.2
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
+- hsimport-0.8.8
 - 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
@@ -14,9 +14,13 @@ extra-deps:
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - haddock-api-2.21.0
-- hsimport-0.8.6
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hoogle-5.0.17.5
+- hsimport-0.8.8
 - 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
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2018-12-31 # GHC 8.6.3
+resolver: nightly-2019-01-28 # GHC 8.6.3
 packages:
 - .
 - hie-plugin-api
@@ -14,7 +14,10 @@ extra-deps:
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - haddock-api-2.21.0
-- hsimport-0.8.6
+- haskell-src-exts-1.21.0
+- hlint-2.1.14
+- hsimport-0.8.8
+- hoogle-5.0.17.5
 - monad-memo-0.4.1
 - multistate-0.8.0.1
 - optparse-simple-0.1.0
diff --git a/submodules/ghc-mod b/submodules/ghc-mod
@@ -1 +1 @@
-Subproject commit 4ec1283866546a4c752bcbbf1e502d04f8817f3e
+Subproject commit b20536757f34769c6fe4478f13b71a55c9ae582e
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
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings     #-}
 module ApplyRefactPluginSpec where
@@ -96,14 +97,24 @@ applyRefactSpec = do
           res = IdeResultOk
             PublishDiagnosticsParams
              { _uri = filePath
-             , _diagnostics = List $
+             , _diagnostics = List
+#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))
+               [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: virtual }\n  data instance Sing (z :: (a :~: b)) where\n      SRefl :: Sing Refl +\n> \n\n"
+                           , _relatedInformation = Nothing }]}
+#else
                [Diagnostic {_range = Range { _start = Position {_line = 11, _character = 28}
                                            , _end = Position {_line = 11, _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: :~:\n  import           Data.Type.Equality            ((:~:) (..), (:~~:) (..))\n  \n> data instance Sing (z :: (a :~: b)) where\n      SRefl :: Sing Refl +\n\n"
                            , _relatedInformation = Nothing }]}
+#endif
       testCommand testPlugins act "applyrefact" "lint" arg res
 
     -- ---------------------------------
