From 62d87ac3f70fe0d913aa7be7e1371cf380859a5e Mon Sep 17 00:00:00 2001 From: sir4ur0n Date: Thu, 4 Jun 2020 22:40:47 +0200 Subject: [PATCH] feat(hie-bios): Multi-cradle, ignore directories Related to #121 --- hie.yaml.cbl | 48 ++++++++++++++++++++++++++++++------------------ hie.yaml.stack | 47 ++++++++++++++++++++++++++++++----------------- 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/hie.yaml.cbl b/hie.yaml.cbl index b82a997749e..d851ab9a379 100644 --- 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 index 8f06c91138b..3288a9f3692 100644 --- 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" \ No newline at end of file