Skip to content

Add cabal-gild as a cabal file formatter plugin #4101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,10 @@ jobs:
name: Test hls-cabal-fmt-plugin test suite
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests

- if: matrix.test
name: Test hls-cabal-gild-plugin test suite
run: cabal test hls-cabal-gild-plugin-tests --flag=isolateCabalGildTests || cabal test hls-cabal-gild-plugin-tests --flag=isolateCabalGildTests

- if: matrix.test
name: Test hls-cabal-plugin test suite
run: cabal test hls-cabal-plugin-tests || cabal test hls-cabal-plugin-tests
Expand Down
7 changes: 4 additions & 3 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
# Plugins
/plugins/hls-alternate-number-format-plugin @drsooch
/plugins/hls-cabal-fmt-plugin @VeryMilkyJoe @fendor
/plugins/hls-cabal-gild-plugin @fendor
/plugins/hls-cabal-plugin @fendor
/plugins/hls-call-hierarchy-plugin @July541
/plugins/hls-change-type-signature-plugin
/plugins/hls-class-plugin
/plugins/hls-class-plugin
/plugins/hls-code-range-plugin @kokobd
/plugins/hls-eval-plugin
/plugins/hls-explicit-fixity-plugin
Expand All @@ -34,7 +35,7 @@
/plugins/hls-pragmas-plugin @eddiemundo
/plugins/hls-qualify-imported-names-plugin @eddiemundo
/plugins/hls-refactor-plugin @santiweight
/plugins/hls-rename-plugin
/plugins/hls-rename-plugin
/plugins/hls-retrie-plugin @pepeiborra
/plugins/hls-semantic-tokens-plugin @soulomoon
/plugins/hls-splice-plugin @konn
Expand All @@ -49,7 +50,7 @@
/docs @michaelpj

# CI
/.circleci
/.circleci
/.github @michaelpj @fendor

# Build
Expand Down
53 changes: 53 additions & 0 deletions haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,58 @@ test-suite hls-cabal-fmt-plugin-tests

if flag(isolateCabalfmtTests)
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
cpp-options: -Dhls_isolate_cabalfmt_tests

-----------------------------
-- 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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to do it like cabal-fmt? Or can we do it more like the other formatters, where we use the library by default and have an option to use an executable optionally? I thought we did it like this because cabal-fmt was particularly difficult to build? But maybe cabal-gild is easier?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cabal-gild is easier, but it doesn't compile with ghc 9.2. We can disable the plugin for that GHC version, I don't feel strongly.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 mainWith function can be used that way, but it's not very convenient. I could add a format function. What should the type signature be? Something like ByteString -> IO ByteString?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A format function would be nice, but we need to be able to pass the FilePath option for cabal-gild: discover feature to work.
Perhaps a function Opts -> ByteString -> IO ByteString?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because I primarily intended for it to be an application rather than a library.

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

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 mainWith function can be used in a pure manner, it's just kind of annoying. See the test suite for an example: https://github.com/tfausak/cabal-gild/blob/747550fb20c4ab4003a199ebacd07130ce16796c/source/test-suite/Main.hs#L999

cpp-options: -Dhls_isolate_cabalgild_tests

