Add cabal-gild as a cabal file formatter plugin #4101
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -145,6 +145,56 @@ test-suite hls-cabal-fmt-plugin-tests | |
| if flag(isolateCabalfmtTests) | ||
| build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6 | ||
|
|
||
| ----------------------------- | ||
| -- cabal-gild plugin | ||
| ----------------------------- | ||
|
|
||
| flag cabalgild | ||
| description: Enable cabal-gild plugin | ||
| default: True | ||
| manual: True | ||
|
|
||
| common cabalgild | ||
| if flag(cabalgild) | ||
| build-depends: haskell-language-server:hls-cabal-gild-plugin | ||
| cpp-options: -Dhls_cabalgild | ||
|
|
||
| flag isolateCabalGildTests | ||
| description: Should tests search for 'cabal-gild' on the $PATH or shall we install it via build-tool-depends? | ||
| -- By default, search on the PATH | ||
| default: False | ||
| manual: True | ||
|
|
||
| library hls-cabal-gild-plugin | ||
| import: defaults, pedantic, warnings | ||
| exposed-modules: Ide.Plugin.CabalGild | ||
| hs-source-dirs: plugins/hls-cabal-gild-plugin/src | ||
| build-depends: | ||
| , base >=4.12 && <5 | ||
| , directory | ||
| , filepath | ||
| , ghcide == 2.7.0.0 | ||
| , hls-plugin-api == 2.7.0.0 | ||
| , lsp-types | ||
| , text | ||
| , mtl | ||
| , process-extras | ||
|
|
||
| test-suite hls-cabal-gild-plugin-tests | ||
| import: defaults, pedantic, test-defaults, warnings | ||
| type: exitcode-stdio-1.0 | ||
| hs-source-dirs: plugins/hls-cabal-gild-plugin/test | ||
| main-is: Main.hs | ||
| build-depends: | ||
| , base | ||
| , directory | ||
| , filepath | ||
| , haskell-language-server:hls-cabal-gild-plugin | ||
| , hls-test-utils == 2.7.0.0 | ||
|
|
||
| if flag(isolateCabalGildTests) | ||
| build-tool-depends: cabal-gild:cabal-gild ^>=1.1 | ||
|
There was a problem hiding this comment. Do we need to do it like There was a problem hiding this comment.
There was a problem hiding this comment. I don't think it would be terribly hard to add support for GHC 9.2. Let me see what I can do. Aside from that, Gild doesn't really expose a high-level "format" function. That's because I primarily intended for it to be an application rather than a library. The There was a problem hiding this comment. A There was a problem hiding this comment.
That's a good reason for us to interact with it that way. It can be nice to at least have the option to use a compiled-in library version instead of shelling out to a process, but that does lead to the dread #411 There was a problem hiding this comment. I added support for GHC 9.2 in Gild version 1.1.1.0: https://github.com/tfausak/cabal-gild/releases/tag/1.1.1.0 I'll noodle on a high level formatting function. The existing |
||
|
|
||
| ----------------------------- | ||
| -- cabal plugin | ||
| ----------------------------- | ||
|
|
@@ -1642,6 +1692,7 @@ library | |
| , cabal | ||
| , callHierarchy | ||
| , cabalfmt | ||
| , cabalgild | ||
| , changeTypeSignature | ||
| , class | ||
| , eval | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| {-# LANGUAGE LambdaCase #-} | ||
| {-# LANGUAGE OverloadedStrings #-} | ||
|
|
||
| module Ide.Plugin.CabalGild where | ||
|
|
||
| import Control.Monad.Except (throwError) | ||
| import Control.Monad.IO.Class | ||
| import qualified Data.Text as T | ||
| import Development.IDE hiding (pluginHandlers) | ||
| import Ide.Plugin.Error (PluginError (PluginInternalError, PluginInvalidParams)) | ||
| import Ide.PluginUtils | ||
| import Ide.Types | ||
| import Language.LSP.Protocol.Types | ||
| import Prelude hiding (log) | ||
| import System.Directory | ||
| import System.Exit | ||
| import System.FilePath | ||
| import System.Process.ListLike | ||
| import qualified System.Process.Text as Process | ||
|
|
||
| data Log | ||
| = LogProcessInvocationFailure Int T.Text | ||
| | LogReadCreateProcessInfo [String] | ||
| | LogInvalidInvocationInfo | ||
| | LogFormatterBinNotFound | ||
| deriving (Show) | ||
|
|
||
| instance Pretty Log where | ||
| pretty = \case | ||
| LogProcessInvocationFailure exitCode err -> | ||
| vcat | ||
| [ "Invocation of cabal-gild failed with code" <+> pretty exitCode | ||
| , "Stderr:" <+> pretty err | ||
| ] | ||
| LogReadCreateProcessInfo args -> | ||
| "Formatter invocation: cabal-gild " <+> pretty args | ||
| LogInvalidInvocationInfo -> "Invocation of cabal-gild with range was called but is not supported." | ||
| LogFormatterBinNotFound -> "Couldn't find executable 'cabal-gild'" | ||
|
|
||
| descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState | ||
| descriptor recorder plId = | ||
| (defaultCabalPluginDescriptor plId "Provides formatting of cabal files with cabal-gild") | ||
| { pluginHandlers = mkFormattingHandlers (provider recorder) | ||
| } | ||
|
|
||
| -- | Formatter provider of cabal gild. | ||
| -- Formats the given source in either a given Range or the whole Document. | ||
| -- If the provider fails an error is returned that can be displayed to the user. | ||
| provider :: Recorder (WithPriority Log) -> FormattingHandler IdeState | ||
| provider recorder _ _ (FormatRange _) _ _ _ = do | ||
| logWith recorder Info LogInvalidInvocationInfo | ||
| throwError $ PluginInvalidParams "You cannot format a text-range using cabal-gild." | ||
|
There was a problem hiding this comment. You kind of can, depending on what exactly "range" means. For example: $ echo 'build-depends:{base>=4.19,bytestring>=0.12}' | cabal-gild
build-depends:
base >=4.19,
bytestring >=0.12But I wonder if anyone would actually want this behavior anyway. There was a problem hiding this comment. I think people could find range formatting useful. But supporting only top-level stanzas and fields... Not sure it's the most intuitive behaviour. There was a problem hiding this comment. Shall we make an issue so we can put a link to the issue in the error? 😈 There was a problem hiding this comment. I'd be happy to add support for formatting ranges if someone can point me to a resource that explains how it should work! As shown, Gild can format any subsection of a document that's still syntactically valid. But it can't, for example, format any arbitrary range. Like if you tried to format just the contents of the $ echo 'base>=4.19,bytestring>=0.12' | cabal-gild
base >= 4.19 , bytestring >= 0.12There was a problem hiding this comment.
You mean "The document range formatting request is sent from the client to the server to format a given range in a document" isn't good enough for you? 😂
Does it take into account the surrounding context? Perhaps it doesn't matter, but an easy way this kind of formatting could go wrong is if you format the range in isolation and therefore treat it as if it is at the top-level of the structure, which it might not be. But otherwise I think it's fine if range formatting just doesn't do anything unless you've selected a range that includes a whole element that can be sensibly formatted. There was a problem hiding this comment. I think the only way it could take surrounding context into account is to maintain leading blank spaces. Otherwise it has no way of knowing that it's "inside" a How does range formatting work exactly? If Gild would only get the range's content as input, then there's not much it can do. But if it gets the entire buffer's input along with a span identifying the range to format, then potentially it could do something nice. (Although that might be a lot of work for me.) There was a problem hiding this comment.
That's what you get, indeed. There was a problem hiding this comment. I created an issue for this: tfausak/cabal-gild#42. No idea if or when I'll get around to implementing it though. |
||
| provider recorder _ide _ FormatText contents nfp _ = do | ||
| let cabalGildArgs = ["--stdin=" <> fp, "--input=-"] -- < Read from stdin | ||
| x <- liftIO $ findExecutable "cabal-gild" | ||
| case x of | ||
| Just _ -> do | ||
| log Debug $ LogReadCreateProcessInfo cabalGildArgs | ||
| (exitCode, out, err) <- | ||
| liftIO $ Process.readCreateProcessWithExitCode | ||
| ( proc "cabal-gild" cabalGildArgs | ||
| ) | ||
| { cwd = Just $ takeDirectory fp | ||
| } | ||
| contents | ||
| case exitCode of | ||
| ExitFailure code -> do | ||
| log Error $ LogProcessInvocationFailure code err | ||
| throwError (PluginInternalError "Failed to invoke cabal-gild") | ||
| ExitSuccess -> do | ||
| let fmtDiff = makeDiffTextEdit contents out | ||
| pure $ InL fmtDiff | ||
| Nothing -> do | ||
| log Error LogFormatterBinNotFound | ||
| throwError (PluginInternalError "No installation of cabal-gild could be found. Please install it into your global environment.") | ||
| where | ||
| fp = fromNormalizedFilePath nfp | ||
| log = logWith recorder | ||
Uh oh!
There was an error while loading. Please reload this page.