feat(hie-bios): Multi-cradle, ignore directories

Related to haskell#121
sir4ur0n · Jun 4, 2020 · 62d87ac · 62d87ac
1 parent 2310e10
commit 62d87ac
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 35 deletions.
diff --git a/hie.yaml.cbl b/hie.yaml.cbl
@@ -2,25 +2,37 @@
 # in hie, using cabal as the build system.  To use is, copy it to a
 # file called 'hie.yaml'
 cradle:
-  cabal:
+  multi:
+    - path: "./test/testdata/"
+      config: { cradle: { none:  } }
 
-    - path: "./test/functional/"
-      component: "haskell-language-server:func-test"
+    - path: "./install/"
+      config: { cradle: { none:  } }
 
-    - path: "./test/utils/"
-      component: "haskell-language-server:func-test"
+    - path: "./"
+      config:
+        cradle:
+          cabal:
+            - path: "./test/"
+              component: "haskell-language-server:func-test"
+
+            - path: "./exe/Main.hs"
+              component: "haskell-language-server:exe:haskell-language-server"
+
+            - path: "./exe/Arguments.hs"
+              component: "haskell-language-server:exe:haskell-language-server"
 
-    - path: "./exe/Main.hs"
-      component: "haskell-language-server:exe:haskell-language-server"
+            - path: "./exe/Wrapper.hs"
+              component: "haskell-language-server:exe:haskell-language-server-wrapper"
+
+            - path: "./src"
+              component: "lib:haskell-language-server"
 
-    - path: "./exe/Wrapper.hs"
-      component: "haskell-language-server:exe:haskell-language-server-wrapper"
-
-    - path: "./src"
-      component: "lib:haskell-language-server"
-
-    - path: "./ghcide/src"
-      component: "ghcide:lib:ghcide"
-
-    - path: "./ghcide/exe"
-      component: "ghcide:exe:ghcide"
+            - path: "./.stack-work/"
+              component: "lib:haskell-language-server"
+
+            - path: "./ghcide/src"
+              component: "ghcide:lib:ghcide"
+
+            - path: "./ghcide/exe"
+              component: "ghcide:exe:ghcide"
diff --git a/hie.yaml.stack b/hie.yaml.stack
@@ -2,24 +2,37 @@
 # in hie, using stack as the build system.  To use is, copy it to a
 # file called 'hie.yaml'
 cradle:
-  stack:
-    - path: "./test/functional/"
-      component: "haskell-language-server:func-test"
+  multi:
+    - path: "./test/testdata/"
+      config: { cradle: { none:  } }
 
-    - path: "./test/utils/"
-      component: "haskell-language-server:func-test"
+    - path: "./install/"
+      config: { cradle: { none:  } }
 
-    - path: "./exe/Main.hs"
-      component: "haskell-language-server:exe:haskell-language-server"
+    - path: "./"
+      config:
+        cradle:
+          stack:
+            - path: "./test/"
+              component: "haskell-language-server:func-test"
+
+            - path: "./exe/Main.hs"
+              component: "haskell-language-server:exe:haskell-language-server"
+
+            - path: "./exe/Arguments.hs"
+              component: "haskell-language-server:exe:haskell-language-server"
 
-    - path: "./exe/Wrapper.hs"
-      component: "haskell-language-server:exe:haskell-language-server-wrapper"
+            - path: "./exe/Wrapper.hs"
+              component: "haskell-language-server:exe:haskell-language-server-wrapper"
+
+            - path: "./src"
+              component: "haskell-language-server:lib"
 
-    - path: "./src"
-      component: "haskell-language-server:lib"
-
-    - path: "./ghcide/src"
-      component: "ghcide:lib:ghcide"
-
-    - path: "./ghcide/exe"
-      component: "ghcide:exe:ghcide"
+            - path: "./.stack-work/"
+              component: "haskell-language-server:lib"
+        
+            - path: "./ghcide/src"
+              component: "ghcide:lib:ghcide"
+        
+            - path: "./ghcide/exe"
+              component: "ghcide:exe:ghcide"