Add completion for cabal-version keyword

Author: VeryMilkyJoe

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

@@ -14,7 +14,7 @@ import qualified Data.Map                        as Map
 import           Data.Maybe                      (fromMaybe)
 import qualified Data.Text                       as T
 import           Development.IDE                 as D
-import           Distribution.CabalSpecVersion   (CabalSpecVersion (CabalSpecV1_2),
+import           Distribution.CabalSpecVersion   (CabalSpecVersion (CabalSpecV2_2),
                                                   showCabalSpecVersion)
 import           Distribution.Compat.Lens        ((^.))
 import           Ide.Plugin.Cabal.LicenseSuggest (licenseNames)
@@ -92,11 +92,11 @@ contextToCompleter :: Context -> Completer
 -- if we are in the top level of the cabal file and not in a keyword context,
 -- we can write any top level keywords or a stanza declaration
 contextToCompleter (TopLevel, None) =
-  constantCompleter $ Map.keys cabalKeywords ++ Map.keys stanzaKeywordMap
+  constantCompleter $ Map.keys (cabalKeywords <> cabalVersionKeyword) ++ Map.keys stanzaKeywordMap
 -- if we are in a keyword context in the top level,
--- we look up that keyword in the toplevel context and can complete its possible values
+-- we look up that keyword in the top level context and can complete its possible values
 contextToCompleter (TopLevel, KeyWord kw) =
-  case Map.lookup kw cabalKeywords of
+  case Map.lookup kw (cabalKeywords <> cabalVersionKeyword) of
     Nothing -> noopCompleter
     Just l  -> l
 -- if we are in a stanza and not in a keyword context,
@@ -154,8 +154,8 @@ getKeyWordContext pos ls keywords = do
   case lastNonEmptyLineM of
     Nothing -> Just None
     Just lastLine' -> do
-      let (whitespaces, lastLine) = T.span (== ' ') lastLine'
-      let keywordIndentation = T.length whitespaces
+      let (whiteSpaces, lastLine) = T.span (== ' ') lastLine'
+      let keywordIndentation = T.length whiteSpaces
       let cursorIndentation = fromIntegral (pos ^. JL.character)
       -- in order to be in a keyword context the cursor needs to be indented more than the keyword
       if cursorIndentation > keywordIndentation
@@ -252,7 +252,7 @@ makeSimpleCabalCompletionItem :: Range -> T.Text -> CabalCompletionItem
 makeSimpleCabalCompletionItem r txt = CabalCompletionItem txt Nothing r
 
 {- | Returns a CabalCompletionItem with the given starting position,
-  text to be inserted and text to be displayed in completionsuggestion
+  text to be inserted and text to be displayed in the completion suggestion
 -}
 makeCabalCompletionItem :: Range -> T.Text -> T.Text -> CabalCompletionItem
 makeCabalCompletionItem r insertTxt displayTxt = CabalCompletionItem insertTxt (Just displayTxt) r
@@ -364,7 +364,7 @@ cabalVersionKeyword :: Map T.Text Completer
 cabalVersionKeyword =
   Map.singleton "cabal-version:" $
     constantCompleter $
-      map (T.pack . showCabalSpecVersion) [CabalSpecV1_2 .. maxBound]
+      map (T.pack . showCabalSpecVersion) [CabalSpecV2_2 .. maxBound]
 
 -- todo: we could add file path completion for file path fields
 --       we could add descriptions of field values and then show them when inside the field's context
@@ -408,7 +408,7 @@ stanzaKeywordMap =
           , ("virtual-modules:", noopCompleter)
           , ("exposed:", constantCompleter ["True", "False"])
           , ("visibility:", constantCompleter ["private", "public"])
-          , ("reexported-modules:", noopCompleter) -- exportlist, i.e. "orig-okg:Name as NewName"
+          , ("reexported-modules:", noopCompleter) -- export list, i.e. "orig-okg:Name as NewName"
           , ("signatures:", noopCompleter) -- list of signatures
           ]
             ++ libExecTestBenchCommons