fix tests, edit autogen-modules completion to remove redundancy

Author: rm41339

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

@@ -23,14 +23,17 @@ import           Ide.Plugin.Cabal.LicenseSuggest                (licenseNames)
 -- Completion Data
 -- ----------------------------------------------------------------
 
+supportedCabalVersions :: [CabalSpecVersion]
+supportedCabalVersions = [CabalSpecV2_2 .. maxBound]
+
 -- | Keyword for cabal version; required to be the top line in a cabal file
 cabalVersionKeyword :: Map KeyWordName Completer
 cabalVersionKeyword =
   Map.singleton "cabal-version:" $
     constantCompleter $
       -- We only suggest cabal versions newer than 2.2
       -- since we don't recommend using older ones.
-      map (T.pack . showCabalSpecVersion) [CabalSpecV2_2 .. maxBound]
+      map (T.pack . showCabalSpecVersion) supportedCabalVersions
 
 -- | Top level keywords of a cabal file.
 --
@@ -87,7 +90,6 @@ libraryFields =
       ("visibility:", constantCompleter ["private", "public"]),
       ("reexported-modules:", noopCompleter),
       ("signatures:", noopCompleter),
-      ("autogen-modules:", modulesCompleter sourceDirsExtractionLibrary),
       ("other-modules:", modulesCompleter sourceDirsExtractionLibrary)
     ]
 
@@ -96,15 +98,13 @@ executableFields =
   Map.fromList
     [ ("main-is:", mainIsCompleter sourceDirsExtractionExecutable),
       ("scope:", constantCompleter ["public", "private"]),
-      ("autogen-modules:", modulesCompleter sourceDirsExtractionExecutable),
       ("other-modules:", modulesCompleter sourceDirsExtractionExecutable)
     ]
 
 testSuiteFields :: Map KeyWordName Completer
 testSuiteFields =
   Map.fromList
     [ ("type:", constantCompleter ["exitcode-stdio-1.0", "detailed-0.9"]),
-      ("autogen-modules:", modulesCompleter sourceDirsExtractionTestSuite),
       ("main-is:", mainIsCompleter sourceDirsExtractionTestSuite),
       ("other-modules:", modulesCompleter sourceDirsExtractionTestSuite)
     ]
@@ -113,7 +113,6 @@ benchmarkFields :: Map KeyWordName Completer
 benchmarkFields =
   Map.fromList
     [ ("type:", noopCompleter),
-      ("autogen-modules:", modulesCompleter sourceDirsExtractionBenchmark),
       ("main-is:", mainIsCompleter sourceDirsExtractionBenchmark),
       ("other-modules:", modulesCompleter sourceDirsExtractionBenchmark)
     ]
@@ -166,7 +165,8 @@ flagFields =
 libExecTestBenchCommons :: Map KeyWordName Completer
 libExecTestBenchCommons =
   Map.fromList
-    [ ("build-depends:", noopCompleter),
+    [ ("import:", importCompleter),
+      ("build-depends:", noopCompleter),
       ("hs-source-dirs:", directoryCompleter),
       ("default-extensions:", noopCompleter),
       ("other-extensions:", noopCompleter),
@@ -181,9 +181,10 @@ libExecTestBenchCommons =
       ("ghcjs-prof-options:", constantCompleter ghcOptions),
       ("ghcjs-shared-options:", constantCompleter ghcOptions),
       ("includes:", filePathCompleter),
-      ("autogen-includes:", filePathCompleter),
       ("install-includes:", filePathCompleter),
       ("include-dirs:", directoryCompleter),
+      ("autogen-includes:", filePathCompleter),
+      ("autogen-modules:", filePathCompleter),
       ("c-sources:", filePathCompleter),
       ("cxx-sources:", filePathCompleter),
       ("asm-sources:", filePathCompleter),
@@ -265,6 +266,3 @@ weightedLicenseNames =
 
 ghcOptions :: [T.Text]
 ghcOptions = map T.pack $ flagsForCompletion False
-
-supportedCabalVersions :: [CabalSpecVersion]
-supportedCabalVersions = [CabalSpecV2_2 .. maxBound]

plugins/hls-cabal-plugin/test/Completer.hs

@@ -345,8 +345,7 @@ autogenFieldCompletionTests =
     , testAutogenField "executable"      "autogen-completion/autogen-completion.cabal" (Position 11 9) ["autogen-modules:", "autogen-includes:"]
     , testAutogenField "test-suite"      "autogen-completion/autogen-completion.cabal" (Position 16 9) ["autogen-modules:", "autogen-includes:"]
     , testAutogenField "benchmark"       "autogen-completion/autogen-completion.cabal" (Position 21 9) ["autogen-modules:", "autogen-includes:"]
-    , testAutogenField "foreign-library" "autogen-completion/autogen-completion.cabal" (Position 26 9) ["autogen-includes:"]
-    , testAutogenField "common"          "autogen-completion/autogen-completion.cabal" (Position 29 9) ["autogen-includes:"]
+    , testAutogenField "common"          "autogen-completion/autogen-completion.cabal" (Position 29 9) ["autogen-modules:", "autogen-includes:"]
     ]
 
   where