Merge remote-tracking branch 'prezi/master'

Conflicts:
	Language/Haskell/GhcMod/CabalHelper.hs

test/CradleSpec.hs

@@ -72,3 +72,11 @@ spec = do
                   Just ("test" </> "data" </> "broken-sandbox" </> "dummy.cabal")
 
                 cradlePkgDbStack res `shouldBe` [GlobalDb, UserDb]
+
+        it "uses the custom cradle file if present" $ do
+            withDirectory "test/data/custom-cradle" $ \dir -> do
+                res <- relativeCradle dir <$> findCradle
+                cradleCurrentDir res `shouldBe` "test" </> "data" </> "custom-cradle"
+                cradleRootDir res    `shouldBe` "test" </> "data" </> "custom-cradle"
+                cradleCabalFile res  `shouldBe` Just ("test" </> "data" </> "custom-cradle" </> "dummy.cabal")
+                cradlePkgDbStack res `shouldBe` [PackageDb "a/packages", GlobalDb, PackageDb "b/packages", UserDb, PackageDb "c/packages"]

test/data/custom-cradle/dummy.cabal

@@ -0,0 +1 @@
+dummy

test/data/custom-cradle/ghc-mod.cradle

@@ -0,0 +1,5 @@
+a/packages
+global
+b/packages
+user
+c/packages