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

Commit fa58b5c

Browse files
alanzalanz
authored
Merge pull request #1270 from alanz/hlint-2.1.19
Hlint 2.1.22
2 parents b56ea38 + 39de415 commit fa58b5c

13 files changed

+38
-17
lines changed

‎.circleci/config.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ defaults: &defaults
4040

4141
- run:
4242
name: Build (we need the exe for tests)
43-
command: stack -j 2 --stack-yaml=${STACK_FILE} install
43+
command: stack -j 1 --stack-yaml=${STACK_FILE} install
44+
# need j1, else ghc-lib-parser triggers OOM
45+
no_output_timeout: 30m
4446

4547
- run:
4648
name: Build Testsuite without running it
4749
command: stack -j 2 --stack-yaml=${STACK_FILE} build --test --no-run-tests
50+
no_output_timeout: 30m
4851

4952
- store_artifacts:
5053
path: ~/.local/bin
@@ -157,8 +160,7 @@ jobs:
157160
cabal:
158161
working_directory: ~/build
159162
docker:
160-
# - image: quay.io/haskell_works/ghc-8.4.3
161-
- image: quay.io/haskell_works/ghc-8.6.1
163+
- image: quay.io/haskell_works/ghc-8.6.5
162164
steps:
163165
- checkout
164166
- run:
@@ -181,7 +183,8 @@ jobs:
181183
command: cabal new-configure --enable-tests
182184
- run:
183185
name: Build
184-
command: cabal new-build -j2
186+
command: cabal new-build -j1 # need j1, else ghc-lib-parser triggers OOM
187+
no_output_timeout: 30m
185188
- save_cache:
186189
key: cabal-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
187190
paths:

‎haskell-ide-engine.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ library
7474
, haskell-lsp-types == 0.13.*
7575
, haskell-src-exts
7676
, hie-plugin-api
77-
, hlint >= 2.0.11 && < 2.1.18
77+
, hlint (>= 2.0.11 && < 2.1.18) || >= 2.1.22
7878
, hoogle >= 5.0.13
7979
, hsimport
8080
, hslogger

‎stack-8.2.2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extra-deps:
2525
- haskell-lsp-types-0.13.0.0@rev:2
2626
- haskell-src-exts-1.21.0
2727
- haskell-src-exts-util-0.2.5
28-
- hlint-2.1.17
28+
- hlint-2.1.17 # last hlint supporting GHC 8.2
2929
- hoogle-5.0.17.6
3030
- hsimport-0.8.8
3131
- lsp-test-0.5.2.3

‎stack-8.4.2.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ extra-deps:
1717
- constrained-dynamic-0.1.0.0
1818
- floskell-0.10.0
1919
- ghc-exactprint-0.5.8.2
20+
- ghc-lib-parser-0.20190523
2021
- haddock-api-2.20.0
2122
- haddock-library-1.6.0
2223
- haskell-lsp-0.13.0.0
2324
- haskell-lsp-types-0.13.0.0@rev:2
2425
- haskell-src-exts-1.21.0
2526
- haskell-src-exts-util-0.2.5
26-
- hlint-2.1.17
27+
- hlint-2.1.22
2728
- hoogle-5.0.17.6
2829
- hsimport-0.10.0
2930
- lsp-test-0.5.2.3

‎stack-8.4.3.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ extra-deps:
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
1818
- ghc-exactprint-0.5.8.2
19+
- ghc-lib-parser-0.20190523
1920
- haddock-api-2.20.0
2021
- haddock-library-1.6.0
2122
- haskell-lsp-0.13.0.0
2223
- haskell-lsp-types-0.13.0.0@rev:2
2324
- haskell-src-exts-1.21.0
2425
- haskell-src-exts-util-0.2.5
25-
- hlint-2.1.17
26+
- hlint-2.1.22
2627
- hoogle-5.0.17.6
2728
- hsimport-0.10.0
2829
- lsp-test-0.5.2.3

‎stack-8.4.4.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ extra-deps:
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
1818
- ghc-exactprint-0.5.8.2
19+
- ghc-lib-parser-0.20190523
1920
- haddock-api-2.20.0
2021
- haddock-library-1.6.0
2122
- haskell-lsp-0.13.0.0
2223
- haskell-lsp-types-0.13.0.0
2324
- haskell-src-exts-1.21.0
2425
- haskell-src-exts-util-0.2.5
25-
- hlint-2.1.17
26+
- hlint-2.1.22
2627
- hoogle-5.0.17.6
2728
- hsimport-0.10.0
2829
- lsp-test-0.5.2.3

