@@ -5,6 +5,7 @@ module CabalAdd (
55 cabalAddModuleTests ,
66) where
77
8+ <<<<<<< HEAD
89import Control.Lens ((^.) )
910import Control.Lens.Fold ((^?) )
1011import qualified Data.Maybe as Maybe
@@ -21,6 +22,27 @@ import Ide.Plugin.Cabal.CabalAdd.CodeAction (hiddenPackageSug
2122import Ide.Plugin.Cabal.Parse (parseCabalFileContents )
2223import qualified Language.LSP.Protocol.Lens as L
2324import qualified Language.LSP.Protocol.Types as J
25+ ||||||| parent of b27f3d213 (Disable the cabal- add tests on windows due to long path issues)
26+ import Control.Lens ((^.) )
27+ import Control.Lens.Fold ((^?) )
28+ import qualified Data.Maybe as Maybe
29+ import qualified Data.Text as T
30+ import qualified Data.Text.Internal.Search as T
31+ import Distribution.Utils.Generic (safeHead )
32+ import Ide.Plugin.Cabal.CabalAdd (hiddenPackageSuggestion )
33+ import qualified Language.LSP.Protocol.Lens as L
34+ import Language.LSP.Protocol.Types (Diagnostic (.. ), mkRange )
35+ =======
36+ import Control.Lens ((^.) )
37+ import Control.Lens.Fold ((^?) )
38+ import qualified Data.Maybe as Maybe
39+ import qualified Data.Text as T
40+ import qualified Data.Text.Internal.Search as T
41+ import Distribution.Utils.Generic (safeHead )
42+ import Ide.Plugin.Cabal.CabalAdd (hiddenPackageSuggestion )
43+ import qualified Language.LSP.Protocol.Lens as L
44+ import Language.LSP.Protocol.Types as J (Diagnostic (.. ))
45+ >>>>>>> b27f3d213 (Disable the cabal- add tests on windows due to long path issues)
2446import System.FilePath
2547import Test.Hls
2648import Utils
@@ -198,6 +220,10 @@ cabalAddDependencyTests =
198220 ]
199221 ]
200222 where
223+ -- windows is suffering from long path issues for *some* reasons, as our XDG_CACHE_HOME
224+ -- is freshly created for each test. The prefix for windows is like 40 characters, which is too long
225+ -- for these tests in particular
226+ ignoreOnWindows = ignoreInEnv [HostOS Windows ] " Long Path issues on windows"
201227 generateAddDependencyTestSession :: FilePath -> FilePath -> T. Text -> [Int ] -> Session ()
202228 generateAddDependencyTestSession cabalFile haskellFile dependency indicesRes = do
203229 hsdoc <- openDoc haskellFile " haskell"
0 commit comments