Skip to content
This repository has been archived by the owner on Jan 2, 2021. It is now read-only.

Ignore -Werror #738

Merged
merged 2 commits into from
Sep 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions session-loader/Development/IDE/Session.hs
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ setOptions :: GhcMonad m => ComponentOptions -> DynFlags -> m (DynFlags, [Target
setOptions (ComponentOptions theOpts compRoot _) dflags = do
(dflags', targets) <- addCmdOpts theOpts dflags
let dflags'' =
disableWarningsAsErrors $
-- disabled, generated directly by ghcide instead
flip gopt_unset Opt_WriteInterface $
-- disabled, generated directly by ghcide instead
Expand Down
2 changes: 1 addition & 1 deletion src/Development/IDE/Core/Preprocessor.hs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ parsePragmasIntoDynFlags fp contents = catchSrcErrors "pragmas" $ do
liftIO $ evaluate $ rnf opts

(dflags, _, _) <- parseDynamicFilePragma dflags0 opts
return dflags
return $ disableWarningsAsErrors dflags


-- | Run (unlit) literate haskell preprocessor on a file, or buffer if set
Expand Down
15 changes: 13 additions & 2 deletions src/Development/IDE/GHC/Compat.hs
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ module Development.IDE.GHC.Compat(
Module.addBootSuffix,
pattern ModLocation,
getConArgs,

HasSrcSpan,
getLoc,

upNameCache,
disableWarningsAsErrors,

module GHC,
#if MIN_GHC_API_VERSION(8,6,0)
Expand Down Expand Up @@ -100,6 +99,7 @@ import GHC hiding (
)
import qualified HeaderInfo as Hdr
import Avail
import Data.List (foldl')
import ErrUtils (ErrorMessages)
import FastString (FastString)

Expand All @@ -119,6 +119,7 @@ import System.FilePath ((-<.>))
#endif

#if !MIN_GHC_API_VERSION(8,8,0)
import qualified EnumSet

#if MIN_GHC_API_VERSION(8,6,0)
import GhcPlugins (srcErrorMessages)
Expand Down Expand Up @@ -398,3 +399,13 @@ getConArgs = GHC.getConDetails

getPackageName :: DynFlags -> Module.InstalledUnitId -> Maybe PackageName
getPackageName dfs i = packageName <$> lookupPackage dfs (Module.DefiniteUnitId (Module.DefUnitId i))

disableWarningsAsErrors :: DynFlags -> DynFlags
disableWarningsAsErrors df =
flip gopt_unset Opt_WarnIsError $ foldl' wopt_unset_fatal df [toEnum 0 ..]
pepeiborra marked this conversation as resolved.
Show resolved Hide resolved

#if !MIN_GHC_API_VERSION(8,8,0)
wopt_unset_fatal :: DynFlags -> WarningFlag -> DynFlags
wopt_unset_fatal dfs f
= dfs { fatalWarningFlags = EnumSet.delete f (fatalWarningFlags dfs) }
#endif
1 change: 1 addition & 0 deletions src/Development/IDE/GHC/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module Development.IDE.GHC.Util(
hDuplicateTo',
setHieDir,
dontWriteHieFiles,
disableWarningsAsErrors,
) where

import Control.Concurrent
Expand Down
30 changes: 29 additions & 1 deletion test/exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,34 @@ diagnosticTests = testGroup "diagnostics"
Lens.filtered (T.isInfixOf ("/" <> name <> ".hs:"))
failure msg = liftIO $ assertFailure $ "Expected file path to be stripped but got " <> T.unpack msg
Lens.mapMOf_ offenders failure notification
, testSession' "-Werror in cradle is ignored" $ \sessionDir -> do
liftIO $ writeFile (sessionDir </> "hie.yaml")
"cradle: {direct: {arguments: [\"-Wall\", \"-Werror\"]}}"
let fooContent = T.unlines
[ "module Foo where"
, "foo = ()"
]
_ <- createDoc "Foo.hs" "haskell" fooContent
expectDiagnostics
[ ( "Foo.hs"
, [(DsWarning, (1, 0), "Top-level binding with no type signature:")
]
)
]
, testSessionWait "-Werror in pragma is ignored" $ do
let fooContent = T.unlines
[ "{-# OPTIONS_GHC -Wall -Werror #-}"
, "module Foo() where"
, "foo :: Int"
, "foo = 1"
]
_ <- createDoc "Foo.hs" "haskell" fooContent
expectDiagnostics
[ ( "Foo.hs"
, [(DsWarning, (3, 0), "Defined but not used:")
]
)
]
]

codeActionTests :: TestTree
Expand Down Expand Up @@ -3022,7 +3050,7 @@ mkRange :: Int -> Int -> Int -> Int -> Range
mkRange a b c d = Range (Position a b) (Position c d)

run :: Session a -> IO a
run s = withTempDir $ \dir -> runInDir dir s
run s = run' (const s)
pepeiborra marked this conversation as resolved.
Show resolved Hide resolved

runWithExtraFiles :: FilePath -> (FilePath -> Session a) -> IO a
runWithExtraFiles prefix s = withTempDir $ \dir -> do
Expand Down