fill in boolean/enum completion values

Author: rm41339

plugins/hls-cabal-project-plugin/src/Ide/Plugin/CabalProject.hs

@@ -93,6 +93,12 @@ instance Pretty Log where
       "Closed text document:" <+> pretty (getUri uri)
     LogFOI files ->
       "Set files of interest to:" <+> viaShow files
+    LogCompletionContext context position ->
+      "Determined completion context:"
+        <+> pretty context
+        <+> "for cursor position:"
+        <+> pretty position
+    LogCompletions logs -> pretty logs
 
 descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState
 descriptor recorder plId =

plugins/hls-cabal-project-plugin/src/Ide/Plugin/CabalProject/Completion/Completions.hs

@@ -33,33 +33,32 @@ contextToCompleter :: Context -> Completer
 -- we can write any top level keywords or a stanza declaration
 contextToCompleter (TopLevel, None) =
   constantCompleter $
-           Map.keys cabalProjectKeywords ++ Map.keys packageFields
+           Map.keys cabalProjectKeywords ++ Map.keys stanzaKeywordMap
 -- if we are in a keyword context in the top level,
 -- we look up that keyword in the top level context and can complete its possible values
--- contextToCompleter (TopLevel, KeyWord kw) =
---   case Map.lookup kw (cabalVersionKeyword <> cabalKeywords) of
---     Nothing -> errorNoopCompleter (LogUnknownKeyWordInContextError kw)
---     Just l  -> l
+contextToCompleter (TopLevel, KeyWord kw) =
+  case Map.lookup kw cabalProjectKeywords of
+    Nothing -> errorNoopCompleter (LogUnknownKeyWordInContextError kw)
+    Just l  -> l
 -- if we are in a stanza and not in a keyword context,
 -- we can write any of the stanza's keywords or a stanza declaration
 contextToCompleter (Stanza s _, None) =
   case Map.lookup s stanzaKeywordMap of
     Nothing -> errorNoopCompleter (LogUnknownStanzaNameInContextError s)
     Just l  -> constantCompleter $ Map.keys l
 -- if we are in a stanza's keyword's context we can complete possible values of that keyword
--- contextToCompleter (Stanza s _, KeyWord kw) =
---   case Map.lookup s stanzaKeywordMap of
---     Nothing -> errorNoopCompleter (LogUnknownStanzaNameInContextError s)
---     Just m -> case Map.lookup kw m of
---       Nothing -> errorNoopCompleter (LogUnknownKeyWordInContextError kw)
---       Just l  -> l
+contextToCompleter (Stanza s _, KeyWord kw) =
+  case Map.lookup s stanzaKeywordMap of
+    Nothing -> errorNoopCompleter (LogUnknownStanzaNameInContextError s)
+    Just m -> case Map.lookup kw m of
+      Nothing -> errorNoopCompleter (LogUnknownKeyWordInContextError kw)
+      Just l  -> l
 
 -- | Takes prefix info about the previously written text
 --  and a rope (representing a file), returns the corresponding context.
 --
 --  Can return Nothing if an error occurs.
 --
---  TODO: first line can only have cabal-version: keyword
 getContext :: (MonadIO m) => Recorder (WithPriority Log) -> CabalPrefixInfo -> [Syntax.Field Syntax.Position] -> m Context
 getContext recorder prefInfo fields = do
     let ctx = findCursorContext cursor (NE.singleton (0, TopLevel)) (completionPrefix prefInfo) fields

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

@@ -16,6 +16,13 @@ import           Ide.Plugin.Cabal.Completion.Completer.Types  (Completer)
 import           Ide.Plugin.Cabal.Completion.Types
 -- import           Ide.Plugin.Cabal.LicenseSuggest                (licenseNames)
 
+-- | Ad-hoc data type for modelling the available top-level stanzas.
+-- Not intended right now for anything else but to avoid string
+-- comparisons in 'stanzaKeywordMap' and 'libExecTestBenchCommons'.
+data TopLevelStanza
+  = Package
+  | ProgramOptions
+
 -- ----------------------------------------------------------------
 -- Completion Data
 -- ----------------------------------------------------------------
@@ -44,27 +51,27 @@ cabalProjectKeywords =
       ("optional-packages:", noopCompleter),
       ("extra-packages:", noopCompleter),
       -- projectConfigBuildOnlyFieldGrammar
-      ("verbose:", constantCompleter ["0", "1", "2", "3"]), -- not sure if this works/makes sense?
+      ("verbose:", constantCompleter ["0", "1", "2", "3"]),
       ("build-summary:", noopCompleter),
       ("build-log:", noopCompleter),
       ("remote-build-reporting:", noopCompleter),
       ("report-planning-failure:", noopCompleter),
       ("symlink-bindir:", noopCompleter),
       ("jobs:", noopCompleter),
       ("semaphore:", noopCompleter),