-----------------------------
-- cabal plugin
Expand Down Expand Up @@ -1699,6 +1751,7 @@ library
, cabal
, callHierarchy
, cabalfmt
, cabalgild
, changeTypeSignature
, class
, eval
Expand Down
4 changes: 3 additions & 1 deletion hls-plugin-api/src/Ide/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ instance ToJSON Config where
object [ "checkParents" .= checkParents
, "checkProject" .= checkProject
, "formattingProvider" .= formattingProvider
, "cabalFormattingProvider" .= cabalFormattingProvider
, "maxCompletions" .= maxCompletions
, "plugin" .= Map.mapKeysMonotonic (\(PluginId p) -> p) plugins
]
Expand All @@ -189,7 +190,8 @@ instance Default Config where
, formattingProvider = "ormolu"
-- , formattingProvider = "floskell"
-- , formattingProvider = "stylish-haskell"
, cabalFormattingProvider = "cabal-fmt"
, cabalFormattingProvider = "cabal-gild"
-- , cabalFormattingProvider = "cabal-fmt"
-- this string value needs to kept in sync with the value provided in HlsPlugins
, maxCompletions = 40
, plugins = mempty
Expand Down
33 changes: 23 additions & 10 deletions plugins/hls-cabal-fmt-plugin/src/Ide/Plugin/CabalFmt.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE OverloadedLabels #-}
{-# LANGUAGE OverloadedStrings #-}

module Ide.Plugin.CabalFmt where
Expand All @@ -9,6 +11,7 @@ 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.Plugin.Properties
import Ide.PluginUtils
import Ide.Types
import qualified Language.LSP.Protocol.Lens as L
Expand All @@ -24,7 +27,7 @@ data Log
= LogProcessInvocationFailure Int
| LogReadCreateProcessInfo T.Text [String]
| LogInvalidInvocationInfo
| LogCabalFmtNotFound
| LogFormatterBinNotFound FilePath
deriving (Show)

instance Pretty Log where
Expand All @@ -35,29 +38,39 @@ instance Pretty Log where
["Invocation of cabal-fmt with arguments" <+> pretty args]
++ ["failed with standard error:" <+> pretty stdErrorOut | not (T.null stdErrorOut)]
LogInvalidInvocationInfo -> "Invocation of cabal-fmt with range was called but is not supported."
LogCabalFmtNotFound -> "Couldn't find executable 'cabal-fmt'"
LogFormatterBinNotFound fp -> "Couldn't find formatter executable 'cabal-fmt' at:" <+> pretty fp

descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState
descriptor recorder plId =
(defaultCabalPluginDescriptor plId "Provides formatting of cabal files with cabal-fmt")
{ pluginHandlers = mkFormattingHandlers (provider recorder)
{ pluginHandlers = mkFormattingHandlers (provider recorder plId)
, pluginConfigDescriptor = defaultConfigDescriptor{configCustomConfig = mkCustomConfig properties}
}

properties :: Properties '[ 'PropertyKey "path" 'TString]
properties =
emptyProperties
& defineStringProperty
#path
"Set path to 'cabal-fmt' executable"
"cabal-fmt"

-- | Formatter provider of cabal fmt.
-- 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
provider :: Recorder (WithPriority Log) -> PluginId -> FormattingHandler IdeState
provider recorder _ _ _ (FormatRange _) _ _ _ = do
logWith recorder Info LogInvalidInvocationInfo
throwError $ PluginInvalidParams "You cannot format a text-range using cabal-fmt."
provider recorder _ide _ FormatText contents nfp opts = do
provider recorder plId ideState _ FormatText contents nfp opts = do
let cabalFmtArgs = [ "--indent", show tabularSize]
x <- liftIO $ findExecutable "cabal-fmt"
cabalFmtExePath <- fmap T.unpack $ liftIO $ runAction "cabal-gild" ideState $ usePropertyAction #path plId properties
x <- liftIO $ findExecutable cabalFmtExePath
case x of
Just _ -> do
(exitCode, out, err) <-
liftIO $ Process.readCreateProcessWithExitCode
( proc "cabal-fmt" cabalFmtArgs
( proc cabalFmtExePath cabalFmtArgs
)
{ cwd = Just $ takeDirectory fp
}
Expand All @@ -71,8 +84,8 @@ provider recorder _ide _ FormatText contents nfp opts = do
let fmtDiff = makeDiffTextEdit contents out
pure $ InL fmtDiff
Nothing -> do
log Error LogCabalFmtNotFound
throwError (PluginInternalError "No installation of cabal-fmt could be found. Please install it into your global environment.")
log Error $ LogFormatterBinNotFound cabalFmtExePath
throwError (PluginInternalError "No installation of cabal-gild could be found. Please install it globally, or provide the full path to the executable")
where
fp = fromNormalizedFilePath nfp
tabularSize = opts ^. L.tabSize
Expand Down
6 changes: 3 additions & 3 deletions plugins/hls-cabal-fmt-plugin/test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Test.Hls
data CabalFmtFound = Found | NotFound

isTestIsolated :: Bool
#if isolateTests
#if hls_isolate_cabalfmt_tests
isTestIsolated = True
#else
isTestIsolated = False
Expand All @@ -21,7 +21,7 @@ isTestIsolated = False
isCabalFmtFound :: IO CabalFmtFound
isCabalFmtFound = case isTestIsolated of
True -> pure Found
False-> do
False -> do
cabalFmt <- findExecutable "cabal-fmt"
pure $ maybe NotFound (const Found) cabalFmt

Expand Down Expand Up @@ -51,7 +51,7 @@ cabalFmtGolden :: CabalFmtFound -> TestName -> FilePath -> FilePath -> (TextDocu
cabalFmtGolden NotFound title _ _ _ =
testCase title $
assertFailure $ "Couldn't find cabal-fmt on PATH or this is not an isolated run. "
<> "Use cabal flag 'isolateTests' to make it isolated or install cabal-fmt locally."
<> "Use cabal flag 'isolateCabalFmtTests' to make it isolated or install cabal-fmt locally."
cabalFmtGolden Found title path desc act = goldenWithCabalDocFormatter def cabalFmtPlugin "cabal-fmt" conf title testDataDir path desc "cabal" act
where
conf = def
Expand Down
92 changes: 92 additions & 0 deletions plugins/hls-cabal-gild-plugin/src/Ide/Plugin/CabalGild.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE OverloadedLabels #-}
{-# 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.Plugin.Properties
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 FilePath
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 fp -> "Couldn't find formatter executable 'cabal-gild' at:" <+> pretty fp

descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState
descriptor recorder plId =
(defaultCabalPluginDescriptor plId "Provides formatting of cabal files with cabal-gild")
{ pluginHandlers = mkFormattingHandlers (provider recorder plId)
, pluginConfigDescriptor = defaultConfigDescriptor{configCustomConfig = mkCustomConfig properties}
}

properties :: Properties '[ 'PropertyKey "path" 'TString]
properties =
emptyProperties
& defineStringProperty
#path
"Set path to 'cabal-gild' executable"
"cabal-gild"

-- | 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) -> PluginId -> FormattingHandler IdeState
provider recorder _ _ _ (FormatRange _) _ _ _ = do
logWith recorder Info LogInvalidInvocationInfo
throwError $ PluginInvalidParams "You cannot format a text-range using cabal-gild."
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.12

But I wonder if anyone would actually want this behavior anyway.

Copy link
Collaborator Author

@fendor fendor Feb 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think people could find range formatting useful. But supporting only top-level stanzas and fields... Not sure it's the most intuitive behaviour.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we make an issue so we can put a link to the issue in the error? 😈

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 build-depends field, this is what you'd get:

$ echo 'base>=4.19,bytestring>=0.12' | cabal-gild
base >= 4.19 , bytestring >= 0.12

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be happy to add support for formatting ranges if someone can point me to a resource that explains how it should work!

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? 😂

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.

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.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 library section, for example. However that doesn't matter too much for Gild; it doesn't keep track of that context anyway. The field names are unique enough that it just looks for build-depends rather than build-depends within library. See the documentation here: https://hackage.haskell.org/package/cabal-gild-1.1.0.0/docs/CabalGild-Action-FormatFields.html#v:parsers

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.)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if it gets the entire buffer's input along with a span identifying the range to format,

That's what you get, indeed.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 plId ideState _ FormatText contents nfp _ = do
let cabalGildArgs = ["--stdin=" <> fp, "--input=-"] -- < Read from stdin

cabalGildExePath <- fmap T.unpack $ liftIO $ runAction "cabal-gild" ideState $ usePropertyAction #path plId properties
x <- liftIO $ findExecutable cabalGildExePath
case x of
Just _ -> do
log Debug $ LogReadCreateProcessInfo cabalGildArgs
(exitCode, out, err) <-
liftIO $ Process.readCreateProcessWithExitCode
( proc cabalGildExePath 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 cabalGildExePath
throwError (PluginInternalError "No installation of cabal-gild could be found. Please install it globally, or provide the full path to the executable.")
where
fp = fromNormalizedFilePath nfp
log = logWith recorder
58 changes: 58 additions & 0 deletions plugins/hls-cabal-gild-plugin/test/Main.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
module Main
( main
) where

import qualified Ide.Plugin.CabalGild as CabalGild
import System.Directory (findExecutable)
import System.FilePath
import Test.Hls

data CabalGildFound = Found | NotFound

isTestIsolated :: Bool
#if hls_isolate_cabalgild_tests
isTestIsolated = True
#else
isTestIsolated = False
#endif

isCabalFmtFound :: IO CabalGildFound
isCabalFmtFound = case isTestIsolated of
True -> pure Found
False -> do
cabalGild <- findExecutable "cabal-gild"
pure $ maybe NotFound (const Found) cabalGild

main :: IO ()
main = do
foundCabalFmt <- isCabalFmtFound
defaultTestRunner (tests foundCabalFmt)

cabalGildPlugin :: PluginTestDescriptor CabalGild.Log
cabalGildPlugin = mkPluginTestDescriptor CabalGild.descriptor "cabal-gild"

tests :: CabalGildFound -> TestTree
tests found = testGroup "cabal-gild"
[ cabalGildGolden found "formats a simple document" "simple_testdata" "formatted_document" $ \doc -> do
formatDoc doc (FormattingOptions 2 True Nothing Nothing Nothing)

, cabalGildGolden found "formats a document with expand:src comment" "commented_testdata" "formatted_document" $ \doc -> do
formatDoc doc (FormattingOptions 2 True Nothing Nothing Nothing)

, cabalGildGolden found "formats a document with lib information" "lib_testdata" "formatted_document" $ \doc -> do
formatDoc doc (FormattingOptions 10 True Nothing Nothing Nothing)
]

cabalGildGolden :: CabalGildFound -> TestName -> FilePath -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
cabalGildGolden NotFound title _ _ _ =
testCase title $
assertFailure $ "Couldn't find cabal-gild on PATH or this is not an isolated run. "
<> "Use cabal flag 'isolateCabalGildTests' to make it isolated or install cabal-gild locally."
cabalGildGolden Found title path desc act = goldenWithCabalDocFormatter def cabalGildPlugin "cabal-gild" conf title testDataDir path desc "cabal" act
where
conf = def

testDataDir :: FilePath
testDataDir = "plugins" </> "hls-cabal-gild-plugin" </> "test" </> "testdata"
Loading
Loading