Revert "Use per-file pragma"

Avi-D-coder · Avi-D-coder · commit f5f850fef18c · 2019-12-22T17:20:05.000-05:00
This reverts commit 61192ea.
diff --git a/app/MainHie.hs b/app/MainHie.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE RankNTypes   #-}
 module Main where
diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal
@@ -14,7 +14,7 @@ build-type:          Simple
 cabal-version:       >=2.0
 
 flag pedantic
-  Description: Enable -Werror
+  Description: Enable -Werror -Wwarn=unused-imports
   Default:     False
 
 library
@@ -102,7 +102,7 @@ library
 
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 executable hie
@@ -121,7 +121,7 @@ executable hie
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
                        -with-rtsopts=-T
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 
@@ -142,7 +142,7 @@ executable hie-wrapper
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
                        -with-rtsopts=-T
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 library hie-test-utils
@@ -168,7 +168,7 @@ library hie-test-utils
                      , yaml
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 test-suite unit-test
@@ -212,7 +212,7 @@ test-suite unit-test
 
   ghc-options:         -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 test-suite dispatcher-test
@@ -236,7 +236,7 @@ test-suite dispatcher-test
 
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
   build-tool-depends:  hspec-discover:hspec-discover
 
@@ -256,7 +256,7 @@ test-suite plugin-dispatcher-test
 
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 test-suite func-test
@@ -301,7 +301,7 @@ test-suite func-test
                      , containers
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
   build-tool-depends:  hspec-discover:hspec-discover
                      , haskell-ide-engine:hie
@@ -320,7 +320,7 @@ test-suite wrapper-test
                      , hie-plugin-api
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -Wredundant-constraints
   if flag(pedantic)
-     ghc-options:      -Werror
+     ghc-options:      -Werror -Wwarn=unused-imports
   default-language:    Haskell2010
 
 
diff --git a/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs b/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE CPP                 #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE OverloadedStrings   #-}
diff --git a/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs b/hie-plugin-api/Haskell/Ide/Engine/PluginsIdeMonads.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveAnyClass #-}
diff --git a/src/Haskell/Ide/Engine/Completions.hs b/src/Haskell/Ide/Engine/Completions.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE OverloadedStrings      #-}
diff --git a/src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs b/src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE DeriveAnyClass        #-}
 {-# LANGUAGE DeriveGeneric         #-}
 {-# LANGUAGE DuplicateRecordFields #-}
diff --git a/src/Haskell/Ide/Engine/Plugin/Brittany.hs b/src/Haskell/Ide/Engine/Plugin/Brittany.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Haskell.Ide.Engine.Plugin.Brittany where
 
diff --git a/src/Haskell/Ide/Engine/Plugin/Generic.hs b/src/Haskell/Ide/Engine/Plugin/Generic.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE FlexibleContexts    #-}
diff --git a/src/Haskell/Ide/Engine/Plugin/HsImport.hs b/src/Haskell/Ide/Engine/Plugin/HsImport.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
diff --git a/src/Haskell/Ide/Engine/Plugin/Package.hs b/src/Haskell/Ide/Engine/Plugin/Package.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
diff --git a/src/Haskell/Ide/Engine/Plugin/Pragmas.hs b/src/Haskell/Ide/Engine/Plugin/Pragmas.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE DeriveAnyClass    #-}
 {-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE OverloadedStrings #-}
diff --git a/src/Haskell/Ide/Engine/Scheduler.hs b/src/Haskell/Ide/Engine/Scheduler.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE MultiParamTypeClasses     #-}
 {-# LANGUAGE ExistentialQuantification #-}
diff --git a/src/Haskell/Ide/Engine/Server.hs b/src/Haskell/Ide/Engine/Server.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs                 #-}
 {-# LANGUAGE RankNTypes            #-}
diff --git a/src/Haskell/Ide/Engine/Support/HieExtras.hs b/src/Haskell/Ide/Engine/Support/HieExtras.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE NamedFieldPuns      #-}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-{-# OPTIONS_GHC -fno-warn-unused-imports #-}`
`2`	`1`	`{-# LANGUAGE OverloadedStrings #-}`
`3`	`2`	`{-# LANGUAGE RankNTypes #-}`
`4`	`3`	`module Main where`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-{-# OPTIONS_GHC -fno-warn-unused-imports #-}`
`2`	`1`	`{-# LANGUAGE CPP #-}`
`3`	`2`	`{-# LANGUAGE FlexibleContexts #-}`
`4`	`3`	`{-# LANGUAGE OverloadedStrings #-}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-{-# OPTIONS_GHC -fno-warn-unused-imports #-}`
`2`	`1`	`{-# LANGUAGE DeriveGeneric #-}`
`3`	`2`	`{-# LANGUAGE DeriveFunctor #-}`
`4`	`3`	`{-# LANGUAGE DeriveAnyClass #-}`