Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use implicit-hie cradle #138

Closed
wants to merge 1 commit into from
Closed

Use implicit-hie cradle #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ source-repository-package
location: https://github.com/peti/cabal-plan
tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87

source-repository-package
type: git
location: https://github.com/mpickering/hie-bios
tag: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
Comment on lines +16 to +19
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unneeded, afaict?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for haskell/hie-bios@a852cff


source-repository-package
type: git
location: https://github.com/Avi-D-coder/implicit-hie-cradle
tag: 7de3cca59975db0e8a4280785b38d542a4a35c7a

tests: true
documentation: true

Expand Down
3 changes: 2 additions & 1 deletion exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import GHC.Check ( VersionCheck(..), makeGhcVersi
import HIE.Bios.Cradle
import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolute)
import HIE.Bios.Types
import Hie.Implicit.Cradle
import HscTypes (HscEnv(..), ic_dflags)
import qualified Language.Haskell.LSP.Core as LSP
import Ide.Logger
Expand Down Expand Up @@ -443,7 +444,7 @@ loadSession dir = do
-- throwing an async exception
void $ forkIO $ do
putStrLn $ "Consulting the cradle for " <> show file
cradle <- maybe (loadImplicitCradle $ addTrailingPathSeparator dir) loadCradle hieYaml
cradle <- maybe (loadImplicitHieCradle $ addTrailingPathSeparator dir) loadCradle hieYaml
eopts <- cradleToSessionOpts cradle cfp
print eopts
case eopts of
Expand Down
1 change: 1 addition & 0 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ executable haskell-language-server
, hie-bios >= 0.4
, haskell-language-server
, hslogger
, implicit-hie-cradle
, optparse-applicative
, shake >= 0.17.5
, text
Expand Down
7 changes: 6 additions & 1 deletion stack-8.10.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ extra-deps:
- optics-core-0.3
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- github: Avi-D-coder/implicit-hie-cradle
commit: 7de3cca59975db0e8a4280785b38d542a4a35c7a
- github: mpickering/hie-bios
commit: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
- implicit-hie-0.1.0.0
Avi-D-coder marked this conversation as resolved.
Show resolved Hide resolved
- semigroups-0.18.5
- temporary-1.2.1.1

Expand All @@ -37,4 +42,4 @@ flags:
nix:
packages: [ icu libcxx zlib ]

concurrent-tests: false
concurrent-tests: false
6 changes: 5 additions & 1 deletion stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ extra-deps:
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- haskell-src-exts-1.21.1
- hie-bios-0.5.0
- hlint-2.2.8
- hoogle-5.0.17.11
- hsimport-0.11.0@rev:2
Expand All @@ -48,6 +47,11 @@ extra-deps:
# - shake-0.18.5
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- github: Avi-D-coder/implicit-hie-cradle
commit: 7de3cca59975db0e8a4280785b38d542a4a35c7a
- github: mpickering/hie-bios
commit: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
- implicit-hie-0.1.0.0
Avi-D-coder marked this conversation as resolved.
Show resolved Hide resolved
- syz-0.2.0.0
- tasty-rerun-1.1.17
- temporary-1.2.1.1
Expand Down
6 changes: 5 additions & 1 deletion stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ extra-deps:
- haddock-library-1.8.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- hie-bios-0.5.0
- indexed-profunctors-0.1
- lens-4.18
- lsp-test-0.10.3.0
Expand All @@ -40,6 +39,11 @@ extra-deps:
- semialign-1.1
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- github: Avi-D-coder/implicit-hie-cradle
commit: 7de3cca59975db0e8a4280785b38d542a4a35c7a
- github: mpickering/hie-bios
commit: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
- implicit-hie-0.1.0.0
Avi-D-coder marked this conversation as resolved.
Show resolved Hide resolved
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- type-equality-1
Expand Down
6 changes: 5 additions & 1 deletion stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ extra-deps:
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- haskell-src-exts-1.21.1
- hie-bios-0.5.0
- hlint-2.2.8
- hoogle-5.0.17.11
- hsimport-0.11.0
Expand All @@ -31,6 +30,11 @@ extra-deps:
- semigroups-0.18.5
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- github: Avi-D-coder/implicit-hie-cradle
commit: 7de3cca59975db0e8a4280785b38d542a4a35c7a
- github: mpickering/hie-bios
commit: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
- implicit-hie-0.1.0.0
Avi-D-coder marked this conversation as resolved.
Show resolved Hide resolved
- temporary-1.2.1.1

flags:
Expand Down
6 changes: 5 additions & 1 deletion stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ extra-deps:
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- haskell-src-exts-1.21.1
- hie-bios-0.5.0
- hlint-2.2.8
- hoogle-5.0.17.11
- hsimport-0.11.0
Expand All @@ -30,6 +29,11 @@ extra-deps:
- semigroups-0.18.5
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- github: Avi-D-coder/implicit-hie-cradle
commit: 7de3cca59975db0e8a4280785b38d542a4a35c7a
- github: mpickering/hie-bios
commit: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
- implicit-hie-0.1.0.0
Avi-D-coder marked this conversation as resolved.
Show resolved Hide resolved
- temporary-1.2.1.1

flags:
Expand Down
6 changes: 5 additions & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ extra-deps:
- haddock-library-1.8.0
- haskell-lsp-0.22.0.0
- haskell-lsp-types-0.22.0.0
- hie-bios-0.5.0
- indexed-profunctors-0.1
- lens-4.18
- lsp-test-0.10.3.0
Expand All @@ -40,6 +39,11 @@ extra-deps:
- semialign-1.1
- github: wz1000/shake
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
- github: Avi-D-coder/implicit-hie-cradle
commit: 7de3cca59975db0e8a4280785b38d542a4a35c7a
- github: mpickering/hie-bios
commit: a852cffb0deb306cd1e1fe02aa50d50c77aeb15d
- implicit-hie-0.1.0.0
Avi-D-coder marked this conversation as resolved.
Show resolved Hide resolved
- tasty-rerun-1.1.17
- temporary-1.2.1.1
- type-equality-1
Expand Down