WIP on integrating hlint using DAML approach

But getting a mismatch on ghc-lib vs GHC types for the call to hlint. Closes #32
jneira · Jul 15, 2020 · ae8a8b7 · ae8a8b7
1 parent 8d37a64
commit ae8a8b7
Show file tree

Hide file tree

Showing 3 changed files with 588 additions and 1 deletion.
diff --git a/exe/Main.hs b/exe/Main.hs
@@ -101,6 +101,7 @@ import Ide.Plugin.Example                 as Example
 import Ide.Plugin.Example2                as Example2
 import Ide.Plugin.GhcIde                  as GhcIde
 import Ide.Plugin.Floskell                as Floskell
+import Ide.Plugin.Hlint                   as Hlint
 import Ide.Plugin.Ormolu                  as Ormolu
 import Ide.Plugin.StylishHaskell          as StylishHaskell
 #if AGPL
@@ -141,8 +142,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
       , Ormolu.descriptor   "ormolu"
       , StylishHaskell.descriptor "stylish-haskell"
 #if AGPL
-      , Brittany.descriptor    "brittany"
+      , Brittany.descriptor "brittany"
 #endif
+      , Hlint.descriptor "hlint"
       ]
     examplePlugins =
       [Example.descriptor  "eg"

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -76,7 +76,12 @@ library
     , gitrev
     , hashable
     , haskell-lsp == 0.22.*
+<<<<<<< HEAD
     , hie-bios ^>= 0.6.1
+=======
+    , haskell-src-exts
+    , hie-bios >= 0.4
+>>>>>>> WIP on integrating hlint using DAML approach
     , hslogger
     , lens
     , ormolu ^>= 0.1.2
@@ -107,6 +112,53 @@ library
 
   default-language: Haskell2010
 
+flag ghc-lib
+  default: False
+  manual: True
+  description: Force dependency on ghc-lib-parser even if GHC API in the ghc package is supported
+
+library hls-ghc-lib
+  exposed-modules:
+    Ide.Plugin.Hlint
+  hs-source-dirs:
+    src
+  build-depends:
+      base
+    , aeson
+    , binary
+    , bytestring
+    , containers
+    , data-default
+    , deepseq
+    , directory
+    , extra
+    , filepath
+    , ghcide
+    , hashable
+    , haskell-lsp
+    , haskell-src-exts
+    , hlint >= 3.0
+    , regex-tdfa
+    , shake
+    , text
+    , transformers
+    , unordered-containers
+  if !flag(ghc-lib) && impl(ghc >= 8.10.1) && impl(ghc < 8.11.0)
+    build-depends:
+      ghc == 8.10.*
+  else
+    build-depends:
+      ghc-lib == 8.10.*
+
+  ghc-options:
+         -Wall
+         -Wredundant-constraints
+         -Wno-name-shadowing
+  if flag(pedantic)
+     ghc-options:      -Werror
+
+  default-language: Haskell2010
+
 executable haskell-language-server
   import: agpl
   main-is: Main.hs
@@ -161,6 +213,7 @@ executable haskell-language-server
     , haskell-lsp
     , hie-bios >= 0.4
     , haskell-language-server
+    , hls-ghc-lib
     , hslogger
     , optparse-applicative
     , safe-exceptions