Implement the HIE Bios

.gitmodules

@@ -29,10 +29,16 @@
 	path = submodules/ghc-mod
 	# url = https://github.com/arbor/ghc-mod.git
 	# url = https://github.com/bubba/ghc-mod.git
-	url = https://github.com/alanz/ghc-mod.git
+	url = https://github.com/mpickering/ghc-mod.git
 
 
 [submodule "submodules/floskell"]
 	path = submodules/floskell
 	url = https://github.com/ennocramer/floskell
 	# url = https://github.com/alanz/floskell
+[submodule "haskell-lsp"]
+	path = haskell-lsp
+	url = https://github.com/mpickering/haskell-lsp.git
+[submodule "lsp-test"]
+	path = lsp-test
+	url = https://github.com/mpickering/lsp-test

app/HieWrapper.hs

@@ -9,8 +9,7 @@ import           Data.Semigroup
 import           Data.List
 import           Data.Foldable
 import           Data.Version                          (showVersion)
-import qualified GhcMod.Monad                          as GM
-import qualified GhcMod.Types                          as GM
+import           HIE.Bios
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.Options
 import           Haskell.Ide.Engine.Plugin.Base
@@ -70,11 +69,9 @@ run opts = do
   d <- getCurrentDirectory
   logm $ "Current directory:" ++ d
 
-  -- Get the cabal directory from the ghc-mod cradle
-  (mcr,_) <- GM.runGhcModT GM.defaultOptions GM.cradle
-  dir <- case mcr of
-    Left err -> error (show err)
-    Right cr -> return $ GM.cradleRootDir cr
+  -- Get the cabal directory from the cradle
+  cr <- findCradle d
+  let dir = cradleRootDir cr
   logm $ "Cradle directory:" ++ dir
   setCurrentDirectory dir
 

app/MainHie.hs

@@ -5,7 +5,6 @@ module Main where
 import           Control.Monad
 import           Data.Monoid                           ((<>))
 import           Data.Version                          (showVersion)
-import qualified GhcMod.Types                          as GM
 import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.MonadTypes
 import           Haskell.Ide.Engine.Options
@@ -18,6 +17,7 @@ import qualified Paths_haskell_ide_engine              as Meta
 import           System.Directory
 import           System.Environment
 import qualified System.Log.Logger                     as L
+import HIE.Bios.Types
 
 -- ---------------------------------------------------------------------
 -- plugins
@@ -27,7 +27,7 @@ import           Haskell.Ide.Engine.Plugin.Base
 import           Haskell.Ide.Engine.Plugin.Brittany
 import           Haskell.Ide.Engine.Plugin.Build
 import           Haskell.Ide.Engine.Plugin.Example2
-import           Haskell.Ide.Engine.Plugin.GhcMod
+import           Haskell.Ide.Engine.Plugin.Bios
 import           Haskell.Ide.Engine.Plugin.HaRe
 import           Haskell.Ide.Engine.Plugin.Haddock
 import           Haskell.Ide.Engine.Plugin.HfaAlign
@@ -37,6 +37,7 @@ import           Haskell.Ide.Engine.Plugin.Liquid
 import           Haskell.Ide.Engine.Plugin.Package
 import           Haskell.Ide.Engine.Plugin.Pragmas
 import           Haskell.Ide.Engine.Plugin.Floskell
+import           Haskell.Ide.Engine.Plugin.Generic
 
 -- ---------------------------------------------------------------------
 
@@ -52,7 +53,7 @@ plugins includeExamples = pluginDescToIdePlugins allPlugins
       , baseDescriptor        "base"
       , brittanyDescriptor    "brittany"
       , buildPluginDescriptor "build"
-      , ghcmodDescriptor      "ghcmod"
+      -- , ghcmodDescriptor      "ghcmod"
       , haddockDescriptor     "haddock"
       , hareDescriptor        "hare"
       , hoogleDescriptor      "hoogle"
@@ -61,6 +62,8 @@ plugins includeExamples = pluginDescToIdePlugins allPlugins
       , packageDescriptor     "package"
       , pragmasDescriptor     "pragmas"
       , floskellDescriptor    "floskell"