-      ("keep-going:", noopCompleter),
+      ("keep-going:", constantCompleter ["False", "True"]),
       ("offline:", noopCompleter),
-      ("haddock-keep-temp-files:", noopCompleter),
-      ("http-transport:", noopCompleter),
-      ("ignore-expiry:", noopCompleter),
+      ("haddock-keep-temp-files:", constantCompleter ["False", "True"]),
+      ("http-transport:", constantCompleter ["curl", "wget", "powershell", "plain-http"]),
+      ("ignore-expiry:", constantCompleter ["False", "True"]),
       ("remote-repo-cache:", noopCompleter),
       ("logs-dir:", noopCompleter),
       -- projectConfigSharedFieldGrammar
       ("builddir:", noopCompleter),
       ("project-dir:", noopCompleter),
       ("project-file:", noopCompleter),
       ("ignore-project:", noopCompleter),
-      ("compiler:", noopCompleter),
+      ("compiler:", constantCompleter ["ghc", "ghcjs", "jhc", "lhc", "uhc", "haskell-suite"]),
       ("with-compiler:", noopCompleter),
       ("with-hc-pkg:", noopCompleter),
       ("doc-index-file:", noopCompleter),
@@ -75,73 +82,76 @@ cabalProjectKeywords =
       ("constraints:", noopCompleter),
       ("preferences:", noopCompleter),
       ("cabal-lib-version:", noopCompleter),
-      ("solver:", noopCompleter),
+      ("solver:", constantCompleter ["modular"]),
       ("allow-older:", noopCompleter),
       ("allow-newer:", noopCompleter),
-      ("write-ghc-environment-files:", noopCompleter),
+      ("write-ghc-environment-files:", constantCompleter ["never", "always", "ghc8.4.4+"]),
       ("max-backjumps:", noopCompleter),
-      ("reorder-goals:", noopCompleter),
-      ("count-conflicts:", noopCompleter),
-      ("fine-grained-conflicts:", noopCompleter),
-      ("minimize-conflict-set:", noopCompleter),
-      ("strong-flags:", noopCompleter),
-      ("allow-boot-library-installs:", noopCompleter),
+      ("reorder-goals:", constantCompleter ["False", "True"]),
+      ("count-conflicts:", constantCompleter ["True", "False"]),
+      ("fine-grained-conflicts:", constantCompleter ["True", "False"]),
+      ("minimize-conflict-set:", constantCompleter ["False", "True"]),
+      ("strong-flags:", constantCompleter ["False", "True"]),
+      ("allow-boot-library-installs:", constantCompleter ["False", "True"]),
       ("reject-unconstrained-dependencies:", noopCompleter),
       ("per-component:", noopCompleter),
       ("independent-goals:", noopCompleter),
       ("prefer-oldest:", noopCompleter),
       ("extra-prog-path-shared-only:", noopCompleter),
