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

Hlint 2.1.24 #1287

Merged
merged 3 commits into from
Jun 12, 2019
Merged

Hlint 2.1.24 #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4e54e
Upgrade to hlint-2.1.24
alanz Jun 11, 2019
96df5ad
Use Hlint4 for hlint-2.1.24 API
alanz Jun 11, 2019
a254e72
Use Hlint3 API for GHC 8.2.2
alanz Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DuplicateRecordFields #-}
Expand Down Expand Up @@ -26,7 +27,11 @@ import Haskell.Ide.Engine.PluginUtils
import Language.Haskell.Exts.SrcLoc
import Language.Haskell.Exts.Parser
import Language.Haskell.Exts.Extension
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,0,0)))
import Language.Haskell.HLint4 as Hlint
#else
import Language.Haskell.HLint3 as Hlint
#endif
import qualified Language.Haskell.LSP.Types as LSP
import qualified Language.Haskell.LSP.Types.Lens as LSP
import Refact.Apply
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hoogle-5.0.17.9
- hsimport-0.10.0
- lsp-test-0.5.2.3
Expand Down
4 changes: 2 additions & 2 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +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
- ghc-lib-parser-8.8.0.20190424
- 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.22
- hlint-2.1.24
- hsimport-0.10.0
- hoogle-5.0.17.9
- lsp-test-0.5.2.3
Expand Down
3 changes: 2 additions & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ extra-deps:
- deque-0.2.7
- floskell-0.10.1
- ghc-exactprint-0.5.8.2
- ghc-lib-parser-8.8.0.20190424
- haddock-api-2.22.0
- haskell-lsp-0.13.0.0
- haskell-lsp-types-0.13.0.0
- hlint-2.1.22
- hlint-2.1.24
- hsimport-0.10.0
- lsp-test-0.5.2.3
- monad-dijkstra-0.1.1.2@rev:1
Expand Down
6 changes: 3 additions & 3 deletions test/unit/ApplyRefactPluginSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ applyRefactSpec = do
{ _uri = filePath
, _diagnostics = List
#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}}
[Diagnostic {_range = Range { _start = Position {_line = 12, _character = 23}
, _end = Position {_line = 12, _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"
, _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"
, _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}
Expand Down