haskell-tools-daemon 1.1.0.2 → 1.1.1.0
raw patch · 3 files changed
+16/−16 lines, 3 filesdep ~Cabaldep ~basedep ~containers
Dependency ranges changed: Cabal, base, containers, ghc, network, template-haskell
Files
- Language/Haskell/Tools/Daemon/ErrorHandling.hs +1/−1
- Language/Haskell/Tools/Daemon/Update.hs +4/−4
- haskell-tools-daemon.cabal +11/−11
Language/Haskell/Tools/Daemon/ErrorHandling.hs view
@@ -27,7 +27,7 @@ , Handler (\case (BreakUpProblem outer rng _) -> sendError ("The program element at " ++ (if isGoodSrcSpan rng then shortShowSpanWithFile rng else shortShowSpanWithFile (RealSrcSpan outer)) ++ " could not be prepared for refactoring. The most likely reason is preprocessor usage. Only conditional compilation is supported, includes and preprocessor macros are not. If there is no preprocessor usage at the given location, there might be a weirdly placed comment causing a problem.")) , Handler (\(TransformationProblem msg) -> sendError ("A problem occurred while preparing the program for refactoring: " ++ msg)) , Handler (\(PrettyPrintProblem msg) -> sendError ("A problem occurred while pretty printing the result of the refactoring: " ++ msg)) - , Handler (\case (ConvertionProblem rng msg) -> sendError ("An unexpected problem occurred while converting the representation of the program element at " ++ shortShowSpanWithFile rng ++ ": " ++ msg) + , Handler (\case (ConvertionProblem _ rng msg) -> sendError ("An unexpected problem occurred while converting the representation of the program element at " ++ shortShowSpanWithFile rng ++ ": " ++ msg) (UnrootedConvertionProblem msg) -> sendError ("An unexpected problem occurred while converting between different program representations: " ++ msg)) , Handler (uncurry sendCompProblems . getProblems) ]
Language/Haskell/Tools/Daemon/Update.hs view
@@ -185,8 +185,8 @@ forM changes $ \case ModuleCreated n m otherM -> do mcs <- gets (^. refSessMCs) - Just (_, otherMR) <- gets (lookupModInSCs otherM . (^. refSessMCs)) - let Just otherMS = otherMR ^? modRecMS + otherMR <- gets (lookupModInSCs otherM . (^. refSessMCs)) + let Just otherMS = otherMR ^? just & _2 & modRecMS Just mc = lookupModuleColl (otherM ^. sfkModuleName) mcs otherSrcDir <- liftIO $ getSourceDir otherMS let loc = toFileName otherSrcDir n @@ -215,8 +215,8 @@ hFlush handle return $ Right (n, file, UndoChanges file undo, unifiedDiff) ModuleRemoved mod -> do - Just (sfk,_) <- gets (lookupModuleInSCs mod . (^. refSessMCs)) - let file = sfk ^. sfkFileName + sfk <- gets (lookupModuleInSCs mod . (^. refSessMCs)) + let Just file = sfk ^? just & _1 & sfkFileName origCont <- liftIO (StrictBS.unpack <$> StrictBS.readFile file) when (not diffMode) $ do lift $ removeTarget (TargetFile file Nothing)
haskell-tools-daemon.cabal view
@@ -1,5 +1,5 @@ name: haskell-tools-daemon -version: 1.1.0.2 +version: 1.1.1.0 synopsis: Background process for Haskell-tools that editors can connect to. description: Background process for Haskell-tools that provides a way to use the tools on a whole project. It also makes it possible to use the tools on the project in a @@ -86,26 +86,26 @@ , examples/Project/warning/*.hs library - build-depends: base >= 4.9 && < 5.0 + build-depends: base >= 4.9 && < 4.13 , aeson >= 1.0 && < 1.5 , bytestring >= 0.10 && < 1.0 , deepseq >= 1.4 && < 2.0 , filepath >= 1.4 && < 2.0 , strict >= 0.3 && < 0.4 - , containers >= 0.5 && < 0.6 + , containers >= 0.5 && < 0.7 , mtl >= 2.2 && < 2.3 , split >= 0.2 && < 1.0 , directory >= 1.2 && < 1.4 , process >= 1.6 && < 1.7 - , ghc >= 8.4 && < 8.5 + , ghc >= 8.4 && < 8.7 , ghc-paths >= 0.1 && < 0.2 , references >= 0.3.2 && < 1.0 - , network >= 2.6 && < 2.8 + , network >= 2.6 && < 2.9 , Diff >= 0.3 && < 0.4 - , Cabal >= 2.0 && < 2.3 + , Cabal >= 2.0 && < 2.5 , pretty >= 1.1 && < 1.2 , optparse-applicative >= 0.14 && < 0.15 - , template-haskell >= 2.13 && < 2.14 + , template-haskell >= 2.13 && < 2.15 , haskell-tools-prettyprint >= 1.1 && < 1.2 , haskell-tools-refactor >= 1.1 && < 1.2 , haskell-tools-builtin-refactorings >= 1.1 && < 1.2 @@ -132,7 +132,7 @@ executable ht-daemon ghc-options: -rtsopts - build-depends: base >= 4.9 && < 5.0 + build-depends: base >= 4.9 && < 4.13 , haskell-tools-daemon , directory >= 1.2 && < 1.4 , filepath >= 1.4 && < 2.0 @@ -146,16 +146,16 @@ ghc-options: -with-rtsopts=-M2.5g hs-source-dirs: test main-is: Main.hs - build-depends: base >= 4.11 && < 4.12 + build-depends: base >= 4.11 && < 4.13 , HUnit >= 1.5 && < 1.7 - , ghc >= 8.4 && < 8.5 + , ghc >= 8.4 && < 8.7 , tasty >= 0.11 && < 1.2 , tasty-hunit >= 0.9 && < 0.11 , directory >= 1.2 && < 1.4 , process >= 1.6 && < 1.7 , filepath >= 1.4 && < 2.0 , bytestring >= 0.10 && < 0.11 - , network >= 2.6 && < 2.8 + , network >= 2.6 && < 2.9 , aeson >= 1.0 && < 1.5 , Glob >= 0.9 && < 0.10 , haskell-tools-daemon