From efca8f827003c2cc6c9f4e6f2413fefcb59fa10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Thu, 25 May 2017 03:26:33 +0200
Subject: [PATCH] Bump dependency on HLint to 2.*

---
 ghc-mod.cabal           |  2 +-
 test/FileMappingSpec.hs | 13 +++++++++----
 test/LintSpec.hs        |  8 ++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index fbe6ef6..215cccc 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -190,7 +190,7 @@ Library
                       , ghc-paths            < 0.2  && >= 0.1.0.9
                       , ghc-syb-utils        < 0.3  && >= 0.2.3
                       , haskell-src-exts     < 1.20 && >= 1.18
-                      , hlint                < 1.10 && >= 1.9.27
+                      , hlint                < 2.1  && >= 2.0.8
                       , monad-control        < 1.1  && >= 1
                       , monad-journal        < 0.8  && >= 0.4
                       , optparse-applicative == 0.13.0.*
diff --git a/test/FileMappingSpec.hs b/test/FileMappingSpec.hs
index 3ed1a2c..5b50e6c 100644
--- a/test/FileMappingSpec.hs
+++ b/test/FileMappingSpec.hs
@@ -122,13 +122,13 @@ spec = do
           withDirectory_ "test/data/file-mapping" $ do
             res <- runD $ do
               loadMappedFile "File.hs" "File_Redir_Lint.hs"
-              lint defaultLintOpts "File.hs"
+              lint lintOpts "File.hs"
             res `shouldBe` "File.hs:4:1: Warning: Eta reduce\NULFound:\NUL  func a b = (*) a b\NULWhy not:\NUL  func = (*)\n"
         it "lints in-memory file if one is specified and outputs original filename" $ do
           withDirectory_ "test/data/file-mapping" $ do
             res <- runD $ do
               loadMappedFileSource "File.hs" "func a b = (++) a b\n"
-              lint defaultLintOpts "File.hs"
+              lint lintOpts "File.hs"
             res `shouldBe` "File.hs:1:1: Warning: Eta reduce\NULFound:\NUL  func a b = (++) a b\NULWhy not:\NUL  func = (++)\n"
         it "shows types of the expression for redirected files" $ do
             let tdir = "test/data/file-mapping"
@@ -189,14 +189,14 @@ spec = do
           withDirectory_ "test/data/file-mapping/preprocessor" $ do
             res <- runD $ do
               loadMappedFile "File.hs" "File_Redir_Lint.hs"
-              lint defaultLintOpts "File.hs"
+              lint lintOpts "File.hs"
             res `shouldBe` "File.hs:6:1: Warning: Eta reduce\NULFound:\NUL  func a b = (*) a b\NULWhy not:\NUL  func = (*)\n"
         it "lints in-memory file if one is specified and outputs original filename" $ do
           withDirectory_ "test/data/file-mapping/preprocessor" $ do
             src <- readFile "File_Redir_Lint.hs"
             res <- runD $ do
               loadMappedFileSource "File.hs" src
-              lint defaultLintOpts "File.hs"
+              lint lintOpts "File.hs"
             res `shouldBe` "File.hs:6:1: Warning: Eta reduce\NULFound:\NUL  func a b = (*) a b\NULWhy not:\NUL  func = (*)\n"
       describe "literate haskell tests" $ do
         it "checks redirected file if one is specified and outputs original filename" $ do
@@ -252,3 +252,8 @@ spec = do
               mapM_ (uncurry loadMappedFileSource) fm
               types False "Bar.hs" 5 1
             res `shouldBe` unlines ["5 1 5 20 \"[Char]\""]
+
+
+lintOpts :: LintOpts
+lintOpts =
+    defaultLintOpts { optLintHlintOpts = ["--ignore=Use module export list"] }
diff --git a/test/LintSpec.hs b/test/LintSpec.hs
index c2b67fa..b30055b 100644
--- a/test/LintSpec.hs
+++ b/test/LintSpec.hs
@@ -8,10 +8,14 @@ spec :: Spec
 spec = do
     describe "lint" $ do
         it "can detect a redundant import" $ do
-            res <- runD $ lint defaultLintOpts "test/data/hlint/hlint.hs"
+            res <- runD $ lint lintOpts "test/data/hlint/hlint.hs"
             res `shouldBe` "test/data/hlint/hlint.hs:4:8: Warning: Redundant do\NULFound:\NUL  do putStrLn \"Hello, world!\"\NULWhy not:\NUL  putStrLn \"Hello, world!\"\n"
 
         context "when no suggestions are given" $ do
             it "doesn't output an empty line" $ do
-                res <- runD $ lint defaultLintOpts "test/data/ghc-mod-check/lib/Data/Foo.hs"
+                res <- runD $ lint lintOpts "test/data/ghc-mod-check/lib/Data/Foo.hs"
                 res `shouldBe` ""
+
+lintOpts :: LintOpts
+lintOpts =
+    defaultLintOpts { optLintHlintOpts = ["--ignore=Use module export list"] }