+      , biosDescriptor        "bios"
+      , genericDescriptor     "generic"
       ]
     examplePlugins =
       [example2Descriptor "eg2"
@@ -121,16 +124,15 @@ run opts = do
   d <- getCurrentDirectory
   logm $ "Current directory:" ++ d
 
-  let vomitOptions = GM.defaultOptions { GM.optOutput = oo { GM.ooptLogLevel = GM.GmVomit}}
-      oo = GM.optOutput GM.defaultOptions
-  let defaultOpts = if optGhcModVomit opts then vomitOptions else GM.defaultOptions
+  let initOpts = defaultCradleOpts { cradleOptsVerbosity = verbosity }
+      verbosity = if optBiosVerbose opts then Verbose else Silent
       -- Running HIE on projects with -Werror breaks most of the features since all warnings
       -- will be treated with the same severity of type errors. In order to offer a more useful
       -- experience, we make sure warnings are always reported as warnings by setting -Wwarn
-      ghcModOptions = defaultOpts { GM.optGhcUserOptions = ["-Wwarn"] }
+--      ghcModOptions = defaultOpts { GM.optGhcUserOptions = ["-Wwarn"] }
 
-  when (optGhcModVomit opts) $
-    logm "Enabling --vomit for ghc-mod. Output will be on stderr"
+  when (optBiosVerbose opts) $
+    logm "Enabling verbose mode for hie-bios. Output will be on stderr"
 
   when (optExamplePlugin opts) $
     logm "Enabling Example2 plugin, will insert constant diagnostics etc."
@@ -139,8 +141,8 @@ run opts = do
 
   -- launch the dispatcher.
   if optJson opts then do
-    scheduler <- newScheduler plugins' ghcModOptions
+    scheduler <- newScheduler plugins' initOpts
     jsonStdioTransport scheduler
   else do
-    scheduler <- newScheduler plugins' ghcModOptions
+    scheduler <- newScheduler plugins' initOpts
     lspStdioTransport scheduler origDir plugins' (optCaptureFile opts)

cabal.project

@@ -1,10 +1,21 @@
 packages:
          ./
          ./hie-plugin-api/
+         ./hie-bios/
+         ./haskell-lsp/
+         ./lsp-test
 
          ./submodules/HaRe
          ./submodules/brittany
          ./submodules/cabal-helper/
          ./submodules/floskell
          ./submodules/ghc-mod/
          ./submodules/ghc-mod/core/
+         ./submodules/floskell
+
+allow-newer: floskell:all
+
+executable-dynamic: True
+
+ghc-options: -Werror
+

haskell-ide-engine.cabal

@@ -1,5 +1,5 @@
 name:                haskell-ide-engine
-version:             0.8.0.0
+version:             1.0.0.0
 synopsis:            Provide a common engine to power any Haskell IDE
 description:         Please see README.md
 homepage:            http://github.com/githubuser/haskell-ide-engine#readme
@@ -29,7 +29,7 @@ library
                        Haskell.Ide.Engine.Plugin.Build
                        Haskell.Ide.Engine.Plugin.Example2
                        Haskell.Ide.Engine.Plugin.Floskell
-                       Haskell.Ide.Engine.Plugin.GhcMod
+                       Haskell.Ide.Engine.Plugin.Bios
                        Haskell.Ide.Engine.Plugin.HaRe
                        Haskell.Ide.Engine.Plugin.Haddock
                        Haskell.Ide.Engine.Plugin.HfaAlign
@@ -39,6 +39,7 @@ library
                        Haskell.Ide.Engine.Plugin.Package
                        Haskell.Ide.Engine.Plugin.Package.Compat
                        Haskell.Ide.Engine.Plugin.Pragmas
+                       Haskell.Ide.Engine.Plugin.Generic
                        Haskell.Ide.Engine.Scheduler
                        Haskell.Ide.Engine.Support.Fuzzy
                        Haskell.Ide.Engine.Support.HieExtras
@@ -65,21 +66,18 @@ library
                      , fold-debounce
                      , ghc >= 8.0.1
                      , ghc-exactprint
-                     , ghc-mod >= 5.9.0.0
-                     , ghc-mod-core >= 5.9.0.0
                      , gitrev >= 1.1
                      , haddock-api
                      , haddock-library
-                     , haskell-lsp == 0.9.*
-                     , haskell-lsp-types == 0.9.*
+                     , haskell-lsp == 0.10.*
+                     , haskell-lsp-types == 0.10.*
                      , haskell-src-exts
                      , hie-plugin-api
                      , hlint >= 2.0.11
                      , hoogle >= 5.0.13
                      , hsimport
                      , hslogger
                      , lens >= 4.15.2
-                     , monad-control
                      , monoid-subclasses > 0.4
                      , mtl
                      , optparse-simple >= 0.0.3
@@ -95,6 +93,9 @@ library
                      , vector
                      , yaml >= 0.8.31
                      , yi-rope
+                     , hie-bios
+                     , bytestring-trie
+                     , unliftio
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
      ghc-options:      -Werror
@@ -106,7 +107,7 @@ executable hie
   other-modules:       Paths_haskell_ide_engine
   build-depends:       base
                      , directory
-                     , ghc-mod-core
+                     , hie-bios
                      , haskell-ide-engine
                      , haskell-lsp
                      , hie-plugin-api
@@ -125,7 +126,7 @@ executable hie-wrapper
   other-modules:       Paths_haskell_ide_engine
   build-depends:       base
                      , directory
-                     , ghc-mod-core
+                     , hie-bios
                      , haskell-ide-engine
                      , haskell-lsp
                      , hie-plugin-api
@@ -144,14 +145,14 @@ library hie-test-utils
   build-depends:       base
                      , haskell-ide-engine
                      , haskell-lsp
+                     , hie-bios
                      , hie-plugin-api
                      , aeson
                      , blaze-markup
                      , containers
                      , data-default
                      , directory
                      , filepath
-                     , ghc-mod-core
                      , hslogger
                      , hspec
                      , hspec-core
@@ -187,7 +188,7 @@ test-suite unit-test
                      , filepath
                      , free
                      , haskell-ide-engine
-                     , haskell-lsp-types >= 0.4
+                     , haskell-lsp-types
                      , hie-test-utils
                      , hie-plugin-api
                      , hoogle > 5.0.11
@@ -263,6 +264,7 @@ test-suite func-test
                      , HaReSpec
                      , HighlightSpec
                      , HoverSpec
+                     , ProgressSpec
                      , ReferencesSpec
                      , RenameSpec
                      , SymbolsSpec
@@ -275,9 +277,9 @@ test-suite func-test
                      , data-default
                      , directory
                      , filepath
-                     , lsp-test >= 0.5.1.1 && < 0.5.2
+                     , lsp-test >= 0.5.1.3
                      , haskell-ide-engine
-                     , haskell-lsp-types >= 0.4
+                     , haskell-lsp-types == 0.10.*
                      , hie-test-utils
                      , hie-plugin-api
                      , hspec

hie-bios/.travis.yml

@@ -0,0 +1,34 @@
+# NB: don't set `language: haskell` here
+
+# The following enables several GHC versions to be tested; often it's enough to test only against the last release in a major GHC version. Feel free to omit lines listings versions you don't need/want testing for.
+env:
+ - CABALVER=1.24 GHCVER=8.0.2
+ - CABALVER=2.0  GHCVER=8.2.2
+ - CABALVER=2.2  GHCVER=8.4.4
+ - CABALVER=2.4  GHCVER=8.6.3
+ - CABALVER=head GHCVER=head   # see section about GHC HEAD snapshots
+
+matrix:
+  allow_failures:
+   - env: CABALVER=head GHCVER=head
+
+# Note: the distinction between `before_install` and `install` is not important.
+before_install:
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER happy alex
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+
+install:
+ - cabal --version
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - travis_retry cabal update
+ - cabal install --only-dependencies --enable-tests --enable-benchmarks
+
+# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
+script:
+ - if [ -f configure.ac ]; then autoreconf -i; fi
+ - cabal configure --enable-tests --enable-benchmarks -v2  # -v2 provides useful information for debugging
+ - cabal build   # this builds all libraries and executables (including tests/benchmarks)
+ - cabal test
+ - cabal check

hie-bios/ChangeLog

@@ -0,0 +1,2 @@
+2018-12-18 v0.0.0
+	* First release

hie-bios/LICENSE

@@ -0,0 +1,29 @@
+Copyright (c) 2009, IIJ Innovation Institute Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.