From 6cc853aa46c4f960e2f89e954a9ac641f5e2b656 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Mon, 14 Dec 2020 14:04:35 +0800 Subject: [PATCH 1/4] Update hie.yaml --- hie.yaml.cbl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hie.yaml.cbl b/hie.yaml.cbl index 98e66395ac..6faa97ebbb 100644 --- a/hie.yaml.cbl +++ b/hie.yaml.cbl @@ -48,3 +48,6 @@ cradle: - path: "./plugins/hls-hlint-plugin/src" component: "lib:hls-hlint-plugin" + + - path: "./plugins/hls-retrie-plugin/src" + component: "lib:hls-retrie-plugin" From bab10e84bdeac6dca43b12005de2ad2f611c5446 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Mon, 14 Dec 2020 14:10:03 +0800 Subject: [PATCH 2/4] Remove invalid links in package description of tactics plugin --- plugins/tactics/hls-tactics-plugin.cabal | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/tactics/hls-tactics-plugin.cabal b/plugins/tactics/hls-tactics-plugin.cabal index 8c6ba50d0d..bc5a4b03f1 100644 --- a/plugins/tactics/hls-tactics-plugin.cabal +++ b/plugins/tactics/hls-tactics-plugin.cabal @@ -2,12 +2,8 @@ cabal-version: 2.2 category: Development name: hls-tactics-plugin version: 0.5.1.0 -synopsis: LSP server for GHC -description: - Please see the README on GitHub at - -homepage: https://github.com/isovector/hls-tactics-plugin#readme -bug-reports: https://github.com/isovector/hls-tactics-plugin/issues +synopsis: Tactics plugin for Haskell Language Server +description: Please see README.md author: Sandy Maguire, Reed Mullanix maintainer: sandy@sandymaguire.me copyright: Sandy Maguire, Reed Mullanix @@ -23,10 +19,6 @@ flag pedantic default: False manual: True -source-repository head - type: git - location: https://github.com/isovector/hls-tactics-plugin - library hs-source-dirs: src exposed-modules: From 76161d7ec1b4aa82ba66a74a280f96b487ec4717 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Mon, 14 Dec 2020 16:36:21 +0800 Subject: [PATCH 3/4] Rename hie.yaml.* to hie-*.yaml --- README.md | 10 +++++----- hie.yaml.cbl => hie-cabal.yaml | 0 hie.yaml.stack => hie-stack.yaml | 0 install/{hie.yaml.cbl => hie-cabal.yaml} | 0 install/{hie.yaml.stack => hie-stack.yaml} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename hie.yaml.cbl => hie-cabal.yaml (100%) rename hie.yaml.stack => hie-stack.yaml (100%) rename install/{hie.yaml.cbl => hie-cabal.yaml} (100%) rename install/{hie.yaml.stack => hie-stack.yaml} (100%) diff --git a/README.md b/README.md index 05b600b708..0cf75cd661 100644 --- a/README.md +++ b/README.md @@ -685,16 +685,16 @@ templates. #### Using Cabal ```shell -$ cp hie.yaml.cbl hie.yaml -$ cp install/hie.yaml.cbl install/hie.yaml +$ cp hie-cabal.yaml hie.yaml +$ cp install/hie-cabal.yaml install/hie.yaml ``` #### Using Stack ```shell -$ cp hie.yaml.stack hie.yaml -$ cp install/hie.yaml.stack install/hie.yaml -$ cp ghcide/hie.yaml.stack ghcide/hie.yaml +$ cp hie-stack.yaml hie.yaml +$ cp install/hie-stack.yaml install/hie.yaml +$ cp ghcide/hie-stack.yaml ghcide/hie.yaml $ stack build --test --no-run-tests $ cd install $ stack build diff --git a/hie.yaml.cbl b/hie-cabal.yaml similarity index 100% rename from hie.yaml.cbl rename to hie-cabal.yaml diff --git a/hie.yaml.stack b/hie-stack.yaml similarity index 100% rename from hie.yaml.stack rename to hie-stack.yaml diff --git a/install/hie.yaml.cbl b/install/hie-cabal.yaml similarity index 100% rename from install/hie.yaml.cbl rename to install/hie-cabal.yaml diff --git a/install/hie.yaml.stack b/install/hie-stack.yaml similarity index 100% rename from install/hie.yaml.stack rename to install/hie-stack.yaml From 2fd380d62bd31cd9a565058c9a5fda4c779000e0 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Mon, 14 Dec 2020 21:43:25 +0800 Subject: [PATCH 4/4] Update hie.yaml --- hie-cabal.yaml | 20 ++++++++++++++------ hie-stack.yaml | 8 +++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/hie-cabal.yaml b/hie-cabal.yaml index 6faa97ebbb..c62c4307e7 100644 --- a/hie-cabal.yaml +++ b/hie-cabal.yaml @@ -25,9 +25,6 @@ cradle: - path: "./plugins/default/src" component: "haskell-language-server:exe:haskell-language-server" - - path: "./plugins/tactics/src" - component: "lib:hls-tactics-plugin" - - path: "./exe/Wrapper.hs" component: "haskell-language-server:exe:haskell-language-server-wrapper" @@ -44,10 +41,21 @@ cradle: component: "ghcide:exe:ghcide" - path: "./hls-plugin-api/src" - component: "hls-plugin-api:lib:hls-plugin-api" + component: "hls-plugin-api" + +# Plugins: + + - path: "./plugins/tactics/src" + component: "hls-tactics-plugin:lib:hls-tactics-plugin" + + - path: "./plugins/tactics/test" + component: "hls-tactics-plugin:test:tests" - path: "./plugins/hls-hlint-plugin/src" - component: "lib:hls-hlint-plugin" + component: "hls-hlint-plugin" - path: "./plugins/hls-retrie-plugin/src" - component: "lib:hls-retrie-plugin" + component: "hls-retrie-plugin" + + - path: "./plugins/hls-explicit-imports-plugin/src" + component: "hls-explicit-imports-plugin" diff --git a/hie-stack.yaml b/hie-stack.yaml index 21b8c53269..abd01fad4a 100644 --- a/hie-stack.yaml +++ b/hie-stack.yaml @@ -36,15 +36,17 @@ cradle: - path: "./test/wrapper" component: "haskell-language-server:test:wrapper-test" + - path: "./hls-plugin-api/src" + component: "hls-plugin-api:lib" + +# Plugins: + - path: "./plugins/hls-explicit-imports-plugin/src" component: "hls-explicit-imports-plugin:lib" - path: "./plugins/hls-hlint-plugin/src" component: "hls-hlint-plugin:lib" - - path: "./hls-plugin-api/src" - component: "hls-plugin-api:lib" - - path: "./plugins/hls-retrie-plugin/src" component: "hls-retrie-plugin:lib"