Add support for other-module field of all viable stanzas

Author: VeryMilkyJoe

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

@@ -25,7 +25,9 @@ import           Distribution.PackageDescription        (CondTree (..),
                                                          GenericPackageDescription (..),
                                                          Library (libBuildInfo),
                                                          hsSourceDirs)
+import           Distribution.Types.Benchmark           (Benchmark (..))
 import           Distribution.Types.Executable          (Executable (..))
+import           Distribution.Types.TestSuite           (TestSuite (..))
 import           Distribution.Types.UnqualComponentName
 import           Distribution.Utils.Path                (getSymbolicPath)
 import           Ide.Plugin.Cabal.FilepathCompletions
@@ -434,9 +436,9 @@ exposedModuleExtraction gpd =
   where
     libM = condLibrary gpd
 
-otherModulesExtraction :: Maybe T.Text -> GenericPackageDescription -> [FilePath]
-otherModulesExtraction Nothing _ = []
-otherModulesExtraction (Just name) gpd
+otherModulesExtractionExecutable :: Maybe T.Text -> GenericPackageDescription -> [FilePath]
+otherModulesExtractionExecutable Nothing _ = []
+otherModulesExtractionExecutable (Just name) gpd
   | exeName executable == (mkUnqualComponentName $ T.unpack name) = map getSymbolicPath $ hsSourceDirs $ buildInfo executable
   | otherwise = []
   where
@@ -450,6 +452,38 @@ otherModulesExtraction (Just name) gpd
           )
           execsM
 
+otherModulesExtractionTestSuite :: Maybe T.Text ->  GenericPackageDescription -> [FilePath]
+otherModulesExtractionTestSuite Nothing _ = []
+otherModulesExtractionTestSuite (Just name) gpd
+  | testName testSuite == (mkUnqualComponentName $ T.unpack name) = map getSymbolicPath $ hsSourceDirs $ testBuildInfo testSuite
+  | otherwise = []
+  where
+    testSuite = condTreeData $ snd $ fromJust res
+    testSuitesM = condTestSuites gpd
+    res =
+        List.find
+          (\(_, cTree) -> do
+            let testsName = testName $ condTreeData cTree
+            testsName == (mkUnqualComponentName $ T.unpack name)
+          )
+          testSuitesM
+
+otherModulesExtractionBenchmark :: Maybe T.Text ->  GenericPackageDescription -> [FilePath]
+otherModulesExtractionBenchmark Nothing _ = []
+otherModulesExtractionBenchmark (Just name) gpd
+  | benchmarkName bMark == (mkUnqualComponentName $ T.unpack name) = map getSymbolicPath $ hsSourceDirs $ benchmarkBuildInfo bMark
+  | otherwise = []
+  where
+    bMark = condTreeData $ snd $ fromJust res
+    bMarksM = condBenchmarks gpd
+    res =
+        List.find
+          (\(_, cTree) -> do
+            let bMarkName = benchmarkName $ condTreeData cTree
+            bMarkName == (mkUnqualComponentName $ T.unpack name)
+          )
+          bMarksM
+
 {- | Completer to be used when a directory can be completed for the field,
   takes the file path of the directory to start from.
   Only completes directories.
@@ -522,39 +556,43 @@ stanzaKeywordMap =
   Map.fromList
     [
       ( "library"
-      , \n -> Map.fromList $
+      , \_ -> Map.fromList $
           [ ("exposed-modules:", modulesCompleter exposedModuleExtraction) -- identifier list
           , ("virtual-modules:", noopCompleter)
           , ("exposed:", constantCompleter ["True", "False"])
           , ("visibility:", constantCompleter ["private", "public"])
           , ("reexported-modules:", noopCompleter) -- export list, i.e. "orig-okg:Name as NewName"
           , ("signatures:", noopCompleter) -- list of signatures
+          , ("other-modules:", modulesCompleter exposedModuleExtraction)
           ]
-            ++ libExecTestBenchCommons n
+            ++ libExecTestBenchCommons
       )
     ,
       ( "executable"
       , \n -> Map.fromList $
           [ ("main-is:", filePathCompleter)
           , ("scope:", constantCompleter ["public", "private"])
+          , ("other-modules:", modulesCompleter (otherModulesExtractionExecutable n))
           ]
-            ++ libExecTestBenchCommons n
+            ++ libExecTestBenchCommons
       )
     ,
       ( "test-suite"
       , \n -> Map.fromList $
           [ ("type:", constantCompleter ["exitcode-stdio-1.0", "detailed-0.9"])
           , ("main-is:", filePathCompleter)
+          , ("other-modules:", modulesCompleter (otherModulesExtractionTestSuite n))
           ]
-            ++ libExecTestBenchCommons n
+            ++ libExecTestBenchCommons
       )
     ,
       ( "benchmark"
       , \n -> Map.fromList $
           [ ("type:", noopCompleter)
           , ("main-is:", filePathCompleter)
+          , ("other-modules:", modulesCompleter (otherModulesExtractionBenchmark n))
           ]
-            ++ libExecTestBenchCommons n
+            ++ libExecTestBenchCommons
       )
     ,
       ( "foreign-library"
@@ -604,9 +642,8 @@ stanzaKeywordMap =
       )
     ]
  where
-  libExecTestBenchCommons n =
+  libExecTestBenchCommons =
     [ ("build-depends:", noopCompleter)
-    , ("other-modules:", modulesCompleter (otherModulesExtraction n))
     , ("hs-source-dirs:", directoryCompleter)
     , ("default-extensions:", noopCompleter)
     , ("other-extensions:", noopCompleter)