Pr 658 fix completion tests

cabal.project

@@ -10,8 +10,8 @@ packages:
 
 source-repository-package
   type: git
-  location: https://github.com/bubba/brittany.git
-  tag: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+  location: https://github.com/lspitzner/brittany.git
+  tag: 0a710ab27147d4f7981fe4ca343b43136ee36919
 
 tests: true
 
@@ -25,6 +25,6 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-12-03T03:58:05Z
+index-state: 2020-12-09T06:57:58Z
 
 allow-newer: data-tree-print:base

exe/Wrapper.hs

@@ -7,7 +7,8 @@ import Control.Monad.Extra
 import Data.Foldable
 import Data.List
 import Data.Void
-import HIE.Bios
+import Development.IDE.Session (findCradle, defaultLoadingOptions)
+import HIE.Bios hiding (findCradle)
 import HIE.Bios.Environment
 import HIE.Bios.Types
 import Ide.Arguments
@@ -135,7 +136,7 @@ getRuntimeGhcVersion' cradle = do
 -- of the project that may or may not be accurate.
 findLocalCradle :: FilePath -> IO (Cradle Void)
 findLocalCradle fp = do
-  cradleConf <- findCradle fp
+  cradleConf <- (findCradle defaultLoadingOptions) fp
   crdl       <- case cradleConf of
     Just yaml -> do
       hPutStrLn stderr $ "Found \"" ++ yaml ++ "\" for \"" ++ fp ++ "\""

haskell-language-server.cabal

@@ -59,10 +59,9 @@ library
     , containers
     , data-default
     , ghc
-    , ghcide                >=0.5
+    , ghcide                >=0.6
     , gitrev
     , haskell-lsp           ^>=0.22
-    , hie-bios              >=0.6.1 && <0.8
     , hls-plugin-api        >=0.5
     , hslogger
     , optparse-applicative
@@ -170,6 +169,7 @@ executable haskell-language-server-wrapper
   build-depends:
     , ghc
     , ghc-paths
+    , ghcide
     , gitrev
     , haskell-language-server
     , hie-bios

nix/default.nix

