Add cabal-add source repository

We need to depend on a newer commit of cabal-add since the newest
release does not yet allow us to add modules to a cabal-file.

Once there is a new release of cabal-add we can revert this commit.

Author: VeryMilkyJoe

cabal.project

@@ -6,8 +6,11 @@ packages:
          ./ghcide
          ./hls-plugin-api
          ./hls-test-utils
-         ../cabal-add
 
+source-repository-package
+  type:     git
+  location: https://github.com/Bodigrim/cabal-add.git
+  tag:      8ee9e935e71841e2f11976eb00e292a63c702418
 
 index-state: 2025-06-07T14:57:40Z
 

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/CabalAdd/Command.hs

@@ -99,14 +99,14 @@ getModuleEdit recorder env cabalFilePath stanza targetFieldStr modulePath =
     cabalFilePath
     mkConfig
  where
-  mkConfig :: (ByteString -> [Field Position] -> GenericPackageDescription -> ExceptT PluginError m Config)
+  mkConfig :: (ByteString -> [Field Position] -> GenericPackageDescription -> ExceptT PluginError m AddConfig)
   mkConfig cnfOrigContents fields packDescr = do
     let compName =
           case Add.resolveComponent cabalFilePath (fields, packDescr) $ Just $ CabalPretty.prettyShow stanza of
             Right x -> x
             Left _  -> error ""
     pure $
-      Config
+      AddConfig
         { cnfOrigContents = cnfOrigContents
         , cnfFields = fields
         , cnfComponent = compName
@@ -149,7 +149,7 @@ getDependencyEdit ::
 getDependencyEdit recorder env cabalFilePath buildTarget dependency =
   mkCabalAddConfig recorder env cabalFilePath mkConfig
  where
-  mkConfig :: (ByteString -> [Field Position] -> GenericPackageDescription -> ExceptT PluginError m Config)
+  mkConfig :: (ByteString -> [Field Position] -> GenericPackageDescription -> ExceptT PluginError m AddConfig)
   mkConfig cnfOrigContents fields packDescr = do
     let specVer = specVersion $ packageDescription packDescr
     (deps, compName) <-
@@ -158,7 +158,7 @@ getDependencyEdit recorder env cabalFilePath buildTarget dependency =
         compName <- resolveComponent cabalFilePath (fields, packDescr) buildTarget
         pure (deps, compName)
     pure $
-      Config
+      AddConfig
         { cnfOrigContents = cnfOrigContents
         , cnfFields = fields
         , cnfComponent = compName
@@ -180,7 +180,7 @@ mkCabalAddConfig ::
   ( ByteString ->
     [Field Position] ->
     GenericPackageDescription ->
-    ExceptT PluginError m Config
+    ExceptT PluginError m AddConfig
   ) ->
   ExceptT PluginError m WorkspaceEdit
 mkCabalAddConfig recorder env cabalFilePath mkConfig = do
@@ -211,7 +211,7 @@ mkCabalAddConfig recorder env cabalFilePath mkConfig = do
 
   cabalAddConfig <- mkConfig cnfOrigContents fields packDescr
 
-  case executeConfig (validateChanges packDescr) cabalAddConfig of
+  case executeAddConfig (validateChanges packDescr) cabalAddConfig of
     Nothing ->
       throwE $
         PluginInternalError $

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/CabalAdd/Types.hs

@@ -19,16 +19,14 @@ import           Ide.Plugin.Cabal.Orphans        ()
 import           Language.LSP.Protocol.Types
 
 data Log
-  = LogFoundResponsibleCabalFile FilePath
-  | LogCalledCabalAddPackageCommand CabalAddPackageCommandParams
+  = LogCalledCabalAddPackageCommand CabalAddPackageCommandParams
   | LogCalledCabalAddModuleCommand ModuleInsertionConfig
   | LogCreatedEdit WorkspaceEdit
   | LogExecutedCommand
   deriving (Show)
 
 instance Pretty Log where
   pretty = \case
-    LogFoundResponsibleCabalFile fp -> "Located the responsible cabal file at " <+> pretty fp
     LogCalledCabalAddPackageCommand params -> "Called CabalAddPackage command with:\n" <+> pretty params
     LogCalledCabalAddModuleCommand params -> "Called CabalAddModule command with:\n" <+> pretty params
     LogCreatedEdit edit -> "Created inplace edit:\n" <+> pretty edit

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/Rules.hs

@@ -35,7 +35,6 @@ data Log
   = LogModificationTime NormalizedFilePath FileVersion
   | LogShake Shake.Log
   | LogOfInterest OfInterest.Log
-  | LogDocSaved Uri
   deriving (Show)
 
 instance Pretty Log where
@@ -44,8 +43,6 @@ instance Pretty Log where
     LogOfInterest log' -> pretty log'
     LogModificationTime nfp modTime ->
       "Modified:" <+> pretty (fromNormalizedFilePath nfp) <+> pretty (show modTime)
-    LogDocSaved uri ->
-      "Saved text document:" <+> pretty (getUri uri)
 
 cabalRules :: Recorder (WithPriority Log) -> PluginId -> Rules ()
 cabalRules recorder plId = do