hsdev 0.2.4.0 → 0.2.5.0

raw patch · 7 files changed

+18/−20 lines, 7 filesdep ~hformatdep ~simple-log

Dependency ranges changed: hformat, simple-log

Files

• hsdev.cabal +4/−4
• src/HsDev/Display.hs +6/−6
• src/HsDev/Scan.hs +2/−2
• src/HsDev/Server/Base.hs +1/−3
• src/HsDev/Server/Types.hs +2/−2
• src/HsDev/Tools/Ghc/Worker.hs +2/−2
• src/HsDev/Types.hs +1/−1

@@ -1,5 +1,5 @@ name:                hsdev
-version:             0.2.4.0
+version:             0.2.5.0
 synopsis:            Haskell development library
 description:
   Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references, hayoo search etc.
@@ -131,7 +131,7 @@     ghc-syb-utils >= 0.2.3,
     haskell-src-exts >= 1.18.0 && < 1.20.0,
     hdocs >= 0.5.0,
-    hformat == 0.2.*,
+    hformat == 0.3.*,
     hlint >= 1.9.13 && < 2.1,
     HTTP >= 4000.2.0,
     lens >= 4.8,
@@ -145,7 +145,7 @@     process >= 1.2.0,
     regex-pcre-builtin >= 0.94,
     scientific >= 0.3,
-    simple-log == 0.8.*,
+    simple-log == 0.9.*,
     syb >= 0.5.1,
     template-haskell,
     text >= 1.2.0,
@@ -304,7 +304,7 @@     directory,
     filepath >= 1.4.0,
     containers >= 0.5.0,
-    hformat == 0.2.*,
+    hformat == 0.3.*,
     hspec,
     lens >= 4.8,
     mtl >= 2.2.0,

@@ -44,12 +44,12 @@ 	display = id
 	displayType _ = "path"
 
-instance FormatBuild PackageDb where
-	formatBuild = formatBuild . display
+instance Formattable PackageDb where
+	formattable = formattable . display
 
-instance FormatBuild ModuleLocation where
-	formatBuild = formatBuild . display
+instance Formattable ModuleLocation where
+	formattable = formattable . display
 
-instance FormatBuild Project where
-	formatBuild = formatBuild . display
+instance Formattable Project where
+	formattable = formattable . display
 

@@ -60,8 +60,8 @@ 		(uniqueBy (view _1) $ lp ++ rp)
 		(ordNub $ ls ++ rs)
 
-instance FormatBuild ScanContents where
-	formatBuild (ScanContents ms ps cs) = formatBuild str where
+instance Formattable ScanContents where
+	formattable (ScanContents ms ps cs) = formattable str where
 		str :: String
 		str = format "modules: {}, projects: {}, package-dbs: {}"
 			~~ (intercalate ", " $ ms ^.. each . _1 . moduleFile)

@@ -29,7 +29,7 @@ import qualified Control.Concurrent.FiniteChan as F
 import System.Directory.Paths (canonicalize)
 import qualified System.Directory.Watcher as Watcher
-import Text.Format ((~~), FormatBuild(..), (~%))
+import Text.Format ((~~), (~%))
 
 import qualified HsDev.Cache as Cache
 import qualified HsDev.Cache.Structured as SC
@@ -58,8 +58,6 @@ 	let
 		listenLog = F.dupChan msgs >>= F.readChan
 	return $ SessionLog l listenLog (stopLog l)
-
-instance FormatBuild Log.Level where
 
 -- | Run server
 runServer :: ServerOpts -> ServerM IO () -> IO ()

@@ -33,7 +33,7 @@ import System.Log.Simple
 
 import System.Directory.Paths
-import Text.Format (FormatBuild(..))
+import Text.Format (Formattable(..))
 
 import HsDev.Database
 import qualified HsDev.Database.Async as DB
@@ -215,7 +215,7 @@ 	show (NetworkPort p) = show p
 	show (UnixPort s) = "unix " ++ s
 
-instance FormatBuild ConnectionPort
+instance Formattable ConnectionPort
 
 -- | Server options
 data ServerOpts = ServerOpts {

@@ -39,7 +39,7 @@ import qualified  System.Log.Simple as Log
 import System.Log.Simple.Monad (MonadLog(..), LogT(..), withLog)
 import Text.Read (readMaybe)
-import Text.Format
+import Text.Format hiding (withFlags)
 
 import Exception (ExceptionMonad(..))
 import GHC hiding (Warning, Module, moduleName, pkgDatabase)
@@ -65,7 +65,7 @@ 	show SessionGhci = "ghci"
 	show (SessionGhc opts) = "ghc " ++ intercalate ", " opts
 
-instance FormatBuild SessionTarget
+instance Formattable SessionTarget
 
 instance Eq SessionTarget where
 	SessionGhci == SessionGhci = True

@@ -66,7 +66,7 @@ 	show (ResponseError e r) = format "response error: {}, response: {}" ~~ e ~~ r
 	show (OtherError e) = e
 
-instance FormatBuild HsDevError where
+instance Formattable HsDevError where
 
 jsonErr :: String -> [Pair] -> Value
 jsonErr e = object . (("error" .= e) :)