diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-11-08 v0.8.2.1 + * Set GHC-Opts to -O0 for sane compile times + * Make the ghc-hare depend on the library, rather than rebuilding + * elisp no longer prompts to save modified dired buffers + all of it. 2015-10-07 v0.8.2.0 * Work around a bug in GHC 7.10.2 that will not process pragmas after a comment at the top of a file, when comments are returned diff --git a/HaRe.cabal b/HaRe.cabal --- a/HaRe.cabal +++ b/HaRe.cabal @@ -1,5 +1,5 @@ Name: HaRe -Version: 0.8.2.0 +Version: 0.8.2.1 Author: Chris Brown, Huiqing Li, Simon Thompson, Alan Zimmerman Maintainer: Alan Zimmerman Stability: Alpha @@ -137,6 +137,7 @@ , monad-control , Cabal >= 1.22 + GHC-Options: -O0 Hs-Source-Dirs: src -- Other-Modules: Paths_HaRe Exposed-modules: @@ -172,30 +173,10 @@ Executable ghc-hare Main-Is: MainHaRe.hs -- Other-Modules: Paths_HaRe - -- GHC-Options: -Wall -O0 + GHC-Options: -O0 -- GHC-Options: -prof -fprof-auto -rtsopts -caf-all Hs-Source-Dirs: ./src - other-modules: - Language.Haskell.Refact.API - , Language.Haskell.Refact.HaRe - , Language.Haskell.Refact.Refactoring.AddRmParam - , Language.Haskell.Refact.Refactoring.Case - , Language.Haskell.Refact.Refactoring.RoundTrip - , Language.Haskell.Refact.Utils.Binds - , Language.Haskell.Refact.Utils.ExactPrint - , Language.Haskell.Refact.Utils.GhcModuleGraph - , Language.Haskell.Refact.Utils.GhcUtils - , Language.Haskell.Refact.Utils.GhcVersionSpecific - , Language.Haskell.Refact.Utils.LocUtils - , Language.Haskell.Refact.Utils.Monad - , Language.Haskell.Refact.Utils.MonadFunctions - , Language.Haskell.Refact.Utils.TypeSyn - , Language.Haskell.Refact.Utils.TypeUtils - , Language.Haskell.Refact.Utils.Types - , Language.Haskell.Refact.Utils.Utils - , Language.Haskell.Refact.Utils.Variables - , Paths_HaRe -- GHC 7.10.2 ships with base 4.8.1.0 Build-Depends: base >= 4.8.1.0 && < 4.9 @@ -229,7 +210,7 @@ , monad-control , Cabal >= 1.22 -- , Paths_HaRe - , HaRe >= 0.8 + , HaRe >= 0.8.2.1 Extensions: CPP if impl (ghc < 7.10.2) buildable: False @@ -238,7 +219,7 @@ type: exitcode-stdio-1.0 ghc-options: - -- -O0 + -O0 -- reinstate these later -Wall -- -Wall -- reinstate these later -Werror @@ -266,25 +247,25 @@ , TypeUtilsSpec , UtilsSpec - , Language.Haskell.Refact.API - , Language.Haskell.Refact.HaRe - , Language.Haskell.Refact.Refactoring.AddRmParam - , Language.Haskell.Refact.Refactoring.Case - , Language.Haskell.Refact.Refactoring.RoundTrip - , Language.Haskell.Refact.Utils.Binds - , Language.Haskell.Refact.Utils.ExactPrint - , Language.Haskell.Refact.Utils.GhcModuleGraph - , Language.Haskell.Refact.Utils.GhcUtils - , Language.Haskell.Refact.Utils.GhcVersionSpecific - , Language.Haskell.Refact.Utils.LocUtils - , Language.Haskell.Refact.Utils.Monad - , Language.Haskell.Refact.Utils.MonadFunctions - , Language.Haskell.Refact.Utils.TypeSyn - , Language.Haskell.Refact.Utils.TypeUtils - , Language.Haskell.Refact.Utils.Types - , Language.Haskell.Refact.Utils.Utils - , Language.Haskell.Refact.Utils.Variables - , Paths_HaRe + -- , Language.Haskell.Refact.API + -- , Language.Haskell.Refact.HaRe + -- , Language.Haskell.Refact.Refactoring.AddRmParam + -- , Language.Haskell.Refact.Refactoring.Case + -- , Language.Haskell.Refact.Refactoring.RoundTrip + -- , Language.Haskell.Refact.Utils.Binds + -- , Language.Haskell.Refact.Utils.ExactPrint + -- , Language.Haskell.Refact.Utils.GhcModuleGraph + -- , Language.Haskell.Refact.Utils.GhcUtils + -- , Language.Haskell.Refact.Utils.GhcVersionSpecific + -- , Language.Haskell.Refact.Utils.LocUtils + -- , Language.Haskell.Refact.Utils.Monad + -- , Language.Haskell.Refact.Utils.MonadFunctions + -- , Language.Haskell.Refact.Utils.TypeSyn + -- , Language.Haskell.Refact.Utils.TypeUtils + -- , Language.Haskell.Refact.Utils.Types + -- , Language.Haskell.Refact.Utils.Utils + -- , Language.Haskell.Refact.Utils.Variables + -- , Paths_HaRe build-depends: -- GHC 7.10.2 ships with base 4.8.1.0 base >= 4.8.1.0 && < 4.9 @@ -323,7 +304,7 @@ , monad-control , Cabal >= 1.22 -- , Paths_HaRe - -- , HaRe >= 0.8 + , HaRe >= 0.8.2.1 Extensions: CPP if impl (ghc < 7.10.2) buildable: False diff --git a/elisp/hare.el b/elisp/hare.el --- a/elisp/hare.el +++ b/elisp/hare.el @@ -922,16 +922,14 @@ (let (changed) (dolist (b (buffer-list) changed) (let* ((n (buffer-name b)) (n1 (substring n 0 1))) - (if (and (not (or (string= " " n1) (string= "*" n1))) (buffer-modified-p b)) + (if (and (buffer-file-name b) (buffer-modified-p b)) (setq changed (cons (buffer-name b) changed))))) (if changed (if (y-or-n-p (format "There are modified buffers: %s, which HaRe needs to save before refactoring, continue?" changed)) (progn - (save-some-buffers t) - t) + (save-some-buffers t) t) nil) - t) - )) + t))) (defun buffers-changed-warning() diff --git a/src/Language/Haskell/Refact/HaRe.hs b/src/Language/Haskell/Refact/HaRe.hs --- a/src/Language/Haskell/Refact/HaRe.hs +++ b/src/Language/Haskell/Refact/HaRe.hs @@ -6,6 +6,9 @@ , VerboseLevel (..) , defaultSettings , SimpPos + -- ** Re-exported from ghc-mod + , GM.Options + , GM.defaultOptions -- * Refactorings , ifToCase @@ -16,6 +19,7 @@ , rename -- , swapArgs , roundTrip + ) where @@ -27,5 +31,6 @@ import Language.Haskell.Refact.Refactoring.RoundTrip import Language.Haskell.Refact.Utils.Monad import Language.Haskell.Refact.Utils.Types +import qualified Language.Haskell.GhcMod as GM (Options(..),defaultOptions) diff --git a/src/Language/Haskell/Refact/Utils/Monad.hs b/src/Language/Haskell/Refact/Utils/Monad.hs --- a/src/Language/Haskell/Refact/Utils/Monad.hs +++ b/src/Language/Haskell/Refact/Utils/Monad.hs @@ -208,6 +208,7 @@ Right a -> return (a,s) -- --------------------------------------------------------------------- + instance GM.GmOut (StateT RefactState IO) where instance GM.MonadIO (StateT RefactState IO) where