Merge #2990

2990: Improve scripts for haskell-language-server and ghci r=rvl a=rvl It now generates a custom HLS config on the fly. Instructions are in `hie-direnv.yaml`. ### Issue Number ADP-1229 Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
cardano-foundation · Oct 26, 2021 · 618509a · 618509a
2 parents 0c1daac + 927c8b8
commit 618509a
Show file tree

Hide file tree

Showing 28 changed files with 804 additions and 195 deletions.
diff --git a/hie-direnv.yaml b/hie-direnv.yaml
@@ -0,0 +1,28 @@
+########################################################################
+# Custom configuration for haskell-language-server.
+#
+# Use this instead of the default Stack cradle if you want faster
+# reloads and cross-package jump-to-definition.
+#
+# It requires nix-direnv and your editor must have direnv integration.
+#
+# To use it, symlink hie-direnv.yaml to hie.yaml.
+# Then prepare your environment:
+# 1. $ direnv allow
+#    (this will build and cache the nix-shell)
+# 2. $ cabal configure --enable-tests --enable-benchmarks -O0
+#    (this will provide the build plan which is the basis of the cradle)
+# 3. $ cabal build all
+#    (this will build the Cabal autogen Paths_ modules)
+#
+# Test your configuration with commands such as:
+# $ hie-bios check lib/core/src/Cardano/Wallet.hs
+# $ haskell-language-server lib/shelley/exe/cardano-wallet.hs
+#
+# See https://github.com/haskell/hie-bios for information about the
+# cradle yaml config format.
+########################################################################
+
+cradle:
+  bios:
+    program: "./scripts/hie-bios.sh"
diff --git a/lib/cli/cardano-wallet-cli.cabal b/lib/cli/cardano-wallet-cli.cabal
@@ -85,6 +85,6 @@ test-suite unit
   hs-source-dirs:
       test/unit
   main-is:
-      Main.hs
+      cli-unit-test.hs
   other-modules:
       Cardano.CLISpec
diff --git a/lib/cli/test/unit/Main.hs → lib/cli/test/unit/cli-unit-test.hs b/lib/cli/test/unit/Main.hs → lib/cli/test/unit/cli-unit-test.hs
diff --git a/lib/core/test/bench/db/Main.hs → lib/core/bench/db-bench.hs b/lib/core/test/bench/db/Main.hs → lib/core/bench/db-bench.hs
@@ -39,6 +39,8 @@
 -- there are database statements with more parameters than that, the DBLayer
 -- will throw exceptions.
 
+module Main where
+
 import Prelude
 
 import Cardano.Address.Derivation

diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal
@@ -362,10 +362,10 @@ test-suite unit
   type:
       exitcode-stdio-1.0
   hs-source-dirs:
+      test-common
       test/unit
-      test/shared
   main-is:
-      Main.hs
+      core-unit-test.hs
   other-modules:
       Cardano.Byron.Codec.CborSpec
       Cardano.DB.Sqlite.DeleteSpec
@@ -472,9 +472,9 @@ benchmark db
   type:
      exitcode-stdio-1.0
   hs-source-dirs:
-      test/bench/db
-      test/shared
+      bench
+      test-common
   main-is:
-      Main.hs
+      db-bench.hs
   other-modules:
       Cardano.Wallet.DummyTarget.Primitive.Types
diff --git a/...ano/Wallet/DummyTarget/Primitive/Types.hs → ...ano/Wallet/DummyTarget/Primitive/Types.hs b/...ano/Wallet/DummyTarget/Primitive/Types.hs → ...ano/Wallet/DummyTarget/Primitive/Types.hs
diff --git a/lib/core/test/unit/Main.hs → lib/core/test/unit/core-unit-test.hs b/lib/core/test/unit/Main.hs → lib/core/test/unit/core-unit-test.hs
diff --git a/lib/launcher/cardano-wallet-launcher.cabal b/lib/launcher/cardano-wallet-launcher.cabal
@@ -93,7 +93,7 @@ test-suite unit
   hs-source-dirs:
       test/unit
   main-is:
