Skip to content

Commit bfaecfd

Browse files
authored
Delete hls-haddock-comments-plugin, hls-stan-plugin, and hls-tactics-plugin (#3782)
* Delete hls-haddock-comments-plugin * Delete hls-stan-plugin * Delete hls-tactics-plugin * Fix a warning * Delete some wingman stuff * Workflows
1 parent 9871ecb commit bfaecfd

File tree

724 files changed

+2
-23119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

724 files changed

+2
-23119
lines changed

.github/workflows/test.yml

-12
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ jobs:
155155
name: Test hls-eval-plugin
156156
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS"
157157

158-
- if: matrix.test && matrix.ghc != '9.2' && matrix.ghc != '9.4' && matrix.ghc != '9.6'
159-
name: Test hls-haddock-comments-plugin
160-
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
161-
162158
- if: matrix.test
163159
name: Test hls-splice-plugin
164160
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS"
@@ -175,10 +171,6 @@ jobs:
175171
name: Test hls-fourmolu-plugin
176172
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
177173

178-
- if: matrix.test && matrix.ghc != '9.2' && matrix.ghc != '9.4' && matrix.ghc != '9.6'
179-
name: Test hls-tactics-plugin test suite
180-
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
181-
182174
- if: matrix.test
183175
name: Test hls-explicit-imports-plugin test suite
184176
run: cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS"
@@ -195,10 +187,6 @@ jobs:
195187
name: Test hls-hlint-plugin test suite
196188
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
197189

198-
- if: matrix.test && matrix.ghc != '9.0' && matrix.ghc != '9.2' && matrix.ghc != '9.4' && matrix.ghc != '9.6'
199-
name: Test hls-stan-plugin test suite
200-
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-stan-plugin --test-options="$TEST_OPTS"
201-
202190
- if: matrix.test
203191
name: Test hls-module-name-plugin test suite
204192
run: cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || cabal test hls-module-name-plugin --test-options="$TEST_OPTS"

CODEOWNERS

-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
/plugins/hls-floskell-plugin @Ailrun
1818
/plugins/hls-fourmolu-plugin @georgefst
1919
/plugins/hls-gadt-plugin @July541
20-
/plugins/hls-haddock-comments-plugin @berberman @kokobd
2120
/plugins/hls-hlint-plugin @eddiemundo
2221
/plugins/hls-module-name-plugin
2322
/plugins/hls-ormolu-plugin @georgefst
@@ -29,8 +28,6 @@
2928
/plugins/hls-code-range-plugin @kokobd
3029
/plugins/hls-splice-plugin @konn
3130
/plugins/hls-stylish-haskell-plugin @Ailrun
32-
/plugins/hls-tactics-plugin
33-
/plugins/hls-stan-plugin @uhbif19
3431
/plugins/hls-explicit-record-fields-plugin @ozkutuk
3532
/plugins/hls-overloaded-record-dot-plugin @joyfulmantis
3633

bench/config.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ configurations:
205205
# # - ghcide-core # implicitly included in all configurations
206206
# # - ghcide-hover-and-symbols # implicitly included in all configurations
207207
# - ghcide-type-lenses
208-
# - haddockComments
209208
# - hlint
210209
# - importLens
211210
# - moduleName
@@ -215,6 +214,4 @@ configurations:
215214
# - rename
216215
# - retrie
217216
# - splice
218-
# - stan
219217
# # - stylish-haskell
220-
# - tactics

cabal.project

-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ packages:
1010
./hls-test-utils
1111
./plugins/hls-cabal-plugin
1212
./plugins/hls-cabal-fmt-plugin
13-
./plugins/hls-tactics-plugin
1413
./plugins/hls-stylish-haskell-plugin
1514
./plugins/hls-fourmolu-plugin
1615
./plugins/hls-class-plugin
@@ -19,7 +18,6 @@ packages:
1918
./plugins/hls-hlint-plugin
2019
./plugins/hls-rename-plugin
2120
./plugins/hls-retrie-plugin
22-
./plugins/hls-haddock-comments-plugin
2321
./plugins/hls-splice-plugin
2422
./plugins/hls-floskell-plugin
2523
./plugins/hls-pragmas-plugin
@@ -30,7 +28,6 @@ packages:
3028
./plugins/hls-qualify-imported-names-plugin
3129
./plugins/hls-code-range-plugin
3230
./plugins/hls-change-type-signature-plugin
33-
./plugins/hls-stan-plugin
3431
./plugins/hls-gadt-plugin
3532
./plugins/hls-explicit-fixity-plugin
3633
./plugins/hls-explicit-record-fields-plugin

docs/configuration.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,13 @@ Here is a list of the additional settings currently supported by `haskell-langua
5050
Plugins have a generic config to control their behaviour. The schema of such config is:
5151

5252
- `haskell.plugin.${pluginName}.globalOn`: usually with default true. Whether the plugin is enabled at runtime or it is not. That is the option you might use if you want to disable completely a plugin.
53-
- Actual plugin names are: `ghcide-code-actions-fill-holes`, `ghcide-completions`, `ghcide-hover-and-symbols`, `ghcide-type-lenses`, `ghcide-code-actions-type-signatures`, `ghcide-code-actions-bindings`, `ghcide-code-actions-imports-exports`, `eval`, `moduleName`, `pragmas`, `importLens`, `class`, `tactics` (aka wingman), `hlint`, `haddockComments`, `retrie`, `rename`, `splice`, `stan`.
53+
- Actual plugin names are: `ghcide-code-actions-fill-holes`, `ghcide-completions`, `ghcide-hover-and-symbols`, `ghcide-type-lenses`, `ghcide-code-actions-type-signatures`, `ghcide-code-actions-bindings`, `ghcide-code-actions-imports-exports`, `eval`, `moduleName`, `pragmas`, `importLens`, `class`, `hlint`, `retrie`, `rename`, `splice`.
5454
- So to disable the import lens with an explicit list of module definitions you could set `haskell.plugin.importLens.globalOn: false`
5555
- `haskell.plugin.${pluginName}.${lspCapability}On`: usually with default true. Whether a concrete plugin capability is enabled.
5656
- Capabilities are the different ways a lsp server can interact with the editor. The current available capabilities of the server are: `callHierarchy`, `codeActions`, `codeLens`, `diagnostics`, `hover`, `symbols`, `completion`, `rename`.
5757
- Note that usually plugins don't provide all capabilities but some of them or even only one.
5858
- So to disable code changes suggestions from the `hlint` plugin (but no diagnostics) you could set `haskell.plugin.hlint.codeActionsOn: false`
5959
- Plugin specific configuration:
60-
- `tactic` (aka wingman):
61-
- `haskell.plugin.tactics.config.auto_gas`, default 4: The depth of the search tree when performing "Attempt to fill hole". Bigger values will be able to derive more solutions, but will take exponentially more time.
62-
- `haskell.plugin.tactics.config.timeout_duration`, default 2: The timeout for Wingman actions, in seconds.
63-
- `haskell.plugin.tactics.config.hole_severity`, default empty: The severity to use when showing hole diagnostics. These are noisy, but some editors don't allow jumping to all severities. One of `error`, `warning`, `info`, `hint`, `none`.
64-
- `haskell.plugin.tactics.config.max_use_ctor_actions`, default 5: Maximum number of `Use constructor <x>` code actions that can appear.
65-
- `haskell.plugin.tactics.config.proofstate_styling`, default true: Should Wingman emit styling markup when showing metaprogram proof states?
6660
- `eval`:
6761
- `haskell.plugin.eval.config.diff`, default true: When reloading haddock test results in changes, mark it with WAS/NOW.
6862
- `haskell.plugin.eval.config.exception`, default false: When the command results in an exception, mark it with `*** Exception:`.

docs/contributing/contributing.md

-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ pre-commit install
198198

199199
- `test/testdata` and `test/data` are there as we want to test formatting plugins.
200200
- `hie-compat` is there as we want to keep its code as close to GHC as possible.
201-
- `hls-tactics-plugin` is there as the main contributor of the plugin (@isovector) does not want auto-formatting.
202201

203202
## Introduction tutorial
204203

docs/contributing/plugin-tutorial.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ generateLens pId uri minImports (L src imp)
381381
## Wrapping up
382382

383383
There's only one haskell code change left to do at this point: "link" the plugin in the `HlsPlugins` HLS module.
384-
However integrating the plugin in haskell-language-server itself will need some changes in config files. The best way is looking for the id (f.e. `hls-tactics-plugin`) of an existing plugin:
384+
However integrating the plugin in haskell-language-server itself will need some changes in config files. The best way is looking for the id (f.e. `hls-class-plugin`) of an existing plugin:
385385
- `./cabal*.project` and `./stack*.yaml`: add the plugin package in the `packages` field
386386
- `./haskell-language-server.cabal`: add a conditional block with the plugin package dependency
387387
- `./.github/workflows/test.yml`: add a block to run the test suite of the plugin

docs/features.md

-24
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ Provided by: `hls-hlint-plugin`
3838

3939
Provides hlint hints as diagnostics.
4040

41-
### Stan hints
42-
43-
Provided by: `hls-stan-plugin`
44-
45-
Provides Stan hints as diagnostics.
46-
4741
### Cabal parse errors and warnings
4842

4943
Provided by: `hls-cabal-plugin`
@@ -244,24 +238,6 @@ Converts numeric literals to different formats.
244238

245239
![Alternate Number Format Demo](../plugins/hls-alternate-number-format-plugin/HLSAll.gif)
246240

247-
### Add Haddock comments
248-
249-
Provided by: `hls-haddock-comments-plugin`
250-
251-
Code action kind: `quickfix`
252-
253-
Adds Haddock comments for function arguments.
254-
255-
### Wingman
256-
257-
Status: Not supported on GHC 9.2
258-
259-
Provided by: `hls-tactics-plugin`
260-
261-
Provides a variety of code actions for interactive code development, see <https://haskellwingman.dev/> for more details.
262-
263-
![Wingman Demo](https://user-images.githubusercontent.com/307223/92657198-3d4be400-f2a9-11ea-8ad3-f541c8eea891.gif)
264-
265241
### Change Type Signature
266242

267243
Provided by: `hls-change-type-signature-plugin`

docs/support/plugin-support.md

-3
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ For example, a plugin to provide a formatter which has itself been abandoned has
6060
| `hls-ormolu-plugin` | 2 | |
6161
| `hls-rename-plugin` | 2 | |
6262
| `hls-stylish-haskell-plugin` | 2 | |
63-
| `hls-tactics-plugin` | 2 | 9.2, 9.4, 9.6 |
6463
| `hls-overloaded-record-dot-plugin` | 2 | 8.10, 9.0 |
6564
| `hls-floskell-plugin` | 3 | 9.6 |
66-
| `hls-haddock-comments-plugin` | 3 | 9.2, 9.4, 9.6 |
67-
| `hls-stan-plugin` | 3 | 8.6, 9.0, 9.2, 9.4, 9.6 |
6865
| `hls-retrie-plugin` | 3 | |
6966
| `hls-splice-plugin` | 3 | |

haskell-language-server.cabal

-33
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ flag callHierarchy
7979
default: True
8080
manual: True
8181

82-
flag haddockComments
83-
description: Enable haddockComments plugin
84-
default: True
85-
manual: True
86-
8782
flag eval
8883
description: Enable eval plugin
8984
default: True
@@ -104,21 +99,11 @@ flag retrie
10499
default: True
105100
manual: True
106101

107-
flag tactic
108-
description: Enable tactic plugin
109-
default: True
110-
manual: True
111-
112102
flag hlint
113103
description: Enable hlint plugin
114104
default: True
115105
manual: True
116106

117-
flag stan
118-
description: Enable stan plugin
119-
default: True
120-
manual: True
121-
122107
flag moduleName
123108
description: Enable moduleName plugin
124109
default: True
@@ -231,11 +216,6 @@ common callHierarchy
231216
build-depends: hls-call-hierarchy-plugin == 2.2.0.0
232217
cpp-options: -Dhls_callHierarchy
233218

234-
common haddockComments
235-
if flag(haddockComments) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
236-
build-depends: hls-haddock-comments-plugin == 2.2.0.0
237-
cpp-options: -Dhls_haddockComments
238-
239219
common eval
240220
if flag(eval)
241221
build-depends: hls-eval-plugin == 2.2.0.0
@@ -256,21 +236,11 @@ common retrie
256236
build-depends: hls-retrie-plugin == 2.2.0.0
257237
cpp-options: -Dhls_retrie
258238

259-
common tactic
260-
if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
261-
build-depends: hls-tactics-plugin == 2.2.0.0
262-
cpp-options: -Dhls_tactic
263-
264239
common hlint
265240
if flag(hlint)
266241
build-depends: hls-hlint-plugin == 2.2.0.0
267242
cpp-options: -Dhls_hlint
268243

269-
common stan
270-
if flag(stan) && (impl(ghc >= 8.10) && impl(ghc < 9.0))
271-
build-depends: hls-stan-plugin == 2.2.0.0
272-
cpp-options: -Dhls_stan
273-
274244
common moduleName
275245
if flag(moduleName)
276246
build-depends: hls-module-name-plugin == 2.2.0.0
@@ -364,14 +334,11 @@ library
364334
, cabalfmt
365335
, changeTypeSignature
366336
, class
367-
, haddockComments
368337
, eval
369338
, importLens
370339
, rename
371340
, retrie
372-
, tactic
373341
, hlint
374-
, stan
375342
, moduleName
376343
, pragmas
377344
, splice

0 commit comments

Comments
 (0)