haskell · alanz · May 26, 2019 · May 14, 2019 · May 15, 2019 · May 17, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,11 +40,14 @@ defaults: &defaults
 
     - run:
         name: Build (we need the exe for tests)
-        command: stack -j 2 --stack-yaml=${STACK_FILE} install
+        command: stack -j 1 --stack-yaml=${STACK_FILE} install
+                       # need j1, else ghc-lib-parser triggers OOM
+        no_output_timeout: 30m
 
     - run:
         name: Build Testsuite without running it
         command: stack -j 2 --stack-yaml=${STACK_FILE}  build --test --no-run-tests
+        no_output_timeout: 30m
 
     - store_artifacts:
         path: ~/.local/bin
@@ -157,8 +160,7 @@ jobs:
   cabal:
     working_directory: ~/build
     docker:
-      # - image: quay.io/haskell_works/ghc-8.4.3
-      - image: quay.io/haskell_works/ghc-8.6.1
+      - image: quay.io/haskell_works/ghc-8.6.5
     steps:
       - checkout
       - run:
@@ -181,7 +183,8 @@ jobs:
           command: cabal new-configure --enable-tests
       - run:
           name: Build
-          command: cabal new-build -j2
+          command: cabal new-build -j1 # need j1, else ghc-lib-parser triggers OOM
+          no_output_timeout: 30m
       - save_cache:
           key: cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
           paths:

diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal
@@ -74,7 +74,7 @@ library
                      , haskell-lsp-types == 0.13.*
                      , haskell-src-exts
                      , hie-plugin-api
-                     , hlint >= 2.0.11 && < 2.1.18
+                     , hlint (>= 2.0.11 && < 2.1.18) || >= 2.1.22
                      , hoogle >= 5.0.13
                      , hsimport
                      , hslogger

diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml
@@ -25,7 +25,7 @@ extra-deps:
 - haskell-lsp-types-0.13.0.0@rev:2
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.17 # last hlint supporting GHC 8.2
 - hoogle-5.0.17.6
 - hsimport-0.8.8
 - lsp-test-0.5.2.3

diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml
@@ -17,13 +17,14 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
+- ghc-lib-parser-0.20190523
 - haddock-api-2.20.0
 - haddock-library-1.6.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0@rev:2
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml
@@ -16,13 +16,14 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
+- ghc-lib-parser-0.20190523
 - haddock-api-2.20.0
 - haddock-library-1.6.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0@rev:2
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml
@@ -16,13 +16,14 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
+- ghc-lib-parser-0.20190523
 - haddock-api-2.20.0
 - haddock-library-1.6.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml
@@ -19,12 +19,13 @@ extra-deps:
 - czipwith-1.0.1.1
 - data-tree-print-0.1.0.2
 - floskell-0.10.0
+- ghc-lib-parser-0.20190523
 - haddock-api-2.21.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml
@@ -15,12 +15,13 @@ extra-deps:
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
+- ghc-lib-parser-0.20190523
 - haddock-api-2.21.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml
@@ -15,12 +15,13 @@ extra-deps:
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
+- ghc-lib-parser-0.20190523
 - haddock-api-2.21.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -15,11 +15,12 @@ extra-deps:
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
+- ghc-lib-parser-0.20190523
 - haddock-api-2.22.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
 - haskell-src-exts-1.21.0
-- hlint-2.1.17
+- hlint-2.1.22
 - hoogle-5.0.17.6
 - hsimport-0.10.0
 - lsp-test-0.5.2.3

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -18,10 +18,11 @@ extra-deps:
 - deque-0.2.7
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
+- ghc-lib-parser-0.20190523
 - haddock-api-2.22.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
-- hlint-2.1.17
+- hlint-2.1.22
 - hsimport-0.10.0
 - lsp-test-0.5.2.3
 - monad-dijkstra-0.1.1.2@rev:1

diff --git a/stack.yaml b/stack.yaml
@@ -18,10 +18,11 @@ extra-deps:
 - deque-0.2.7
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
+- ghc-lib-parser-0.20190523
 - haddock-api-2.22.0
 - haskell-lsp-0.13.0.0
 - haskell-lsp-types-0.13.0.0
-- hlint-2.1.17
+- hlint-2.1.22
 - hsimport-0.10.0
 - lsp-test-0.5.2.3
 - monad-dijkstra-0.1.1.2@rev:1

diff --git a/test/unit/ApplyRefactPluginSpec.hs b/test/unit/ApplyRefactPluginSpec.hs
@@ -90,15 +90,24 @@ applyRefactSpec = do
     -- ---------------------------------
 
     it "returns hlint parse error as DsInfo ignored diagnostic" $ do
-      filePath  <- filePathToUri <$> makeAbsolute "./test/testdata/HlintParseFail.hs"
+      filePathNoUri  <- makeAbsolute "./test/testdata/HlintParseFail.hs"
+      let filePath = filePathToUri filePathNoUri
 
       let act = lintCmd' arg
           arg = filePath
           res = IdeResultOk
             PublishDiagnosticsParams
              { _uri = filePath
              , _diagnostics = List
-#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))
+#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,0,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 = T.pack filePathNoUri <> ":13:24: error:\n    Operator applied to too few arguments: +\n  data instance Sing (z :: (a :~: b)) where\n      SRefl :: Sing Refl +\n> \n\n"
+                           , _relatedInformation = Nothing }]}
+#elif (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