-      Main.hs
+      launcher-unit-test.hs
   other-modules:
       Cardano.LauncherSpec
     , Cardano.StartupSpec

diff --git a/lib/launcher/test/unit/Main.hs → lib/launcher/test/unit/launcher-unit-test.hs b/lib/launcher/test/unit/Main.hs → lib/launcher/test/unit/launcher-unit-test.hs
diff --git a/lib/numeric/cardano-numeric.cabal b/lib/numeric/cardano-numeric.cabal
@@ -59,6 +59,6 @@ test-suite unit
   hs-source-dirs:
       test/unit
   main-is:
-      Main.hs
+      numeric-unit-test.hs
   other-modules:
       Cardano.Numeric.UtilSpec
diff --git a/lib/numeric/test/unit/Main.hs → lib/numeric/test/unit/numeric-unit-test.hs b/lib/numeric/test/unit/Main.hs → lib/numeric/test/unit/numeric-unit-test.hs
diff --git a/lib/shelley/bench/Latency.hs → lib/shelley/bench/latency-bench.hs b/lib/shelley/bench/Latency.hs → lib/shelley/bench/latency-bench.hs
diff --git a/lib/shelley/bench/Restore.hs → lib/shelley/bench/restore-bench.hs b/lib/shelley/bench/Restore.hs → lib/shelley/bench/restore-bench.hs
diff --git a/lib/shelley/cardano-wallet.cabal b/lib/shelley/cardano-wallet.cabal
@@ -245,7 +245,7 @@ test-suite unit
   hs-source-dirs:
       test/unit
   main-is:
-      Main.hs
+      shelley-unit-test.hs
   other-modules:
       Cardano.Wallet.Shelley.CompatibilitySpec
       Cardano.Wallet.Shelley.Compatibility.LedgerSpec
@@ -293,7 +293,7 @@ test-suite integration
   hs-source-dirs:
       test/integration
   main-is:
-      Main.hs
+      shelley-integration-test.hs
   other-modules:
       Cardano.Wallet.Shelley.Faucet
 
@@ -332,7 +332,7 @@ benchmark restore
   hs-source-dirs:
       bench
   main-is:
-      Restore.hs
+      restore-bench.hs
 
 benchmark latency
   default-language:
@@ -368,6 +368,6 @@ benchmark latency
       bench
       test/integration
   main-is:
-      Latency.hs
+      latency-bench.hs
   other-modules:
       Cardano.Wallet.Shelley.Faucet
diff --git a/lib/shelley/test/integration/Main.hs → ...t/integration/shelley-integration-test.hs b/lib/shelley/test/integration/Main.hs → ...t/integration/shelley-integration-test.hs
diff --git a/lib/shelley/test/unit/Main.hs → lib/shelley/test/unit/shelley-unit-test.hs b/lib/shelley/test/unit/Main.hs → lib/shelley/test/unit/shelley-unit-test.hs
diff --git a/lib/test-utils/cardano-wallet-test-utils.cabal b/lib/test-utils/cardano-wallet-test-utils.cabal
@@ -110,6 +110,6 @@ test-suite unit
   hs-source-dirs:
       test
   main-is:
-      Main.hs
+      test-utils-unit-test.hs
   other-modules:
       Test.Hspec.ExtraSpec
diff --git a/lib/test-utils/test/Main.hs → lib/test-utils/test/test-utils-unit-test.hs b/lib/test-utils/test/Main.hs → lib/test-utils/test/test-utils-unit-test.hs
diff --git a/lib/text-class/test/unit/Main.hs → ...t-class/test/unit/text-class-unit-test.hs b/lib/text-class/test/unit/Main.hs → ...t-class/test/unit/text-class-unit-test.hs
diff --git a/lib/text-class/text-class.cabal b/lib/text-class/text-class.cabal
@@ -68,6 +68,6 @@ test-suite unit
   hs-source-dirs:
       test/unit
   main-is:
-      Main.hs
+      text-class-unit-test.hs
   other-modules:
       Data.Text.ClassSpec
diff --git a/nix/materialized/hie-bios/.plan.nix/hie-bios.nix b/nix/materialized/hie-bios/.plan.nix/hie-bios.nix