defaultPluginDescripor - take PluginId as argument

haskell · May 23, 2020 · 1a46b0b · 1a46b0b
1 parent d51c279
commit 1a46b0b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 24 deletions.
diff --git a/src/Ide/Plugin/Brittany.hs b/src/Ide/Plugin/Brittany.hs
@@ -19,9 +19,8 @@ import           System.FilePath
 import           Data.Maybe (maybeToList)
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginFormattingProvider = Just provider
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginFormattingProvider = Just provider
   }
 
 -- | Formatter provider of Brittany.

diff --git a/src/Ide/Plugin/Example.hs b/src/Ide/Plugin/Example.hs
@@ -41,9 +41,8 @@ import Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginRules = exampleRules
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginRules = exampleRules
   , pluginCommands = [PluginCommand "codelens.todo" "example adding" addTodoCmd]
   , pluginCodeActionProvider = Just codeAction
   , pluginCodeLensProvider   = Just codeLens

diff --git a/src/Ide/Plugin/Example2.hs b/src/Ide/Plugin/Example2.hs
@@ -41,9 +41,8 @@ import Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginRules = exampleRules
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginRules = exampleRules
   , pluginCommands = [PluginCommand "codelens.todo" "example adding" addTodoCmd]
   , pluginCodeActionProvider = Just codeAction
   , pluginCodeLensProvider   = Just codeLens

diff --git a/src/Ide/Plugin/Floskell.hs b/src/Ide/Plugin/Floskell.hs
@@ -25,9 +25,8 @@ import           Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginFormattingProvider = Just provider
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginFormattingProvider = Just provider
   }
 
 -- ---------------------------------------------------------------------

diff --git a/src/Ide/Plugin/GhcIde.hs b/src/Ide/Plugin/GhcIde.hs
@@ -20,9 +20,8 @@ import Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginCommands = [PluginCommand (CommandId "typesignature.add") "adds a signature" commandAddSignature]
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginCommands = [PluginCommand (CommandId "typesignature.add") "adds a signature" commandAddSignature]
   , pluginCodeActionProvider = Just codeAction'
   , pluginCodeLensProvider   = Just codeLens'
   , pluginHoverProvider      = Just hover'

diff --git a/src/Ide/Plugin/Ormolu.hs b/src/Ide/Plugin/Ormolu.hs
@@ -29,9 +29,8 @@ import           Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginFormattingProvider = Just provider
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginFormattingProvider = Just provider
   }
 
 -- ---------------------------------------------------------------------

diff --git a/src/Ide/Plugin/Pragmas.hs b/src/Ide/Plugin/Pragmas.hs
@@ -24,9 +24,8 @@ import           Language.Haskell.LSP.Types
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = defaultPluginDescriptor
-  { pluginId = plId
-  , pluginCommands = commands
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginCommands = commands
   , pluginCodeActionProvider = Just codeActionProvider
   }
 

diff --git a/src/Ide/Types.hs b/src/Ide/Types.hs
@@ -63,10 +63,10 @@ data PluginDescriptor =
                    , pluginRenameProvider     :: !(Maybe RenameProvider)
                    }
 
-defaultPluginDescriptor :: PluginDescriptor
-defaultPluginDescriptor =
+defaultPluginDescriptor :: PluginId -> PluginDescriptor
+defaultPluginDescriptor plId =
   PluginDescriptor
-    ""
+    plId
     mempty
     mempty
     Nothing