Bringing in ability to select provider.

Needs haskell/ghcide#412 to land first, as a basis
for the needed changes

Author: alanz

src/Ide/Plugin/Config.hs

@@ -63,6 +63,7 @@ instance Default Config where
     , formatOnImportOn            = True
     -- , formattingProvider          = "brittany"
     , formattingProvider          = "ormolu"
+    -- , formattingProvider          = "floskell"
     }
 
 -- TODO: Add API for plugins to expose their own LSP config options

src/Ide/Plugin/Formatter.hs

@@ -34,7 +34,7 @@ import           Text.Regex.TDFA.Text()
 -- ---------------------------------------------------------------------
 
 formatterPlugins :: [(T.Text, FormattingProvider IO)] -> Plugin Config
-formatterPlugins providers = Plugin rules (handlers (Map.fromList providers))
+formatterPlugins providers = Plugin rules (handlers (Map.fromList (("none",noneProvider):providers)))
 
 -- ---------------------------------------------------------------------
 -- New style plugin
@@ -50,14 +50,6 @@ handlers providers = PartialHandlers $ \WithMessage{..} x -> return x
         = withResponse RspDocumentRangeFormatting (rangeFormatting providers)
     }
 
--- handlers :: FormattingProvider IO -> T.Text -> PartialHandlers c
--- handlers provider configName = PartialHandlers $ \WithMessage{..} x -> return x
---     { LSP.documentFormattingHandler
---         = withResponse RspDocumentFormatting (formatting provider configName)
---     , LSP.documentRangeFormattingHandler
---         = withResponse RspDocumentRangeFormatting (rangeFormatting provider configName)
---     }
-
 -- ---------------------------------------------------------------------
 
 formatting :: Map.Map T.Text (FormattingProvider IO)
@@ -118,6 +110,11 @@ type FormattingProvider m
 
 -- ---------------------------------------------------------------------
 
+noneProvider :: FormattingProvider IO
+noneProvider _ _ _ _ _ = return $ Right (List [])
+
+-- ---------------------------------------------------------------------
+
 responseError :: T.Text -> ResponseError
 responseError txt = ResponseError InvalidParams txt Nothing
 

src/Ide/Plugin/Ormolu.hs

@@ -108,7 +108,7 @@ provider ideState typ contents fp _ = do
   ret r (Right new) = Right (List [TextEdit r new])
 
 #else
-provider _ _ _ _ = return $ IdeResultOk [] -- NOP formatter
+provider _ _ _ _ = return $ Right [] -- NOP formatter
 #endif
 
 -- ---------------------------------------------------------------------

test/functional/FormatSpec.hs

@@ -35,35 +35,38 @@ spec = do
       -- formatRange doc (FormattingOptions 5 True) (Range (Position 4 0) (Position 7 19))
       -- documentContents doc >>= liftIO . (`shouldBe` formattedRangeTabSize5)
 
-  -- describe "formatting provider" $ do
-  --   let formatLspConfig provider =
-  --         object [ "languageServerHaskell" .= object ["formattingProvider" .= (provider :: Value)] ]
-  --       formatConfig provider = defaultConfig { lspConfig = Just (formatLspConfig provider) }
+  describe "formatting provider" $ do
+    let formatLspConfig provider =
+          object [ "languageServerHaskell" .= object ["formattingProvider" .= (provider :: Value)] ]
+        formatConfig provider = defaultConfig { lspConfig = Just (formatLspConfig provider) }
 
-  --   it "respects none" $ runSessionWithConfig (formatConfig "none") hieCommand fullCaps "test/testdata" $ do
-  --     doc <- openDoc "Format.hs" "haskell"
-  --     orig <- documentContents doc
+    it "respects none" $ runSessionWithConfig (formatConfig "none") hieCommand fullCaps "test/testdata" $ do
+      doc <- openDoc "Format.hs" "haskell"
+      orig <- documentContents doc
 
-  --     formatDoc doc (FormattingOptions 2 True)
-  --     documentContents doc >>= liftIO . (`shouldBe` orig)
+      formatDoc doc (FormattingOptions 2 True)
+      documentContents doc >>= liftIO . (`shouldBe` orig)
 
-  --     formatRange doc (FormattingOptions 2 True) (Range (Position 1 0) (Position 3 10))
-  --     documentContents doc >>= liftIO . (`shouldBe` orig)
+      formatRange doc (FormattingOptions 2 True) (Range (Position 1 0) (Position 3 10))
+      documentContents doc >>= liftIO . (`shouldBe` orig)
 
-  --   it "can change on the fly" $ runSession hieCommand fullCaps "test/testdata" $ do
-  --     doc <- openDoc "Format.hs" "haskell"
+    it "can change on the fly" $ runSession hieCommand fullCaps "test/testdata" $ do
+      doc <- openDoc "Format.hs" "haskell"
 
-  --     sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
-  --     formatDoc doc (FormattingOptions 2 True)
-  --     documentContents doc >>= liftIO . (`shouldBe` formattedDocTabSize2)
+      sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "ormolu"))
+      formatDoc doc (FormattingOptions 2 True)
+      documentContents doc >>= liftIO . (`shouldBe` formattedDocOrmolu)
+      -- sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
+      -- formatDoc doc (FormattingOptions 2 True)
+      -- documentContents doc >>= liftIO . (`shouldBe` formattedDocTabSize2)
 
-  --     sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "floskell"))
-  --     formatDoc doc (FormattingOptions 2 True)
-  --     documentContents doc >>= liftIO . (`shouldBe` formattedFloskell)
+      sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "floskell"))
+      formatDoc doc (FormattingOptions 2 True)
+      documentContents doc >>= liftIO . (`shouldBe` formattedFloskell)
 
-  --     sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
-  --     formatDoc doc (FormattingOptions 2 True)
-  --     documentContents doc >>= liftIO . (`shouldBe` formattedBrittanyPostFloskell)
+      sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
+      formatDoc doc (FormattingOptions 2 True)
+      documentContents doc >>= liftIO . (`shouldBe` formattedBrittanyPostFloskell)
 
   -- describe "brittany" $ do
   --   it "formats a document with LF endings" $ runSession hieCommand fullCaps "test/testdata" $ do