Fix subdirectory completion

Author: VeryMilkyJoe

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

@@ -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 <> cabalVersionKeyword) ++ Map.keys stanzaKeywordMap
+  constantCompleter $ Map.keys (cabalVersionKeyword <> cabalKeywords) ++ 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 (cabalKeywords <> cabalVersionKeyword) of
+  case Map.lookup kw (cabalVersionKeyword <> cabalKeywords) of
     Nothing -> noopCompleter
     Just l  -> l
 -- if we are in a stanza and not in a keyword context,
@@ -290,16 +290,20 @@ filePathCompleter ctx = do
         fullFilePath <- makeFullFilePath suffix compl complInfo
         pure $ makeCabalCompletionItem (completionRange ctx) fullFilePath fullFilePath
     )
-
- where
-  -- | Takes a suffix and a text and returns filepath with the suffix
-  makeFullFilePath :: T.Text -> T.Text -> PathCompletionInfo -> IO T.Text
-  makeFullFilePath suffix' completion' complInfo = do
-    let fullPath' =  prefixPathInfo complInfo Posix.</> T.unpack completion'
-    isFilePath <- doesFileExist fullPath'
-    let fullPath = if isFilePath then fullPath' ++ T.unpack suffix' else fullPath'
-    pure $ T.pack fullPath
-
+  where 
+    -- | Takes a suffix, a completed path and a pathCompletionInfo and
+    --   generates the whole filepath including the already written prefix 
+    --   and the suffix in case the completed path is a filepath
+    makeFullFilePath :: T.Text -> T.Text -> PathCompletionInfo -> IO T.Text
+    makeFullFilePath suffix' completion' complInfo = do
+      let fullPath' =  prefixPathInfo complInfo Posix.</> T.unpack completion'
+      isFilePath <- doesFileExist fullPath'
+      let fullPath = if isFilePath then fullPath' ++ T.unpack suffix' else fullPath'
+      pure $ T.pack fullPath
+
+{- | Takes a path completion info and returns the list of files 
+     in the directory the path completion info describes
+-}
 listFileCompletions :: PathCompletionInfo -> IO [FilePath]
 listFileCompletions complInfo = do
   try (evaluate =<< listDirectory (mkCompletionDirectory complInfo)) >>= \case
@@ -313,6 +317,9 @@ listFileCompletions complInfo = do
       pure fixedDirs
     Left (_::IOError) -> pure []
 
+{- | Returns a list of all directories in the directory 
+     described by path completion info
+-}
 listDirectoryCompletions :: PathCompletionInfo -> IO [FilePath]
 listDirectoryCompletions complInfo = do
   filepaths <- listFileCompletions complInfo
@@ -327,7 +334,21 @@ directoryCompleter ctx = do
   let complInfo = pathCompletionInfoFromCompletionContext ctx
   directoryCompletions <- listDirectoryCompletions complInfo
   let scored = Fuzzy.simpleFilter 1000 10 (prefixLeftOver complInfo) (map T.pack directoryCompletions)
-  pure $ map (makeSimpleCabalCompletionItem (completionRange ctx) . Fuzzy.original) scored
+  forM
+    scored
+    ( \compl' -> do
+        let compl = Fuzzy.original compl'
+        fullDirPath <- makeFullDirPath compl complInfo
+        pure $ makeCabalCompletionItem (completionRange ctx) fullDirPath fullDirPath
+    )
+  where
+    -- | Takes a directory and PathCompletionInfo and 
+    --   returns the whole path including the prefix that was already written
+    makeFullDirPath :: T.Text -> PathCompletionInfo -> IO T.Text
+    makeFullDirPath completion' complInfo = do
+      let fullPath =  prefixPathInfo complInfo Posix.</> T.unpack completion'
+      pure $ T.pack fullPath
+
 
 pathCompletionInfoFromCompletionContext :: CabalCompletionContext -> PathCompletionInfo
 pathCompletionInfoFromCompletionContext ctx = PathCompletionInfo
@@ -339,6 +360,8 @@ pathCompletionInfoFromCompletionContext ctx = PathCompletionInfo
     dirNamePrefix = T.pack $ Posix.takeFileName prefix
     fp = Posix.takeDirectory $ completionCabalFilePath ctx
 
+{- | Returns 
+-}
 mkCompletionDirectory :: PathCompletionInfo -> FilePath
 mkCompletionDirectory complInfo = FP.addTrailingPathSeparator $ cabalFilePathInfo complInfo FP.</> (FP.normalise $ prefixPathInfo complInfo)