Skip to content

Commit 1a46b0b

Browse files
committed
defaultPluginDescripor - take PluginId as argument
1 parent d51c279 commit 1a46b0b

File tree

8 files changed

+17
-24
lines changed

8 files changed

+17
-24
lines changed

src/Ide/Plugin/Brittany.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ import System.FilePath
1919
import Data.Maybe (maybeToList)
2020

2121
descriptor :: PluginId -> PluginDescriptor
22-
descriptor plId = defaultPluginDescriptor
23-
{ pluginId = plId
24-
, pluginFormattingProvider = Just provider
22+
descriptor plId = (defaultPluginDescriptor plId)
23+
{ pluginFormattingProvider = Just provider
2524
}
2625

2726
-- | Formatter provider of Brittany.

src/Ide/Plugin/Example.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ import Text.Regex.TDFA.Text()
4141
-- ---------------------------------------------------------------------
4242

4343
descriptor :: PluginId -> PluginDescriptor
44-
descriptor plId = defaultPluginDescriptor
45-
{ pluginId = plId
46-
, pluginRules = exampleRules
44+
descriptor plId = (defaultPluginDescriptor plId)
45+
{ pluginRules = exampleRules
4746
, pluginCommands = [PluginCommand "codelens.todo" "example adding" addTodoCmd]
4847
, pluginCodeActionProvider = Just codeAction
4948
, pluginCodeLensProvider = Just codeLens

src/Ide/Plugin/Example2.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ import Text.Regex.TDFA.Text()
4141
-- ---------------------------------------------------------------------
4242

4343
descriptor :: PluginId -> PluginDescriptor
44-
descriptor plId = defaultPluginDescriptor
45-
{ pluginId = plId
46-
, pluginRules = exampleRules
44+
descriptor plId = (defaultPluginDescriptor plId)
45+
{ pluginRules = exampleRules
4746
, pluginCommands = [PluginCommand "codelens.todo" "example adding" addTodoCmd]
4847
, pluginCodeActionProvider = Just codeAction
4948
, pluginCodeLensProvider = Just codeLens

src/Ide/Plugin/Floskell.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ import Text.Regex.TDFA.Text()
2525
-- ---------------------------------------------------------------------
2626

2727
descriptor :: PluginId -> PluginDescriptor
28-
descriptor plId = defaultPluginDescriptor
29-
{ pluginId = plId
30-
, pluginFormattingProvider = Just provider
28+
descriptor plId = (defaultPluginDescriptor plId)
29+
{ pluginFormattingProvider = Just provider
3130
}
3231

3332
-- ---------------------------------------------------------------------

src/Ide/Plugin/GhcIde.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import Text.Regex.TDFA.Text()
2020
-- ---------------------------------------------------------------------
2121

2222
descriptor :: PluginId -> PluginDescriptor
23-
descriptor plId = defaultPluginDescriptor
24-
{ pluginId = plId
25-
, pluginCommands = [PluginCommand (CommandId "typesignature.add") "adds a signature" commandAddSignature]
23+
descriptor plId = (defaultPluginDescriptor plId)
24+
{ pluginCommands = [PluginCommand (CommandId "typesignature.add") "adds a signature" commandAddSignature]
2625
, pluginCodeActionProvider = Just codeAction'
2726
, pluginCodeLensProvider = Just codeLens'
2827
, pluginHoverProvider = Just hover'

src/Ide/Plugin/Ormolu.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ import Text.Regex.TDFA.Text()
2929
-- ---------------------------------------------------------------------
3030

3131
descriptor :: PluginId -> PluginDescriptor
32-
descriptor plId = defaultPluginDescriptor
33-
{ pluginId = plId
34-
, pluginFormattingProvider = Just provider
32+
descriptor plId = (defaultPluginDescriptor plId)
33+
{ pluginFormattingProvider = Just provider
3534
}
3635

3736
-- ---------------------------------------------------------------------

src/Ide/Plugin/Pragmas.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ import Language.Haskell.LSP.Types
2424
-- ---------------------------------------------------------------------
2525

2626
descriptor :: PluginId -> PluginDescriptor
27-
descriptor plId = defaultPluginDescriptor
28-
{ pluginId = plId
29-
, pluginCommands = commands
27+
descriptor plId = (defaultPluginDescriptor plId)
28+
{ pluginCommands = commands
3029
, pluginCodeActionProvider = Just codeActionProvider
3130
}
3231

src/Ide/Types.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ data PluginDescriptor =
6363
, pluginRenameProvider :: !(Maybe RenameProvider)
6464
}
6565

66-
defaultPluginDescriptor :: PluginDescriptor
67-
defaultPluginDescriptor =
66+
defaultPluginDescriptor :: PluginId -> PluginDescriptor
67+
defaultPluginDescriptor plId =
6868
PluginDescriptor
69-
""
69+
plId
7070
mempty
7171
mempty
7272
Nothing

0 commit comments

Comments
 (0)