Merge pull request mpickering#78 from alanz/hie-bios-no-hare

Remove HaRe dependency from HIE.

Author: fendor

.gitmodules

@@ -10,10 +10,6 @@
 # rm -rf path_to_submodule
 
 
-[submodule "submodules/HaRe"]
-path = submodules/HaRe
-url = https://github.com/alanz/HaRe.git
-
 [submodule "submodules/cabal-helper"]
 path = submodules/cabal-helper
 # url = https://github.com/DanielG/cabal-helper.git

app/MainHie.hs

@@ -28,7 +28,7 @@ import Haskell.Ide.Engine.Plugin.Base
 import Haskell.Ide.Engine.Plugin.Brittany
 import Haskell.Ide.Engine.Plugin.Example2
 import Haskell.Ide.Engine.Plugin.Bios
-import Haskell.Ide.Engine.Plugin.HaRe
+-- import Haskell.Ide.Engine.Plugin.HaRe
 import Haskell.Ide.Engine.Plugin.Haddock
 import Haskell.Ide.Engine.Plugin.HfaAlign
 import Haskell.Ide.Engine.Plugin.Hoogle
@@ -53,7 +53,7 @@ plugins includeExamples = pluginDescToIdePlugins allPlugins
  , baseDescriptor "base"
  , brittanyDescriptor "brittany"
  , haddockDescriptor "haddock"
- , hareDescriptor "hare"
+ -- , hareDescriptor "hare"
  , hoogleDescriptor "hoogle"
  , hsimportDescriptor "hsimport"
  , liquidDescriptor "liquid"

cabal.project

@@ -1,9 +1,9 @@
 packages:
  ./
  ./hie-plugin-api/
- ./hie-bios/
+  ./hie-bios/
 
- ./submodules/HaRe
+ -- ./submodules/HaRe
  ./submodules/cabal-helper/
  ./submodules/ghc-mod/ghc-project-types
 

haskell-ide-engine.cabal

@@ -30,7 +30,7 @@ library
  Haskell.Ide.Engine.Plugin.Example2
  Haskell.Ide.Engine.Plugin.Floskell
  Haskell.Ide.Engine.Plugin.Bios
- Haskell.Ide.Engine.Plugin.HaRe
+ -- Haskell.Ide.Engine.Plugin.HaRe
  Haskell.Ide.Engine.Plugin.Haddock
  Haskell.Ide.Engine.Plugin.HfaAlign
  Haskell.Ide.Engine.Plugin.Hoogle
@@ -41,6 +41,7 @@ library
  Haskell.Ide.Engine.Plugin.Pragmas
  Haskell.Ide.Engine.Plugin.Generic
  Haskell.Ide.Engine.Scheduler
+ Haskell.Ide.Engine.Support.FromHaRe
  Haskell.Ide.Engine.Support.Fuzzy
  Haskell.Ide.Engine.Support.HieExtras
  Haskell.Ide.Engine.Transport.JsonStdio
@@ -49,7 +50,7 @@ library
  other-modules: Paths_haskell_ide_engine
  build-depends: Cabal >= 1.22
  , Diff
- , HaRe
+ -- , HaRe
  , aeson
  , apply-refact
  , async
@@ -87,6 +88,7 @@ library
  , safe
  , sorted-list >= 0.2.1.0
  , stm
+ , syb
  , tagsoup
  , text
  , transformers
@@ -181,7 +183,7 @@ test-suite unit-test
  DiffSpec
  ExtensibleStateSpec
  GhcModPluginSpec
- HaRePluginSpec
+ -- HaRePluginSpec
  HooglePluginSpec
  JsonSpec
  LiquidSpec
@@ -273,7 +275,7 @@ test-suite func-test
  , FunctionalCodeActionsSpec
  , FunctionalLiquidSpec
  , FunctionalSpec
- , HaReSpec
+ -- , HaReSpec
  , HieBiosSpec
  , HighlightSpec
  , HoverSpec

src/Haskell/Ide/Engine/LSP/Completions.hs

@@ -39,7 +39,7 @@ import Var
 import Packages (listVisibleModuleNames)
 
 
-import Language.Haskell.Refact.API ( showGhc )
+-- import Language.Haskell.Refact.API ( showGhc )
 
 import qualified Language.Haskell.LSP.Types as J
 import qualified Language.Haskell.LSP.Types.Capabilities
@@ -58,6 +58,10 @@ import Haskell.Ide.Engine.MonadTypes
 import Haskell.Ide.Engine.PluginUtils
 import Haskell.Ide.Engine.Context
 
+import Language.Haskell.GHC.ExactPrint.Utils
+
+-- ---------------------------------------------------------------------
+
 data CompItem = CI
  { origName :: Name -- ^ Original name, such as Maybe, //, or find.
  , importedFrom :: T.Text -- ^ From where this item is imported from.

src/Haskell/Ide/Engine/Plugin/Generic.hs

@@ -21,12 +21,13 @@ import GHC.Generics
 import Haskell.Ide.Engine.MonadFunctions
 import Haskell.Ide.Engine.MonadTypes
 import Haskell.Ide.Engine.PluginUtils
+import Haskell.Ide.Engine.Support.FromHaRe
 import qualified Haskell.Ide.Engine.GhcCompat as C ( GhcPs )
 import qualified Haskell.Ide.Engine.Support.HieExtras as Hie
 import Haskell.Ide.Engine.ArtifactMap
 import qualified Language.Haskell.LSP.Types as LSP
 import qualified Language.Haskell.LSP.Types.Lens as LSP
-import Language.Haskell.Refact.API (hsNamessRdr)
+-- import Language.Haskell.Refact.API (hsNamessRdr)
 import HIE.Bios.Ghc.Doc
 
 import GHC