Merge pull request #123 from pepeiborra/rename-providers

Add plugin support for Rename providers
haskell · May 23, 2020 · 6dc7894 · 6dc7894
2 parents 6c58c2d + 1a46b0b
commit 6dc7894
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 60 deletions.
diff --git a/src/Ide/Plugin.hs b/src/Ide/Plugin.hs
@@ -62,7 +62,8 @@ asGhcIdePlugin mp =
     mkPlugin hoverPlugins          pluginHoverProvider <>
     mkPlugin symbolsPlugins        pluginSymbolsProvider <>
     mkPlugin formatterPlugins      pluginFormattingProvider <>
-    mkPlugin completionsPlugins    pluginCompletionProvider
+    mkPlugin completionsPlugins    pluginCompletionProvider <>
+    mkPlugin renamePlugins         pluginRenameProvider
     where
         justs (p, Just x)  = [(p, x)]
         justs (_, Nothing) = []
@@ -453,6 +454,29 @@ makeSymbols sps lf ideState params
           [] -> return $ Left $ responseError $ T.pack $ show $ lefts mhs
           hs -> return $ Right $ convertSymbols $ concat hs
 
+
+-- ---------------------------------------------------------------------
+-- ---------------------------------------------------------------------
+
+renamePlugins :: [(PluginId, RenameProvider)] -> Plugin Config
+renamePlugins providers = Plugin rules handlers
+  where
+    rules = mempty
+    handlers = PartialHandlers $ \WithMessage{..} x -> return x
+      { LSP.renameHandler = withResponse RspRename (renameWith providers)}
+
+renameWith ::
+  [(PluginId, RenameProvider)] ->
+  LSP.LspFuncs Config ->
+  IdeState ->
+  RenameParams ->
+  IO (Either ResponseError WorkspaceEdit)
+renameWith providers lspFuncs state params = do
+    results <- mapM (\(_,p) -> p lspFuncs state params) providers
+    case partitionEithers results of
+        (errors, []) -> return $ Left $ responseError $ T.pack $ show $ errors
+        (_, edits) -> return $ Right $ mconcat edits
+
 -- ---------------------------------------------------------------------
 -- ---------------------------------------------------------------------
 

diff --git a/src/Ide/Plugin/Brittany.hs b/src/Ide/Plugin/Brittany.hs
@@ -19,17 +19,8 @@ import           System.FilePath
 import           Data.Maybe (maybeToList)
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = mempty
-  , pluginCommands = []
-  , pluginCodeActionProvider = Nothing
-  , pluginCodeLensProvider   = Nothing
-  , pluginDiagnosticProvider = Nothing
-  , pluginHoverProvider      = Nothing
-  , pluginSymbolsProvider    = Nothing
-  , pluginFormattingProvider = Just provider
-  , pluginCompletionProvider = Nothing
+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,16 +41,13 @@ import Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = exampleRules
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginRules = exampleRules
   , pluginCommands = [PluginCommand "codelens.todo" "example adding" addTodoCmd]
   , pluginCodeActionProvider = Just codeAction
   , pluginCodeLensProvider   = Just codeLens
-  , pluginDiagnosticProvider = Nothing
   , pluginHoverProvider      = Just hover
   , pluginSymbolsProvider    = Just symbols
-  , pluginFormattingProvider = Nothing
   , pluginCompletionProvider = Just completion
   }
 

diff --git a/src/Ide/Plugin/Example2.hs b/src/Ide/Plugin/Example2.hs
@@ -41,16 +41,13 @@ import Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = exampleRules
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginRules = exampleRules
   , pluginCommands = [PluginCommand "codelens.todo" "example adding" addTodoCmd]
   , pluginCodeActionProvider = Just codeAction
   , pluginCodeLensProvider   = Just codeLens
-  , pluginDiagnosticProvider = Nothing
   , pluginHoverProvider      = Just hover
   , pluginSymbolsProvider    = Just symbols
-  , pluginFormattingProvider = Nothing
   , pluginCompletionProvider = Just completion
   }
 

