From 78af6e1afea5c059aa54297544edf04b237c11b4 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sat, 9 Jan 2021 10:42:07 +0000 Subject: [PATCH 1/5] Automatic flags for packaged plugins --- haskell-language-server.cabal | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 5526d3b3a0..3d55d438de 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -90,37 +90,37 @@ flag all-formatters flag class description: Enable class plugin default: False - manual: True + manual: False flag haddockComments description: Enable haddockComments plugin default: False - manual: True + manual: False flag eval description: Enable eval plugin default: False - manual: True + manual: False flag importLens description: Enable importLens plugin default: False - manual: True + manual: False flag retrie description: Enable retrie plugin default: False - manual: True + manual: False flag tactic description: Enable tactic plugin default: False - manual: True + manual: False flag hlint description: Enable hlint plugin default: False - manual: True + manual: False flag moduleName description: Enable moduleName plugin @@ -135,7 +135,7 @@ flag pragmas flag splice description: Enable splice plugin default: False - manual: True + manual: False -- formatters From 95facc8bf366cb65ccbc1af976f557968abc17be Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sat, 9 Jan 2021 10:54:31 +0000 Subject: [PATCH 2/5] Default all-* flags to false --- haskell-language-server.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 3d55d438de..bb08098d36 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -79,12 +79,12 @@ library flag all-plugins description: Enable all non formatter plugins - default: True + default: False manual: True flag all-formatters description: Enable all fomatters - default: True + default: False manual: True flag class From 758e4a095a50c11dc4fb566888f23c6f06ce8e6d Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sat, 9 Jan 2021 10:55:53 +0000 Subject: [PATCH 3/5] Default individual plugin flags to True --- haskell-language-server.cabal | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index bb08098d36..329c2f232f 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -89,79 +89,79 @@ flag all-formatters flag class description: Enable class plugin - default: False + default: True manual: False flag haddockComments description: Enable haddockComments plugin - default: False + default: True manual: False flag eval description: Enable eval plugin - default: False + default: True manual: False flag importLens description: Enable importLens plugin - default: False + default: True manual: False flag retrie description: Enable retrie plugin - default: False + default: True manual: False flag tactic description: Enable tactic plugin - default: False + default: True manual: False flag hlint description: Enable hlint plugin - default: False + default: True manual: False flag moduleName description: Enable moduleName plugin - default: False + default: True manual: True flag pragmas description: Enable pragmas plugin - default: False + default: True manual: True flag splice description: Enable splice plugin - default: False + default: True manual: False -- formatters flag floskell description: Enable floskell plugin - default: False + default: True manual: True flag fourmolu description: Enable fourmolu plugin - default: False + default: True manual: True flag ormolu description: Enable ormolu plugin - default: False + default: True manual: True flag stylishHaskell description: Enable stylishHaskell plugin - default: False + default: True manual: True flag brittany description: Enable brittany plugin - default: False + default: True manual: True common example-plugins From 4f7449d96ab90c642e5de2206b398eee98c79e99 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sat, 9 Jan 2021 11:04:37 +0000 Subject: [PATCH 4/5] Add maintainer comments --- haskell-language-server.cabal | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 329c2f232f..a81928262e 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -77,6 +77,12 @@ library default-language: Haskell2010 +-- Plugin flags are designed for 'cabal install haskell-language-server': +-- - Packaged plugins should be manual:False +-- - Non packaged plugins and bulk flags should be manual:True +-- - Bulk flags should be default:False +-- - Individual flags should be default:True + flag all-plugins description: Enable all non formatter plugins default: False From 58d1e8142a052cca4dc324b00c4ac9b65dd26371 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sat, 9 Jan 2021 12:57:33 +0000 Subject: [PATCH 5/5] Add upper base bounds to all plugin packages --- plugins/hls-class-plugin/hls-class-plugin.cabal | 2 +- plugins/hls-eval-plugin/hls-eval-plugin.cabal | 2 +- .../hls-explicit-imports-plugin.cabal | 2 +- .../hls-haddock-comments-plugin.cabal | 2 +- plugins/hls-hlint-plugin/hls-hlint-plugin.cabal | 2 +- plugins/hls-retrie-plugin/hls-retrie-plugin.cabal | 2 +- plugins/hls-splice-plugin/hls-splice-plugin.cabal | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index b626d65db4..74e0604a0e 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -13,7 +13,7 @@ library exposed-modules: Ide.Plugin.Class hs-source-dirs: src build-depends: aeson - , base + , base >=4.12 && <5 , containers , haskell-lsp , hls-plugin-api diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal index 90fe98ddc1..1cfffd9b51 100644 --- a/plugins/hls-eval-plugin/hls-eval-plugin.cabal +++ b/plugins/hls-eval-plugin/hls-eval-plugin.cabal @@ -25,7 +25,7 @@ library build-depends: , aeson - , base + , base >=4.12 && <5 , containers , deepseq , Diff diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal index a072f80541..33c00f413f 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -16,7 +16,7 @@ library exposed-modules: Ide.Plugin.ExplicitImports hs-source-dirs: src build-depends: aeson - , base + , base >=4.12 && <5 , containers , deepseq , haskell-lsp-types diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal index 1ac864aab1..fb22f2aafe 100644 --- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal +++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal @@ -18,7 +18,7 @@ library hs-source-dirs: src ghc-options: -Wall -Wno-name-shadowing -Wredundant-constraints build-depends: - , base + , base >=4.12 && <5 , containers , ghc , ghc-exactprint diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index 92862a5758..33ed1e74ab 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -28,7 +28,7 @@ library build-depends: , aeson , apply-refact - , base + , base >=4.12 && <5 , binary , bytestring , containers diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index df0e8d6fe9..521b8c1e0f 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -16,7 +16,7 @@ library exposed-modules: Ide.Plugin.Retrie hs-source-dirs: src build-depends: aeson - , base + , base >=4.12 && <5 , containers , deepseq , directory diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index 41d7a0e3f2..ba187f26cc 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -15,7 +15,7 @@ library other-modules: Ide.Plugin.Splice.Types hs-source-dirs: src build-depends: aeson - , base + , base >=4.12 && <5 , containers , foldl , haskell-lsp