-      ("multi-repl:", noopCompleter)
+      ("multi-repl:", noopCompleter),
+      -- extras
+      ("benchmarks:", constantCompleter ["False", "True"])
+
     ]
 
 packageFields :: Map KeyWordName Completer
 packageFields =
   Map.fromList
     [ -- packageConfigFieldGrammar
-      ("haddock-all:", noopCompleter),
+      ("haddock-all:", constantCompleter ["False", "True"]),
       ("extra-prog-path:", noopCompleter),
       ("flags:", noopCompleter),
-      ("library-vanilla:", noopCompleter),
-      ("shared:", noopCompleter),
-      ("static:", noopCompleter),
-      ("exectable-dynamic:", noopCompleter),
-      ("executable-static:", noopCompleter),
-      ("profiling:", noopCompleter),
-      ("library-profiling:", noopCompleter),
+      ("library-vanilla:", constantCompleter ["True", "False"]),
+      ("shared:", constantCompleter ["False", "True"]),
+      ("static:", constantCompleter ["False", "True"]),
+      ("exectable-dynamic:", constantCompleter ["False", "True"]),
+      ("executable-static:", constantCompleter ["False", "True"]),
+      ("profiling:", constantCompleter ["False", "True"]),
+      ("library-profiling:", constantCompleter ["False", "True"]),
       ("profiling-shared:", noopCompleter),
-      ("exectable-profiling:", noopCompleter),
-      ("profiling-detail:", noopCompleter),
-      ("library-profiling-detail:", noopCompleter),
+      ("exectable-profiling:", constantCompleter ["False", "True"]),
+      ("profiling-detail:", constantCompleter ["default", "none", "exported-functions", "toplevel-functions", "all-functions"]),
+      ("library-profiling-detail:", constantCompleter ["default", "none", "exported-functions", "toplevel-functions", "all-functions"]),
       ("configure-options:", noopCompleter),
-      ("optimization:", noopCompleter),
+      ("optimization:", constantCompleter ["0", "1", "2", "True", "False"]),
       ("program-prefix:", noopCompleter),
       ("program-suffix:", noopCompleter),
       ("extra-lib-dirs:", noopCompleter),
       ("extra-lib-dirs-static:", noopCompleter),
       ("extra-framework-dirs:", noopCompleter),
       ("extra-include-dirs:", noopCompleter),
-      ("library-for-ghci:", noopCompleter),
-      ("split-sections:", noopCompleter),
-      ("split-objs:", noopCompleter),
-      ("executable-stripping:", noopCompleter),
-      ("library-stripping:", noopCompleter),
-      ("tests:", noopCompleter),
-      ("benchmarks:", noopCompleter),
-      ("relocatable:", noopCompleter),
+      ("library-for-ghci:", constantCompleter ["True", "False"]),
+      ("split-sections:", constantCompleter ["False", "True"]),
+      ("split-objs:", constantCompleter ["False", "True"]),
+      ("executable-stripping:", constantCompleter ["True", "False"]),
+      ("library-stripping:", constantCompleter ["False", "True"]),
+      ("tests:", constantCompleter ["False", "True"]),
+      ("benchmarks:", constantCompleter ["False", "True"]),
+      ("relocatable:", constantCompleter ["False", "True"]),
       ("debug-info:", noopCompleter),
       ("build-info:", noopCompleter),
-      ("run-tests:", noopCompleter),
-      ("documentation:", noopCompleter),
-      ("haddock-hoogle:", noopCompleter),
-      ("haddock-html:", noopCompleter),
+      ("run-tests:", constantCompleter ["False", "True"]),
+      ("documentation:", constantCompleter ["False", "True"]),
+      ("haddock-hoogle:", constantCompleter ["False", "True"]),
+      ("haddock-html:", constantCompleter ["True", "False"]),
       ("haddock-html-location:", noopCompleter),
       ("haddock-foreign-libraries:", noopCompleter),
-      ("haddock-executables:", noopCompleter),
-      ("haddock-tests:", noopCompleter),
-      ("haddock-benchmarks:", noopCompleter),
-      ("haddock-internal:", noopCompleter),
+      ("haddock-executables:", constantCompleter ["False", "True"]),
+      ("haddock-tests:", constantCompleter ["False", "True"]),
+      ("haddock-benchmarks:", constantCompleter ["False", "True"]),
+      ("haddock-internal:", constantCompleter ["False", "True"]),
       ("haddock-css:", noopCompleter),
-      ("haddock-hyperlink-source:", noopCompleter),
+      ("haddock-hyperlink-source:", constantCompleter ["False", "True"]),
       ("haddock-quickjump:", noopCompleter),
       ("haddock-hscolour-css:", noopCompleter),
       ("haddock-contents-location:", noopCompleter),
@@ -160,13 +170,42 @@ packageFields =
       ("test-options:", noopCompleter),
       ("benchmark-options:", noopCompleter),
       -- packageConfigCoverageGrammar
-      ("coverage:", noopCompleter)
+      ("coverage:", constantCompleter ["False", "True"]),
+      -- other
+      ("ghc-options:", noopCompleter)
+    ]
+
+-- just for testing right now, to be filled in later
+programOptionsFields :: Map KeyWordName Completer
+programOptionsFields = Map.fromList
+    [ ("ghc-options:", noopCompleter)
+    ]
+
+sourceRepoFields :: Map KeyWordName Completer
+sourceRepoFields = Map.fromList
+    [ ("type:", constantCompleter
+          [ "darcs",
+            "git",
+            "svn",
+            "cvs",
+            "mercurial",
+            "hg",
+            "bazaar",
+            "bzr",
+            "arch",
+            "monotone"
+          ]), -- just used the one from cabal
+      ("location:", noopCompleter),
+      ("tag:", noopCompleter),
+      ("subdir:", noopCompleter)
     ]
 
 -- | Map, containing all stanzas in a cabal file as keys,
 --  and lists of their possible nested keywords as values.
 stanzaKeywordMap :: Map StanzaType (Map KeyWordName Completer)
 stanzaKeywordMap =
   Map.fromList
-    [ ("package", packageFields)
+    [ ("package", packageFields),
+      ("program-options", programOptionsFields),
+      ("source-repository-package", sourceRepoFields)
     ]