Try to get tests working on windows

Author: VeryMilkyJoe

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

@@ -4,27 +4,28 @@
 
 module Ide.Plugin.Cabal.Completions where
 
-import           Control.Exception             (try)
-import           Control.Exception.Extra       (evaluate)
-import           Control.Monad                 (filterM, forM)
-import qualified Data.List                     as List
-import qualified Data.List.Extra               as Extra
-import           Data.Map                      (Map)
-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),
-                                                showCabalSpecVersion)
-import           Distribution.Compat.Lens      ((^.))
-import qualified Language.LSP.Types            as J
-import qualified Language.LSP.Types.Lens       as JL
-import qualified Language.LSP.VFS              as VFS
-import           System.Directory              (doesDirectoryExist,
-                                                doesFileExist, listDirectory)
-import           System.FilePath
-import qualified Text.Fuzzy.Parallel           as Fuzzy
-import Ide.Plugin.Cabal.LicenseSuggest (licenseNames)
+import           Control.Exception               (try)
+import           Control.Exception.Extra         (evaluate)
+import           Control.Monad                   (filterM, forM)
+import qualified Data.List                       as List
+import qualified Data.List.Extra                 as Extra
+import           Data.Map                        (Map)
+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),
+                                                  showCabalSpecVersion)
+import           Distribution.Compat.Lens        ((^.))
+import           Ide.Plugin.Cabal.LicenseSuggest (licenseNames)
+import qualified Language.LSP.Types              as J
+import qualified Language.LSP.Types.Lens         as JL
+import qualified Language.LSP.VFS                as VFS
+import           System.Directory                (doesDirectoryExist,
+                                                  doesFileExist, listDirectory)
+import qualified System.FilePath                 as FP
+import qualified System.FilePath.Posix           as Posix
+import qualified Text.Fuzzy.Parallel             as Fuzzy
 
 -- | Takes information needed to build possible completion items
 -- and returns the list of possible completion items
@@ -91,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 ++ 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
 contextToCompleter (TopLevel, KeyWord kw) =
-  case Map.lookup kw (cabalKeywords) of
+  case Map.lookup kw cabalKeywords of
     Nothing -> noopCompleter
     Just l  -> l
 -- if we are in a stanza and not in a keyword context,
@@ -294,7 +295,7 @@ filePathCompleter ctx = do
   -- | 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 </> T.unpack completion'
+    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
@@ -306,7 +307,7 @@ listFileCompletions complInfo = do
       fixedDirs <- mapM
         (\d -> do
             isDir <- doesDirectoryExist $ mkDirFromCWD complInfo d
-            pure $ if isDir then addTrailingPathSeparator d else d
+            pure $ if isDir then Posix.addTrailingPathSeparator d else d
         )
         dirs
       pure fixedDirs
@@ -331,18 +332,18 @@ directoryCompleter ctx = do
 pathCompletionInfoFromCompletionContext :: CabalCompletionContext -> PathCompletionInfo
 pathCompletionInfoFromCompletionContext ctx = PathCompletionInfo
   { prefixLeftOver = dirNamePrefix
-  , prefixPathInfo = addTrailingPathSeparator $ takeDirectory prefix
+  , prefixPathInfo = Posix.addTrailingPathSeparator $ Posix.takeDirectory prefix
   , cabalFilePathInfo = fp}
   where
     prefix = T.unpack $ completionPrefix ctx
-    dirNamePrefix = T.pack $ takeFileName prefix
-    fp = takeDirectory $ completionCabalFilePath ctx
+    dirNamePrefix = T.pack $ Posix.takeFileName prefix
+    fp = Posix.takeDirectory $ completionCabalFilePath ctx
 
 mkCompletionDirectory :: PathCompletionInfo -> FilePath
-mkCompletionDirectory complInfo = addTrailingPathSeparator $ cabalFilePathInfo complInfo </> prefixPathInfo complInfo
+mkCompletionDirectory complInfo = FP.addTrailingPathSeparator $ cabalFilePathInfo complInfo FP.</> (FP.normalise $ prefixPathInfo complInfo)
 
 mkDirFromCWD :: PathCompletionInfo -> FilePath -> FilePath
-mkDirFromCWD complInfo fp = addTrailingPathSeparator $ mkCompletionDirectory complInfo </> fp
+mkDirFromCWD complInfo fp = Posix.addTrailingPathSeparator $ mkCompletionDirectory complInfo Posix.</> Posix.normalise fp
 
 data PathCompletionInfo = PathCompletionInfo
   { prefixLeftOver    :: T.Text

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

@@ -23,7 +23,7 @@ import           Ide.Plugin.Cabal.LicenseSuggest (licenseErrorSuggestion)
 import qualified Ide.Plugin.Cabal.Parse          as Lib
 import qualified Language.LSP.Types.Lens         as J
 import           System.Directory                (getCurrentDirectory)
-import           System.FilePath
+import           System.FilePath.Posix
 import           Test.Hls
 
 cabalPlugin :: PluginTestDescriptor Log