diff --git a/src/Ide/Plugin/Floskell.hs b/src/Ide/Plugin/Floskell.hs
@@ -25,17 +25,8 @@ import           Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = mempty
-  , pluginCommands = []
-  , pluginCodeActionProvider = Nothing
-  , pluginCodeLensProvider   = Nothing
-  , pluginDiagnosticProvider = Nothing
-  , pluginHoverProvider      = Nothing
-  , pluginSymbolsProvider    = Nothing
-  , pluginFormattingProvider = Just provider
-  , pluginCompletionProvider = Nothing
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginFormattingProvider = Just provider
   }
 
 -- ---------------------------------------------------------------------

diff --git a/src/Ide/Plugin/GhcIde.hs b/src/Ide/Plugin/GhcIde.hs
@@ -20,16 +20,12 @@ import Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = mempty
-  , 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'
-  , pluginDiagnosticProvider = Nothing
   , pluginHoverProvider      = Just hover'
   , pluginSymbolsProvider    = Just symbolsProvider
-  , pluginFormattingProvider = Nothing
   , pluginCompletionProvider = Just getCompletionsLSP
   }
 

diff --git a/src/Ide/Plugin/Ormolu.hs b/src/Ide/Plugin/Ormolu.hs
@@ -29,17 +29,8 @@ import           Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = mempty
-  , pluginCommands = []
-  , pluginCodeActionProvider = Nothing
-  , pluginCodeLensProvider   = Nothing
-  , pluginDiagnosticProvider = Nothing
-  , pluginHoverProvider      = Nothing
-  , pluginSymbolsProvider    = Nothing
-  , pluginFormattingProvider = Just provider
-  , pluginCompletionProvider = Nothing
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginFormattingProvider = Just provider
   }
 
 -- ---------------------------------------------------------------------

diff --git a/src/Ide/Plugin/Pragmas.hs b/src/Ide/Plugin/Pragmas.hs
@@ -24,17 +24,9 @@ import           Language.Haskell.LSP.Types
 -- ---------------------------------------------------------------------
 
 descriptor :: PluginId -> PluginDescriptor
-descriptor plId = PluginDescriptor
-  { pluginId = plId
-  , pluginRules = mempty
-  , pluginCommands = commands
+descriptor plId = (defaultPluginDescriptor plId)
+  { pluginCommands = commands
   , pluginCodeActionProvider = Just codeActionProvider
-  , pluginCodeLensProvider   = Nothing
-  , pluginDiagnosticProvider = Nothing
-  , pluginHoverProvider = Nothing
-  , pluginSymbolsProvider = Nothing
-  , pluginFormattingProvider = Nothing
-  , pluginCompletionProvider = Nothing
   }
 
 -- ---------------------------------------------------------------------

diff --git a/src/Ide/Types.hs b/src/Ide/Types.hs
@@ -1,10 +1,12 @@
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Ide.Types
     (
       IdePlugins(..)
     , PluginDescriptor(..)
+    , defaultPluginDescriptor
     , PluginCommand(..)
     , PluginId(..)
     , CommandId(..)
@@ -19,6 +21,7 @@ module Ide.Types
     , CommandFunction
     , ExecuteCommandProvider
     , CompletionProvider
+    , RenameProvider
     , WithSnippets(..)
     ) where
 
@@ -57,8 +60,24 @@ data PluginDescriptor =
                    , pluginSymbolsProvider    :: !(Maybe SymbolsProvider)
                    , pluginFormattingProvider :: !(Maybe (FormattingProvider IO))
                    , pluginCompletionProvider :: !(Maybe CompletionProvider)
+                   , pluginRenameProvider     :: !(Maybe RenameProvider)
                    }
 
+defaultPluginDescriptor :: PluginId -> PluginDescriptor
+defaultPluginDescriptor plId =
+  PluginDescriptor
+    plId
+    mempty
+    mempty
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+
 -- instance Show PluginCommand where
 --   show (PluginCommand i _ _) = "PluginCommand { name = " ++ show i ++ " }"
 
@@ -112,6 +131,11 @@ type CodeLensProvider = LSP.LspFuncs Config
                       -> CodeLensParams
                       -> IO (Either ResponseError (List CodeLens))
 
+type RenameProvider = LSP.LspFuncs Config
+                    -> IdeState
+                    -> RenameParams
+                    -> IO (Either ResponseError WorkspaceEdit)
+
 type DiagnosticProviderFuncSync
   = DiagnosticTrigger -> Uri
   -> IO (Either ResponseError (Map.Map Uri (S.Set Diagnostic)))