Skip to content

Commit dc682ba

Browse files
kokobdkokobd
authored
add a prefix to plugin CPP (#3065)
1 parent 488d287 commit dc682ba

File tree

2 files changed

+76
-77
lines changed

2 files changed

+76
-77
lines changed

Diff for: ‎exe/Plugins.hs

+48-49
Original file line numberDiff line numberDiff line change
@@ -16,101 +16,100 @@ import qualified Ide.Plugin.Example2 as Example2
1616
import qualified Ide.Plugin.ExampleCabal as ExampleCabal
1717

1818
-- haskell-language-server optional plugins
19-
#if qualifyImportedNames
19+
#if hls_qualifyImportedNames
2020
import qualified Ide.Plugin.QualifyImportedNames as QualifyImportedNames
2121
#endif
2222

23-
#if callHierarchy
23+
#if hls_callHierarchy
2424
import qualified Ide.Plugin.CallHierarchy as CallHierarchy
2525
#endif
2626

27-
#if class
27+
#if hls_class
2828
import qualified Ide.Plugin.Class as Class
2929
#endif
3030

31-
#if haddockComments
31+
#if hls_haddockComments
3232
import qualified Ide.Plugin.HaddockComments as HaddockComments
3333
#endif
3434

35-
#if eval
35+
#if hls_eval
3636
import qualified Ide.Plugin.Eval as Eval
3737
#endif
3838

39-
#if importLens
39+
#if hls_importLens
4040
import qualified Ide.Plugin.ExplicitImports as ExplicitImports
4141
#endif
4242

43-
#if refineImports
43+
#if hls_refineImports
4444
import qualified Ide.Plugin.RefineImports as RefineImports
4545
#endif
4646

47-
#if rename
47+
#if hls_rename
4848
import qualified Ide.Plugin.Rename as Rename
4949
#endif
5050

51-
#if retrie
51+
#if hls_retrie
5252
import qualified Ide.Plugin.Retrie as Retrie
5353
#endif
5454

55-
#if tactic
55+
#if hls_tactic
5656
import qualified Ide.Plugin.Tactic as Tactic
5757
#endif
5858

59-
#if hlint
59+
#if hls_hlint
6060
import qualified Ide.Plugin.Hlint as Hlint
6161
#endif
6262

63-
#if stan
63+
#if hls_stan
6464
import qualified Ide.Plugin.Stan as Stan
6565
#endif
6666

67-
68-
#if moduleName
67+
#if hls_moduleName
6968
import qualified Ide.Plugin.ModuleName as ModuleName
7069
#endif
7170

72-
#if pragmas
71+
#if hls_pragmas
7372
import qualified Ide.Plugin.Pragmas as Pragmas
7473
#endif
7574

76-
#if splice
75+
#if hls_splice
7776
import qualified Ide.Plugin.Splice as Splice
7877
#endif
7978

80-
#if alternateNumberFormat
79+
#if hls_alternateNumberFormat
8180
import qualified Ide.Plugin.AlternateNumberFormat as AlternateNumberFormat
8281
#endif
8382

84-
#if codeRange
83+
#if hls_codeRange
8584
import qualified Ide.Plugin.CodeRange as CodeRange
8685
#endif
8786

88-
#if changeTypeSignature
87+
#if hls_changeTypeSignature
8988
import Ide.Plugin.ChangeTypeSignature as ChangeTypeSignature
9089
#endif
9190

92-
#if gadt
91+
#if hls_gadt
9392
import Ide.Plugin.GADT as GADT
9493
#endif
9594
-- formatters
9695

97-
#if floskell
96+
#if hls_floskell
9897
import qualified Ide.Plugin.Floskell as Floskell
9998
#endif
10099

101-
#if fourmolu
100+
#if hls_fourmolu
102101
import qualified Ide.Plugin.Fourmolu as Fourmolu
103102
#endif
104103

105-
#if ormolu
104+
#if hls_ormolu
106105
import qualified Ide.Plugin.Ormolu as Ormolu
107106
#endif
108107

109-
#if stylishHaskell
108+
#if hls_stylishHaskell
110109
import qualified Ide.Plugin.StylishHaskell as StylishHaskell
111110
#endif
112111

113-
#if brittany
112+
#if hls_brittany
114113
import qualified Ide.Plugin.Brittany as Brittany
115114
#endif
116115

@@ -135,76 +134,76 @@ idePlugins recorder includeExamples = pluginDescToIdePlugins allPlugins
135134
then basePlugins ++ examplePlugins
136135
else basePlugins
137136
basePlugins =
138-
#if pragmas
137+
#if hls_pragmas
139138
Pragmas.descriptor "pragmas" :
140139
#endif
141-
#if floskell
140+
#if hls_floskell
142141
Floskell.descriptor "floskell" :
143142
#endif
144-
#if fourmolu
143+
#if hls_fourmolu
145144
Fourmolu.descriptor pluginRecorder "fourmolu" :
146145
#endif
147-
#if tactic
146+
#if hls_tactic
148147
Tactic.descriptor pluginRecorder "tactics" :
149148
#endif
150-
#if ormolu
149+
#if hls_ormolu
151150
Ormolu.descriptor "ormolu" :
152151
#endif
153-
#if stylishHaskell
152+
#if hls_stylishHaskell
154153
StylishHaskell.descriptor "stylish-haskell" :
155154
#endif
156-
#if rename
155+
#if hls_rename
157156
Rename.descriptor "rename" :
158157
#endif
159-
#if retrie
158+
#if hls_retrie
160159
Retrie.descriptor "retrie" :
161160
#endif
162-
#if brittany
161+
#if hls_brittany
163162
Brittany.descriptor "brittany" :
164163
#endif
165-
#if callHierarchy
164+
#if hls_callHierarchy
166165
CallHierarchy.descriptor :
167166
#endif
168-
#if class
167+
#if hls_class
169168
Class.descriptor pluginRecorder "class" :
170169
#endif
171-
#if haddockComments
170+
#if hls_haddockComments
172171
HaddockComments.descriptor "haddockComments" :
173172
#endif
174-
#if eval
173+
#if hls_eval
175174
Eval.descriptor pluginRecorder "eval" :
176175
#endif
177-
#if importLens
176+
#if hls_importLens
178177
ExplicitImports.descriptor pluginRecorder "importLens" :
179178
#endif
180-
#if qualifyImportedNames
179+
#if hls_qualifyImportedNames
181180
QualifyImportedNames.descriptor "qualifyImportedNames" :
182181
#endif
183-
#if refineImports
182+
#if hls_refineImports
184183
RefineImports.descriptor pluginRecorder "refineImports" :
185184
#endif
186-
#if moduleName
185+
#if hls_moduleName
187186
ModuleName.descriptor "moduleName" :
188187
#endif
189-
#if hlint
188+
#if hls_hlint
190189
Hlint.descriptor pluginRecorder "hlint" :
191190
#endif
192-
#if stan
191+
#if hls_stan
193192
Stan.descriptor pluginRecorder "stan" :
194193
#endif
195-
#if splice
194+
#if hls_splice
196195
Splice.descriptor "splice" :
197196
#endif
198-
#if alternateNumberFormat
197+
#if hls_alternateNumberFormat
199198
AlternateNumberFormat.descriptor pluginRecorder :
200199
#endif
201-
#if codeRange
200+
#if hls_codeRange
202201
CodeRange.descriptor pluginRecorder "codeRange" :
203202
#endif
204-
#if changeTypeSignature
203+
#if hls_changeTypeSignature
205204
ChangeTypeSignature.descriptor :
206205
#endif
207-
#if gadt
206+
#if hls_gadt
208207
GADT.descriptor "gadt" :
209208
#endif
210209
-- The ghcide descriptors should come last so that the notification handlers

Diff for: ‎haskell-language-server.cabal

+28-28
Original file line numberDiff line numberDiff line change
@@ -237,124 +237,124 @@ common example-plugins
237237
common class
238238
if flag(class)
239239
build-depends: hls-class-plugin ^>= 1.0
240-
cpp-options: -Dclass
240+
cpp-options: -Dhls_class
241241

242242
common callHierarchy
243243
if flag(callHierarchy)
244244
build-depends: hls-call-hierarchy-plugin ^>= 1.0
245-
cpp-options: -DcallHierarchy
245+
cpp-options: -Dhls_callHierarchy
246246

247247
common haddockComments
248248
if flag(haddockComments) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
249249
build-depends: hls-haddock-comments-plugin ^>= 1.0
250-
cpp-options: -DhaddockComments
250+
cpp-options: -Dhls_haddockComments
251251

252252
common eval
253253
if flag(eval)
254254
build-depends: hls-eval-plugin ^>= 1.2
255-
cpp-options: -Deval
255+
cpp-options: -Dhls_eval
256256

257257
common importLens
258258
if flag(importLens)
259259
build-depends: hls-explicit-imports-plugin ^>= 1.1
260-
cpp-options: -DimportLens
260+
cpp-options: -Dhls_importLens
261261

262262
common refineImports
263263
if flag(refineImports)
264264
build-depends: hls-refine-imports-plugin ^>=1.0
265-
cpp-options: -DrefineImports
265+
cpp-options: -Dhls_refineImports
266266

267267
common rename
268268
if flag(rename)
269269
build-depends: hls-rename-plugin ^>= 1.0
270-
cpp-options: -Drename
270+
cpp-options: -Dhls_rename
271271

272272
common retrie
273273
if flag(retrie) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
274274
build-depends: hls-retrie-plugin ^>= 1.0
275-
cpp-options: -Dretrie
275+
cpp-options: -Dhls_retrie
276276

277277
common tactic
278278
if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
279279
build-depends: hls-tactics-plugin >=1.2.0.0 && <1.7
280-
cpp-options: -Dtactic
280+
cpp-options: -Dhls_tactic
281281

282282
common hlint
283283
if flag(hlint)
284284
build-depends: hls-hlint-plugin ^>= 1.0
285-
cpp-options: -Dhlint
285+
cpp-options: -Dhls_hlint
286286

287287
common stan
288288
if flag(stan) && (impl(ghc >= 8.8) && impl(ghc < 9.0))
289289
build-depends: hls-stan-plugin ^>= 1.0
290-
cpp-options: -Dstan
290+
cpp-options: -Dhls_stan
291291

292292
common moduleName
293293
if flag(moduleName)
294294
build-depends: hls-module-name-plugin ^>= 1.0
295-
cpp-options: -DmoduleName
295+
cpp-options: -Dhls_moduleName
296296

297297
common pragmas
298298
if flag(pragmas)
299299
build-depends: hls-pragmas-plugin ^>= 1.0
300-
cpp-options: -Dpragmas
300+
cpp-options: -Dhls_pragmas
301301

302302
common splice
303303
if flag(splice) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
304304
build-depends: hls-splice-plugin ^>=1.0.0.1
305-
cpp-options: -Dsplice
305+
cpp-options: -Dhls_splice
306306

307307
common alternateNumberFormat
308308
if flag(alternateNumberFormat)
309309
build-depends: hls-alternate-number-format-plugin ^>= 1.1
310-
cpp-options: -DalternateNumberFormat
310+
cpp-options: -Dhls_alternateNumberFormat
311311

312312
common qualifyImportedNames
313313
if flag(qualifyImportedNames)
314314
build-depends: hls-qualify-imported-names-plugin ^>=1.0
315-
cpp-options: -DqualifyImportedNames
315+
cpp-options: -Dhls_qualifyImportedNames
316316

317317
common codeRange
318318
if flag(codeRange)
319319
build-depends: hls-code-range-plugin ^>= 1.0
320-
cpp-options: -DcodeRange
320+
cpp-options: -Dhls_codeRange
321321

322322
common changeTypeSignature
323323
if flag(changeTypeSignature)
324324
build-depends: hls-change-type-signature-plugin ^>= 1.0
325-
cpp-options: -DchangeTypeSignature
325+
cpp-options: -Dhls_changeTypeSignature
326326

327327
common gadt
328328
if flag(gadt)
329329
build-depends: hls-gadt-plugin ^>= 1.0
330-
cpp-options: -Dgadt
330+
cpp-options: -Dhls_gadt
331331

332332
-- formatters
333333

334334
common floskell
335335
if flag(floskell)
336336
build-depends: hls-floskell-plugin ^>= 1.0
337-
cpp-options: -Dfloskell
337+
cpp-options: -Dhls_floskell
338338

339339
common fourmolu
340340
if flag(fourmolu)
341341
build-depends: hls-fourmolu-plugin ^>= 1.0
342-
cpp-options: -Dfourmolu
342+
cpp-options: -Dhls_fourmolu
343343

344344
common ormolu
345345
if flag(ormolu)
346346
build-depends: hls-ormolu-plugin ^>= 1.0
347-
cpp-options: -Dormolu
347+
cpp-options: -Dhls_ormolu
348348

349349
common stylishHaskell
350350
if flag(stylishHaskell)
351351
build-depends: hls-stylish-haskell-plugin ^>= 1.0
352-
cpp-options: -DstylishHaskell
352+
cpp-options: -Dhls_stylishHaskell
353353

354354
common brittany
355355
if flag(brittany) && (impl(ghc < 9.0.2) || flag(ignore-plugins-ghc-bounds))
356356
build-depends: hls-brittany-plugin ^>= 1.0
357-
cpp-options: -Dbrittany
357+
cpp-options: -Dhls_brittany
358358

359359
executable haskell-language-server
360360
import: common-deps
@@ -543,14 +543,14 @@ test-suite func-test
543543

544544
-- Duplicating inclusion plugin conditions until tests are moved to their own packages
545545
if flag(eval)
546-
cpp-options: -Deval
546+
cpp-options: -Dhls_eval
547547
-- formatters
548548
if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
549-
cpp-options: -Dfloskell
549+
cpp-options: -Dhls_floskell
550550
if flag(fourmolu)
551-
cpp-options: -Dfourmolu
551+
cpp-options: -Dhls_fourmolu
552552
if flag(ormolu)
553-
cpp-options: -Dormolu
553+
cpp-options: -Dhls_ormolu
554554

555555
test-suite wrapper-test
556556
import: common-deps

0 commit comments

Comments
 (0)