Respect ConfigSearchStrategy in findCabalFiles

Author: jaspervdj

lib/Language/Haskell/Stylish/Config.hs

@@ -96,16 +96,6 @@ defaultConfigBytes = $(FileEmbed.embedFile "data/stylish-haskell.yaml")
 
 
 --------------------------------------------------------------------------------
-data ConfigSearchStrategy
-    = -- | Don't try to search, just use given config file
-      UseConfig FilePath
-    | -- | Search for @.stylish-haskell.yaml@ starting from given directory.
-      -- If not found, try all ancestor directories, @$XDG_CONFIG\/stylish-haskell\/config.yaml@ and @$HOME\/.stylish-haskell.yaml@ in order.
-      -- If no config is found, default built-in config will be used.
-      SearchFromDirectory FilePath
-    | -- | Like SearchFromDirectory, but using current working directory as a starting point
-      SearchFromCurrentDirectory
-
 configFilePath :: Verbose -> ConfigSearchStrategy -> IO (Maybe FilePath)
 configFilePath _ (UseConfig userSpecified) = return (Just userSpecified)
 configFilePath verbose (SearchFromDirectory dir) = searchFrom verbose dir
@@ -137,7 +127,7 @@ loadConfig verbose configSearchStrategy = do
         Left (pos, err)     -> error $ prettyPosWithSource pos (fromStrict bytes) ("Language.Haskell.Stylish.Config.loadConfig: " ++ err)
         Right config -> do
           cabalLanguageExtensions <- if configCabal config
-            then map toStr <$> Cabal.findLanguageExtensions verbose
+            then map toStr <$> Cabal.findLanguageExtensions verbose configSearchStrategy
             else pure []
 
           return $ config

lib/Language/Haskell/Stylish/Config/Cabal.hs

@@ -16,31 +16,32 @@ import qualified Distribution.Parsec                      as Cabal
 import qualified Distribution.Simple.Utils                as Cabal
 import qualified Distribution.Utils.Path                  as Cabal
 import qualified Distribution.Verbosity                   as Cabal
+import           GHC.Data.Maybe                           (mapMaybe)
 import qualified Language.Haskell.Extension               as Language
+import           Language.Haskell.Stylish.Config.Internal
 import           Language.Haskell.Stylish.Verbose
 import           System.Directory                         (doesFileExist,
                                                            getCurrentDirectory)
 
 
 --------------------------------------------------------------------------------
-import           GHC.Data.Maybe                           (mapMaybe)
-import           Language.Haskell.Stylish.Config.Internal
-
-
---------------------------------------------------------------------------------
-findLanguageExtensions :: Verbose -> IO [(Language.KnownExtension, Bool)]
-findLanguageExtensions verbose =
-    findCabalFile verbose >>=
+findLanguageExtensions
+    :: Verbose -> ConfigSearchStrategy -> IO [(Language.KnownExtension, Bool)]
+findLanguageExtensions verbose configSearchStrategy =
+    findCabalFile verbose configSearchStrategy >>=
     maybe (pure []) (readDefaultLanguageExtensions verbose)
 
 
 --------------------------------------------------------------------------------
 -- | Find the closest .cabal file, possibly going up the directory structure.
--- TODO: use ConfigSearchStrategy here, too
-findCabalFile :: Verbose -> IO (Maybe FilePath)
-findCabalFile verbose = do
-  cwd <- getCurrentDirectory
-  go [] $ ancestors cwd
+findCabalFile :: Verbose -> ConfigSearchStrategy -> IO (Maybe FilePath)
+findCabalFile verbose configSearchStrategy = case configSearchStrategy of
+  -- If the invocation pointed us to a specific config file, it doesn't make
+  -- much sense to search for cabal files manually (the config file could be
+  -- somewhere like /etc, not necessarily a Haskell project).
+  UseConfig _                -> pure Nothing
+  SearchFromDirectory path   -> go [] $ ancestors path
+  SearchFromCurrentDirectory -> getCurrentDirectory >>= go [] . ancestors
  where
   go :: [FilePath] -> [FilePath] -> IO (Maybe FilePath)
   go searched [] = do

lib/Language/Haskell/Stylish/Config/Internal.hs

@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
 module Language.Haskell.Stylish.Config.Internal
-    ( ancestors
+    ( ConfigSearchStrategy (..)
+    , ancestors
     ) where
 
 
@@ -13,3 +14,15 @@ import           System.FilePath (joinPath, splitPath)
 -- All ancestors of a dir (including that dir)
 ancestors :: FilePath -> [FilePath]
 ancestors = map joinPath . reverse . dropWhile null . inits . splitPath
+
+
+--------------------------------------------------------------------------------
+data ConfigSearchStrategy
+    = -- | Don't try to search, just use given config file
+      UseConfig FilePath
+    | -- | Search for @.stylish-haskell.yaml@ starting from given directory.
+      -- If not found, try all ancestor directories, @$XDG_CONFIG\/stylish-haskell\/config.yaml@ and @$HOME\/.stylish-haskell.yaml@ in order.
+      -- If no config is found, default built-in config will be used.
+      SearchFromDirectory FilePath
+    | -- | Like SearchFromDirectory, but using current working directory as a starting point
+      SearchFromCurrentDirectory