@@ -17,6 +17,7 @@ let
           haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides {
             haskell-language-server = gitignoreSource ../.;
             ghcide = gitignoreSource ../ghcide;
+            shake-bench = gitignoreSource ../ghcide/shake-bench;
             hie-compat = gitignoreSource ../ghcide/hie-compat;
             hls-plugin-api = gitignoreSource ../hls-plugin-api;
             hls-tactics-plugin = gitignoreSource ../plugins/tactics;

shell.nix

@@ -26,6 +26,7 @@ let defaultCompiler = "ghc" + lib.replaceStrings ["."] [""] haskellPackages.ghc.
 
     packages = p: [ p.haskell-language-server
                     p.ghcide
+                    p.shake-bench
                     p.hie-compat
                     p.hls-plugin-api
                     p.hls-tactics-plugin

src/Ide/Main.hs

@@ -34,19 +34,18 @@ import Development.IDE.Core.Shake
 import Development.IDE.LSP.LanguageServer
 import Development.IDE.LSP.Protocol
 import Development.IDE.Plugin
-import Development.IDE.Session
+import Development.IDE.Session (loadSession, findCradle, defaultLoadingOptions)
 import Development.IDE.Types.Diagnostics
 import Development.IDE.Types.Location
 import Development.IDE.Types.Logger
 import Development.IDE.Types.Options
-import HIE.Bios.Cradle
 import qualified Language.Haskell.LSP.Core as LSP
 import Ide.Arguments
 import Ide.Logger
 import Ide.Plugin
 import Ide.Version
 import Ide.Plugin.Config
-import Ide.Types                                (IdePlugins, ipMap)
+import Ide.Types (IdePlugins, ipMap)
 import Language.Haskell.LSP.Messages
 import Language.Haskell.LSP.Types
 import qualified System.Directory.Extra as IO
@@ -158,7 +157,7 @@ runLspMode lspArgs@LspArguments{..} idePlugins = do
         putStrLn $ "Found " ++ show (length files) ++ " files"
 
         putStrLn "\nStep 2/4: Looking for hie.yaml files that control setup"
-        cradles <- mapM findCradle files
+        cradles <- mapM (findCradle defaultLoadingOptions) files
         let ucradles = nubOrd cradles
         let n = length ucradles
         putStrLn $ "Found " ++ show n ++ " cradle" ++ ['s' | n /= 1]

stack-8.10.1.yaml

@@ -14,23 +14,25 @@ ghc-options:
   "$everything": -haddock
 
 extra-deps:
-- github: bubba/brittany
-  commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+- github: lspitzner/brittany
+  commit: 0a710ab27147d4f7981fe4ca343b43136ee36919
 - Cabal-3.0.2.0
 - clock-0.7.2
-- data-tree-print-0.1.0.2
+- data-tree-print-0.1.0.2@rev:2
 - floskell-0.10.4
 - fourmolu-0.3.0.0
 - ghc-lib-8.10.2.20200916
 - ghc-lib-parser-8.10.2.20200916
+- heapsize-0.3.0
 - hie-bios-0.7.1
-- hlint-3.2
+- hlint-3.2.3
 - HsYAML-aeson-0.2.0.0@rev:2
 - implicit-hie-cradle-0.3.0.2
 - implicit-hie-0.1.2.5
 - lsp-test-0.11.0.6
 - monad-dijkstra-0.1.1.2
-- opentelemetry-0.4.2
+- opentelemetry-0.6.1
+- opentelemetry-extra-0.6.1
 - ormolu-0.1.4.1
 - refinery-0.3.0.0
 - retrie-0.1.1.1
@@ -44,9 +46,6 @@ flags:
   retrie:
     BuildExecutable: false
 
-# for data-tree-print's bounds on base (>=4.8 && <4.14); using base-4.14.0.0.
-allow-newer: true
-
 nix:
   packages: [ icu libcxx zlib ]
 

stack-8.10.2.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2020-11-22
+resolver: nightly-2020-12-09
 
 packages:
 - .
@@ -14,18 +14,18 @@ ghc-options:
   "$everything": -haddock
 
 extra-deps:
-- github: bubba/brittany
-  commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+- github: lspitzner/brittany
+  commit: 0a710ab27147d4f7981fe4ca343b43136ee36919
 - Cabal-3.0.2.0
 - clock-0.7.2
-- data-tree-print-0.1.0.2
+- data-tree-print-0.1.0.2@rev:2
 - floskell-0.10.4
 - fourmolu-0.3.0.0
+- heapsize-0.3.0
 - implicit-hie-cradle-0.3.0.2
 - implicit-hie-0.1.2.5
 - lsp-test-0.11.0.6
 - monad-dijkstra-0.1.1.2
-- opentelemetry-0.4.2
 - refinery-0.3.0.0
 - retrie-0.1.1.1
 - stylish-haskell-0.12.2.0
@@ -38,9 +38,6 @@ flags:
   retrie:
     BuildExecutable: false
 
-# for data-tree-print's bounds on base (>=4.8 && <4.14); using base-4.14.0.0.
-allow-newer: true
-
 nix:
   packages: [ icu libcxx zlib ]
 

stack-8.6.4.yaml

@@ -19,8 +19,8 @@ extra-deps:
 - apply-refact-0.8.2.1
 - ansi-terminal-0.10.3
 - base-compat-0.10.5
-- github: bubba/brittany
-  commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+- github: lspitzner/brittany
+  commit: 0a710ab27147d4f7981fe4ca343b43136ee36919
 - butcher-1.3.3.1
 - Cabal-3.0.2.0
 - cabal-plan-0.6.2.0
@@ -32,17 +32,21 @@ extra-deps:
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
 - ghc-check-0.5.0.1
+- ghc-events-0.13.0
 - ghc-exactprint-0.6.3.2
 - ghc-lib-8.10.2.20200916
 - ghc-lib-parser-8.10.2.20200916
 - ghc-lib-parser-ex-8.10.0.16
 - ghc-source-gen-0.4.0.0
+- ghc-trace-events-0.1.2.1
 - haddock-api-2.22.0@rev:1
 - haddock-library-1.8.0
+- hashable-1.3.0.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
+- heapsize-0.3.0
 - hie-bios-0.7.1
-- hlint-3.2
+- hlint-3.2.3
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:2
 - implicit-hie-cradle-0.3.0.2
@@ -51,7 +55,8 @@ extra-deps:
 - lens-4.18
 - lsp-test-0.11.0.6
 - monad-dijkstra-0.1.1.2
-- opentelemetry-0.4.2
+- opentelemetry-0.6.1
+- opentelemetry-extra-0.6.1
 - optics-core-0.2
 - optparse-applicative-0.15.1.0
 - ormolu-0.1.4.1

stack-8.6.5.yaml

@@ -18,8 +18,8 @@ extra-deps:
 - apply-refact-0.8.2.1
 - ansi-terminal-0.10.3
 - base-compat-0.10.5
-- github: bubba/brittany
-  commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+- github: lspitzner/brittany
+  commit: 0a710ab27147d4f7981fe4ca343b43136ee36919
 - butcher-1.3.3.1
 - Cabal-3.0.2.0
 - cabal-plan-0.6.2.0
@@ -31,17 +31,21 @@ extra-deps:
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
 - ghc-check-0.5.0.1
+- ghc-events-0.13.0
 - ghc-exactprint-0.6.3.2
 - ghc-lib-8.10.2.20200916
 - ghc-lib-parser-8.10.2.20200916
 - ghc-lib-parser-ex-8.10.0.16
 - ghc-source-gen-0.4.0.0
+- ghc-trace-events-0.1.2.1
 - haddock-api-2.22.0@rev:1
 - haddock-library-1.8.0
+- hashable-1.3.0.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
+- heapsize-0.3.0
 - hie-bios-0.7.1
-- hlint-3.2
+- hlint-3.2.3
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:2
 - implicit-hie-cradle-0.3.0.2
@@ -50,7 +54,8 @@ extra-deps:
 - lens-4.18
 - lsp-test-0.11.0.6
 - monad-dijkstra-0.1.1.2
-- opentelemetry-0.4.2
+- opentelemetry-0.6.1
+- opentelemetry-extra-0.6.1
 - optics-core-0.2
 - optparse-applicative-0.15.1.0
 - ormolu-0.1.4.1

stack-8.8.2.yaml

@@ -15,28 +15,30 @@ ghc-options:
 
 extra-deps:
 - aeson-1.5.2.0
-- apply-refact-0.8.2.1
-- github: bubba/brittany
-  commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+- github: lspitzner/brittany
+  commit: 0a710ab27147d4f7981fe4ca343b43136ee36919
 - butcher-1.3.3.2
 - bytestring-trie-0.2.5.0
 - clock-0.7.2
 - constrained-dynamic-0.1.0.0
 - extra-1.7.3
 - floskell-0.10.4
 - fourmolu-0.3.0.0
-# - ghcide-0.1.0
+# - ghcide-0.6.0
 - ghc-check-0.5.0.1
+- ghc-events-0.13.0
 - ghc-exactprint-0.6.3.2
 - ghc-lib-8.10.2.20200916
 - ghc-lib-parser-8.10.2.20200916
 - ghc-lib-parser-ex-8.10.0.16
+- ghc-trace-events-0.1.2.1
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - haskell-src-exts-1.21.1
+- heapsize-0.3.0
 - hie-bios-0.7.1
-- hlint-3.2
+- hlint-3.2.3
 - hoogle-5.0.17.11
 - hsimport-0.11.0
 - HsYAML-0.2.1.0@rev:1
@@ -46,7 +48,8 @@ extra-deps:
 - implicit-hie-0.1.2.5
 - lsp-test-0.11.0.6
 - monad-dijkstra-0.1.1.2
-- opentelemetry-0.4.2
+- opentelemetry-0.6.1
+- opentelemetry-extra-0.6.1
 - ormolu-0.1.4.1
 - refinery-0.3.0.0
 - retrie-0.1.1.1

stack-8.8.3.yaml

@@ -16,22 +16,24 @@ ghc-options:
 extra-deps:
 - aeson-1.5.2.0
 - apply-refact-0.8.2.1
-- github: bubba/brittany
-  commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
+- github: lspitzner/brittany
+  commit: 0a710ab27147d4f7981fe4ca343b43136ee36919
 - bytestring-trie-0.2.5.0
 - cabal-plan-0.6.2.0
 - clock-0.7.2
 - constrained-dynamic-0.1.0.0
 - extra-1.7.3
 - floskell-0.10.4
 - fourmolu-0.3.0.0
-# - ghcide-0.1.0
+# - ghcide-0.6.0
 - ghc-exactprint-0.6.3.2
 - ghc-lib-8.10.2.20200916
 - ghc-lib-parser-8.10.2.20200916
+- ghc-trace-events-0.1.2.1
 - haskell-src-exts-1.21.1
+- heapsize-0.3.0
 - hie-bios-0.7.1
-- hlint-3.2
+- hlint-3.2.3
 - HsYAML-aeson-0.2.0.0@rev:2
 - hoogle-5.0.17.11
 - hsimport-0.11.0
@@ -40,6 +42,8 @@ extra-deps:
 - implicit-hie-0.1.2.5
 - lsp-test-0.11.0.6
 - monad-dijkstra-0.1.1.2
+- opentelemetry-0.6.1
+- opentelemetry-extra-0.6.1
 - ormolu-0.1.4.1
 - refinery-0.3.0.0
 - retrie-0.1.1.1