diff --git a/docs/support/plugin-support.md b/docs/support/plugin-support.md index c6061ddb33..4fc9538ee3 100644 --- a/docs/support/plugin-support.md +++ b/docs/support/plugin-support.md @@ -47,7 +47,7 @@ For example, a plugin to provide a formatter which has itself been abandoned has | `hls-refactor-plugin` | 2 | 9.12.2 | | `hls-alternate-number-format-plugin` | 2 | | | `hls-cabal-fmt-plugin` | 2 | | -| `hls-cabal-gild-plugin` | 2 | 9.12.2 | +| `hls-cabal-gild-plugin` | 2 | | | `hls-class-plugin` | 2 | | | `hls-change-type-signature-plugin` | 2 | | | `hls-eval-plugin` | 2 | | diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 43f28ee5ed..b9b594a0fa 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -117,7 +117,7 @@ flag cabalfmt manual: True common cabalfmt - if flag(cabalfmt) + if flag(cabalfmt) && flag(cabal) build-depends: haskell-language-server:hls-cabal-fmt-plugin cpp-options: -Dhls_cabalfmt @@ -129,7 +129,7 @@ flag isolateCabalfmtTests library hls-cabal-fmt-plugin import: defaults, pedantic, warnings - if !flag(cabalfmt) + if !flag(cabalfmt) || !flag(cabal) buildable: False exposed-modules: Ide.Plugin.CabalFmt hs-source-dirs: plugins/hls-cabal-fmt-plugin/src @@ -174,7 +174,7 @@ flag cabalgild manual: True common cabalgild - if flag(cabalgild) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds)) + if flag(cabalgild) && flag(cabal) build-depends: haskell-language-server:hls-cabal-gild-plugin cpp-options: -Dhls_cabalgild @@ -186,7 +186,7 @@ flag isolateCabalGildTests library hls-cabal-gild-plugin import: defaults, pedantic, warnings - if !flag(cabalgild) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds)) + if !flag(cabalgild) || !flag(cabal) buildable: False exposed-modules: Ide.Plugin.CabalGild hs-source-dirs: plugins/hls-cabal-gild-plugin/src @@ -203,7 +203,7 @@ library hls-cabal-gild-plugin -- The `hls-cabal-plugin` is needed for tests, as we need to install notification handlers test-suite hls-cabal-gild-plugin-tests import: defaults, pedantic, test-defaults, warnings - if !flag(cabalgild) || !flag(cabal) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds)) + if !flag(cabalgild) || !flag(cabal) buildable: False type: exitcode-stdio-1.0 hs-source-dirs: plugins/hls-cabal-gild-plugin/test diff --git a/test/testdata/schema/ghc912/default-config.golden.json b/test/testdata/schema/ghc912/default-config.golden.json index f890c7e476..dbedec9067 100644 --- a/test/testdata/schema/ghc912/default-config.golden.json +++ b/test/testdata/schema/ghc912/default-config.golden.json @@ -20,6 +20,11 @@ "path": "cabal-fmt" } }, + "cabal-gild": { + "config": { + "path": "cabal-gild" + } + }, "cabalHaskellIntegration": { "globalOn": true }, diff --git a/test/testdata/schema/ghc912/vscode-extension-schema.golden.json b/test/testdata/schema/ghc912/vscode-extension-schema.golden.json index 80035f68cc..937cf4dbf1 100644 --- a/test/testdata/schema/ghc912/vscode-extension-schema.golden.json +++ b/test/testdata/schema/ghc912/vscode-extension-schema.golden.json @@ -11,6 +11,12 @@ "scope": "resource", "type": "string" }, + "haskell.plugin.cabal-gild.config.path": { + "default": "cabal-gild", + "markdownDescription": "Set path to 'cabal-gild' executable", + "scope": "resource", + "type": "string" + }, "haskell.plugin.cabal.codeActionsOn": { "default": true, "description": "Enables cabal code actions",