‎stack-8.6.1.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ extra-deps:
1919
- czipwith-1.0.1.1
2020
- data-tree-print-0.1.0.2
2121
- floskell-0.10.0
22+
- ghc-lib-parser-0.20190523
2223
- haddock-api-2.21.0
2324
- haskell-lsp-0.13.0.0
2425
- haskell-lsp-types-0.13.0.0
2526
- haskell-src-exts-1.21.0
2627
- haskell-src-exts-util-0.2.5
27-
- hlint-2.1.17
28+
- hlint-2.1.22
2829
- hoogle-5.0.17.6
2930
- hsimport-0.10.0
3031
- lsp-test-0.5.2.3

‎stack-8.6.2.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ extra-deps:
1515
- cabal-plan-0.4.0.0
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
18+
- ghc-lib-parser-0.20190523
1819
- haddock-api-2.21.0
1920
- haskell-lsp-0.13.0.0
2021
- haskell-lsp-types-0.13.0.0
2122
- haskell-src-exts-1.21.0
2223
- haskell-src-exts-util-0.2.5
23-
- hlint-2.1.17
24+
- hlint-2.1.22
2425
- hoogle-5.0.17.6
2526
- hsimport-0.10.0
2627
- lsp-test-0.5.2.3

‎stack-8.6.3.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ extra-deps:
1515
- cabal-plan-0.4.0.0
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
18+
- ghc-lib-parser-0.20190523
1819
- haddock-api-2.21.0
1920
- haskell-lsp-0.13.0.0
2021
- haskell-lsp-types-0.13.0.0
2122
- haskell-src-exts-1.21.0
2223
- haskell-src-exts-util-0.2.5
23-
- hlint-2.1.17
24+
- hlint-2.1.22
2425
- hoogle-5.0.17.6
2526
- hsimport-0.10.0
2627
- lsp-test-0.5.2.3

‎stack-8.6.4.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ extra-deps:
1515
- cabal-plan-0.4.0.0
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
18+
- ghc-lib-parser-0.20190523
1819
- haddock-api-2.22.0
1920
- haskell-lsp-0.13.0.0
2021
- haskell-lsp-types-0.13.0.0
2122
- haskell-src-exts-1.21.0
22-
- hlint-2.1.17
23+
- hlint-2.1.22
2324
- hoogle-5.0.17.6
2425
- hsimport-0.10.0
2526
- lsp-test-0.5.2.3

‎stack-8.6.5.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ extra-deps:
1818
- deque-0.2.7
1919
- floskell-0.10.0
2020
- ghc-exactprint-0.5.8.2
21+
- ghc-lib-parser-0.20190523
2122
- haddock-api-2.22.0
2223
- haskell-lsp-0.13.0.0
2324
- haskell-lsp-types-0.13.0.0
24-
- hlint-2.1.17
25+
- hlint-2.1.22
2526
- hsimport-0.10.0
2627
- lsp-test-0.5.2.3
2728
- monad-dijkstra-0.1.1.2@rev:1

‎stack.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ extra-deps:
1818
- deque-0.2.7
1919
- floskell-0.10.0
2020
- ghc-exactprint-0.5.8.2
21+
- ghc-lib-parser-0.20190523
2122
- haddock-api-2.22.0
2223
- haskell-lsp-0.13.0.0
2324
- haskell-lsp-types-0.13.0.0
24-
- hlint-2.1.17
25+
- hlint-2.1.22
2526
- hsimport-0.10.0
2627
- lsp-test-0.5.2.3
2728
- monad-dijkstra-0.1.1.2@rev:1

‎test/unit/ApplyRefactPluginSpec.hs

+11-2
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,24 @@ applyRefactSpec = do
9090
-- ---------------------------------
9191

9292
it "returns hlint parse error as DsInfo ignored diagnostic" $ do
93-
filePath <- filePathToUri <$> makeAbsolute "./test/testdata/HlintParseFail.hs"
93+
filePathNoUri <- makeAbsolute "./test/testdata/HlintParseFail.hs"
94+
let filePath = filePathToUri filePathNoUri
9495

9596
let act = lintCmd' arg
9697
arg = filePath
9798
res = IdeResultOk
9899
PublishDiagnosticsParams
99100
{ _uri = filePath
100101
, _diagnostics = List
101-
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))
102+
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,0,0)))
103+
[Diagnostic {_range = Range { _start = Position {_line = 13, _character = 0}
104+
, _end = Position {_line = 13, _character = 100000}}
105+
, _severity = Just DsInfo
106+
, _code = Just "parser"
107+
, _source = Just "hlint"
108+
, _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"
109+
, _relatedInformation = Nothing }]}
110+
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))
102111
[Diagnostic {_range = Range { _start = Position {_line = 13, _character = 0}
103112
, _end = Position {_line = 13, _character = 100000}}
104113
, _severity = Just DsInfo

0 commit comments

Comments
 (0)