August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-yi-mode-haskell for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-mode-haskell for openSUSE:Factory checked in at 2017-08-31 21:02:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-mode-haskell (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-mode-haskell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-mode-haskell" Thu Aug 31 21:02:42 2017 rev:3 rq:513560 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-mode-haskell/ghc-yi-mode-haskell.changes 2017-07-06 00:00:23.699694794 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-mode-haskell.new/ghc-yi-mode-haskell.changes 2017-08-31 21:02:46.602195191 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:12 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-mode-haskell-0.13.7.tar.gz New: ---- yi-mode-haskell-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-mode-haskell.spec ++++++ --- /var/tmp/diff_new_pack.75am7O/_old 2017-08-31 21:02:48.001998516 +0200 +++ /var/tmp/diff_new_pack.75am7O/_new 2017-08-31 21:02:48.041992896 +0200 @@ -17,9 +17,8 @@ %global pkg_name yi-mode-haskell -%bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Yi editor haskell mode License: GPL-2.0+ @@ -31,6 +30,7 @@ BuildRequires: ghc-array-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-data-default-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-microlens-platform-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel @@ -38,19 +38,6 @@ BuildRequires: ghc-yi-language-devel BuildRequires: ghc-yi-rope-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-hashable-devel -BuildRequires: ghc-hspec-devel -BuildRequires: ghc-pointedlist-devel -BuildRequires: ghc-regex-base-devel -BuildRequires: ghc-regex-tdfa-devel -BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-transformers-base-devel -BuildRequires: ghc-unordered-containers-devel -%endif %description Yi editor haskell mode. @@ -76,9 +63,6 @@ %install %ghc_lib_install -%check -%cabal_test - %post devel %ghc_pkg_recache ++++++ yi-mode-haskell-0.13.7.tar.gz -> yi-mode-haskell-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-mode-haskell-0.13.7/test/Spec.hs new/yi-mode-haskell-0.14.0/test/Spec.hs --- old/yi-mode-haskell-0.13.7/test/Spec.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-mode-haskell-0.14.0/test/Spec.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -{-# OPTIONS_GHC -F -pgmF hspec-discover #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-mode-haskell-0.13.7/test/Yi/Lexer/HaskellSpec.hs new/yi-mode-haskell-0.14.0/test/Yi/Lexer/HaskellSpec.hs --- old/yi-mode-haskell-0.13.7/test/Yi/Lexer/HaskellSpec.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-mode-haskell-0.14.0/test/Yi/Lexer/HaskellSpec.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -{-# LANGUAGE OverloadedStrings, FlexibleInstances #-} -{-# LANGUAGE IncoherentInstances, UndecidableInstances #-} -{-# LANGUAGE StandaloneDeriving, QuasiQuotes #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} - -module Yi.Lexer.HaskellSpec (main, spec) where - - -import Control.Applicative ((<$>)) -import Prelude hiding (lex) -import System.FilePath ((</>)) -import Test.Hspec -import Yi.Buffer.Basic (Point(..)) -import Yi.Lexer.Alex -import Yi.Lexer.Haskell -import Yi.Lexer.Helpers.TH - - -deriving instance Read OpType -deriving instance Read ReservedType -deriving instance Read CommentType -deriving instance Read Token -deriving instance Read Posn -deriving instance Read Size -deriving instance Read Point -deriving instance Read a => Read (Tok a) - -newState :: AlexState HlState -newState = AlexState initState 0 startPosn - -mkIndx :: String -> IndexedStr -mkIndx = zip [1 ..] - -newInput :: String -> AlexInput -newInput s = ('\n', [], mkIndx s) - -lex :: String -> [(AlexState HlState, TT)] -lex s = unfoldLexer alexScanToken (newState, newInput s) - -lexTok :: String -> [TT] -lexTok = map snd . lex - -lexToks :: String -> [Token] -lexToks = map tokT . lexTok - -shouldLexToS :: FilePath -> [Token] -> Expectation -shouldLexToS fp t = lexToks <$> readSample fp `shouldReturn` t - -lexesToS :: String -> [Token] -> Spec -lexesToS s tt = it s $ s `shouldLexToS` tt - -readSample :: FilePath -> IO String -readSample x = readFile $ "test" </> "test_data" </> x - -main :: IO () -main = hspec spec - -spec :: Spec -spec = do - describe "lexer tests" $ do - it "fill me in" pending - -- "Simple1.hs" `lexesToS` [ritFile|test/test_data/Simple1.hs_Token|] - -- "Simple1Unicode.hs" `lexesToS` [ritFile|test/test_data/Simple1Unicode.hs_Token|] - -- "UnicodeLiteral.hs" `lexesTo` [ritFile|test/test_data/UnicodeLiteral.hs_TToken|] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-mode-haskell-0.13.7/test/Yi/Lexer/Helpers/TH.hs new/yi-mode-haskell-0.14.0/test/Yi/Lexer/Helpers/TH.hs --- old/yi-mode-haskell-0.13.7/test/Yi/Lexer/Helpers/TH.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-mode-haskell-0.14.0/test/Yi/Lexer/Helpers/TH.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -module Yi.Lexer.Helpers.TH where - -import Language.Haskell.TH -import Language.Haskell.TH.Quote - -literally :: String -> Q Exp -literally = return . LitE . StringL - -withRead :: String -> Q Exp -withRead s = return $ AppE (VarE $ mkName "read") (LitE $ StringL s) - -lit :: QuasiQuoter -lit = QuasiQuoter { quoteExp = literally - , quotePat = \s -> error s $ "quotePat: " ++ s - , quoteType = \s -> error $ "quoteType: " ++ s - , quoteDec = \s -> error $ "quoteDec: " ++ s} - -rlit :: QuasiQuoter -rlit = QuasiQuoter { quoteExp = withRead - , quotePat = \s -> error s $ "quotePat: " ++ s - , quoteType = \s -> error $ "quoteType: " ++ s - , quoteDec = \s -> error $ "quoteDec: " ++ s} - - --- | Read file as-is. -litFile :: QuasiQuoter -litFile = quoteFile lit - -ritFile :: QuasiQuoter -ritFile = quoteFile rlit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-mode-haskell-0.13.7/test/Yi/Lexer/Helpers.hs new/yi-mode-haskell-0.14.0/test/Yi/Lexer/Helpers.hs --- old/yi-mode-haskell-0.13.7/test/Yi/Lexer/Helpers.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-mode-haskell-0.14.0/test/Yi/Lexer/Helpers.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -{-# LANGUAGE QuasiQuotes #-} -module Yi.Lexer.Helpers where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-mode-haskell-0.13.7/yi-mode-haskell.cabal new/yi-mode-haskell-0.14.0/yi-mode-haskell.cabal --- old/yi-mode-haskell-0.13.7/yi-mode-haskell.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-mode-haskell-0.14.0/yi-mode-haskell.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-mode-haskell -version: 0.13.7 +version: 0.14.0 synopsis: Yi editor haskell mode category: Yi homepage: https://github.com/yi-editor/yi#readme @@ -31,6 +31,7 @@ , array , binary >= 0.7 , data-default + , filepath , microlens-platform , text , yi-core @@ -51,42 +52,3 @@ other-modules: Paths_yi_mode_haskell default-language: Haskell2010 - -test-suite spec - type: exitcode-stdio-1.0 - main-is: Spec.hs - hs-source-dirs: - test - ghc-options: -Wall -ferror-spans - include-dirs: - src/Yi/Lexer - build-depends: - base >= 4.8 && < 5 - , array - , binary >= 0.7 - , data-default - , microlens-platform - , text - , yi-core - , yi-language - , yi-rope - , base - , array - , binary - , containers - , data-default - , filepath - , hashable >=1.1.2.5 - , hspec - , microlens-platform - , pointedlist >= 0.5 - , regex-base ==0.93.* - , regex-tdfa >= 1.1 && <1.3 - , template-haskell >= 2.4 - , transformers-base - , unordered-containers >= 0.1.3 && < 0.3 - , QuickCheck == 2.* - , yi-mode-haskell - other-modules: - Yi.Lexer.HaskellSpec Yi.Lexer.Helpers Yi.Lexer.Helpers.TH - default-language: Haskell2010

1 0

commit ghc-yi-misc-modes for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-misc-modes for openSUSE:Factory checked in at 2017-08-31 21:02:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-misc-modes (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-misc-modes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-misc-modes" Thu Aug 31 21:02:39 2017 rev:3 rq:513559 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-misc-modes/ghc-yi-misc-modes.changes 2017-07-06 00:00:19.916227781 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-misc-modes.new/ghc-yi-misc-modes.changes 2017-08-31 21:02:43.974564378 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:32 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-misc-modes-0.13.7.tar.gz New: ---- yi-misc-modes-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-misc-modes.spec ++++++ --- /var/tmp/diff_new_pack.wlVpcL/_old 2017-08-31 21:02:45.750314882 +0200 +++ /var/tmp/diff_new_pack.wlVpcL/_new 2017-08-31 21:02:45.754314320 +0200 @@ -18,7 +18,7 @@ %global pkg_name yi-misc-modes Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Yi editor miscellaneous modes License: GPL-2.0+ ++++++ yi-misc-modes-0.13.7.tar.gz -> yi-misc-modes-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-misc-modes-0.13.7/yi-misc-modes.cabal new/yi-misc-modes-0.14.0/yi-misc-modes.cabal --- old/yi-misc-modes-0.13.7/yi-misc-modes.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-misc-modes-0.14.0/yi-misc-modes.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-misc-modes -version: 0.13.7 +version: 0.14.0 synopsis: Yi editor miscellaneous modes category: Yi homepage: https://github.com/yi-editor/yi#readme

1 0

commit ghc-yi-language for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-language for openSUSE:Factory checked in at 2017-08-31 21:02:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-language (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-language.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-language" Thu Aug 31 21:02:38 2017 rev:3 rq:513558 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-language/ghc-yi-language.changes 2017-07-06 00:00:17.340590617 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-language.new/ghc-yi-language.changes 2017-08-31 21:02:40.962987511 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:40 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-language-0.13.7.tar.gz New: ---- yi-language-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-language.spec ++++++ --- /var/tmp/diff_new_pack.XmbD50/_old 2017-08-31 21:02:42.814727338 +0200 +++ /var/tmp/diff_new_pack.XmbD50/_new 2017-08-31 21:02:42.870719470 +0200 @@ -19,7 +19,7 @@ %global pkg_name yi-language %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Collection of language-related Yi libraries License: GPL-2.0+ ++++++ yi-language-0.13.7.tar.gz -> yi-language-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-language-0.13.7/src/Yi/Style/Library.hs new/yi-language-0.14.0/src/Yi/Style/Library.hs --- old/yi-language-0.13.7/src/Yi/Style/Library.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-language-0.14.0/src/Yi/Style/Library.hs 2017-06-19 21:00:18.000000000 +0200 @@ -3,7 +3,6 @@ import Yi.Style import Data.Prototype -import Data.Monoid type Theme = Proto UIStyle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-language-0.13.7/src/Yi/Syntax.hs new/yi-language-0.14.0/src/Yi/Syntax.hs --- old/yi-language-0.13.7/src/Yi/Syntax.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-language-0.14.0/src/Yi/Syntax.hs 2017-06-19 21:00:18.000000000 +0200 @@ -33,8 +33,6 @@ import qualified Data.Map as M import Control.Arrow import Yi.Style -import Data.Foldable -import Data.Traversable import Yi.Buffer.Basic import Yi.Region diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-language-0.13.7/src/Yi/Utils.hs new/yi-language-0.14.0/src/Yi/Utils.hs --- old/yi-language-0.13.7/src/Yi/Utils.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-language-0.14.0/src/Yi/Utils.hs 2017-06-19 21:00:18.000000000 +0200 @@ -1,6 +1,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FunctionalDependencies #-} {-# OPTIONS_HADDOCK show-extensions #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} -- for Binary instance of Hashmap -- | -- Module : Yi.Utils @@ -15,12 +16,10 @@ module Yi.Utils where -import Control.Applicative import Lens.Micro.Platform import Control.Monad.Base import Data.Binary import Data.Char (toLower) -import Data.Foldable hiding (all,any) import qualified Data.HashMap.Strict as HashMap import Data.Hashable(Hashable) import qualified Data.List.PointedList as PL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-language-0.13.7/test/Spec.hs new/yi-language-0.14.0/test/Spec.hs --- old/yi-language-0.13.7/test/Spec.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-language-0.14.0/test/Spec.hs 2017-06-19 21:00:18.000000000 +0200 @@ -1,3 +1,6 @@ + +import Data.Bifunctor (first) + import Test.Tasty import Test.Tasty.Hspec import Test.Tasty.QuickCheck @@ -7,13 +10,13 @@ import Text.Regex.TDFA.Pattern ignoreDoPa :: Pattern -> Pattern -ignoreDoPa (PCarat dp ) = PCarat (DoPa 0) -ignoreDoPa (PDollar dp ) = PDollar (DoPa 0) -ignoreDoPa (PDot dp ) = PDot (DoPa 0) -ignoreDoPa (PAny dp ps) = PAny (DoPa 0) ps -ignoreDoPa (PAnyNot dp ps) = PAnyNot (DoPa 0) ps -ignoreDoPa (PEscape dp pc) = PEscape (DoPa 0) pc -ignoreDoPa (PChar dp pc) = PChar (DoPa 0) pc +ignoreDoPa (PCarat _dp ) = PCarat (DoPa 0) +ignoreDoPa (PDollar _dp ) = PDollar (DoPa 0) +ignoreDoPa (PDot _dp ) = PDot (DoPa 0) +ignoreDoPa (PAny _dp ps) = PAny (DoPa 0) ps +ignoreDoPa (PAnyNot _dp ps) = PAnyNot (DoPa 0) ps +ignoreDoPa (PEscape _dp pc) = PEscape (DoPa 0) pc +ignoreDoPa (PChar _dp pc) = PChar (DoPa 0) pc ignoreDoPa (PGroup m p ) = PGroup m (ignoreDoPa p) ignoreDoPa (POr l ) = POr (map ignoreDoPa l) ignoreDoPa (PConcat l ) = PConcat (map ignoreDoPa l) @@ -25,15 +28,15 @@ ignoreDoPa (PNonEmpty p) = PNonEmpty (ignoreDoPa p) ignoreDoPa p = p -mapFst f (a,b) = (f a,b) - +main :: IO () main = defaultMain =<< tests +tests :: IO TestTree tests = testSpec "(Hspec tests)" $ do describe "reversePattern" $ do it "reverses normal characters" $ - (mapFst ignoreDoPa . reversePattern <$> parseRegex "ab") - `shouldBe` (mapFst ignoreDoPa <$> parseRegex "ba") + (first ignoreDoPa . reversePattern <$> parseRegex "ab") + `shouldBe` (first ignoreDoPa <$> parseRegex "ba") it "changes carat to dollar" $ (reversePattern <$> parseRegex "^") `shouldBe` parseRegex "$" @@ -45,5 +48,5 @@ property $ \p -> (reversePattern . reversePattern <$> parseRegex p) `shouldBe` parseRegex p it "recursively reverses patterns" $ - (mapFst ignoreDoPa . reversePattern <$> parseRegex "foo|bar") - `shouldBe` (mapFst ignoreDoPa <$> parseRegex "oof|rab") \ No newline at end of file + (first ignoreDoPa . reversePattern <$> parseRegex "foo|bar") + `shouldBe` (first ignoreDoPa <$> parseRegex "oof|rab") \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-language-0.13.7/yi-language.cabal new/yi-language-0.14.0/yi-language.cabal --- old/yi-language-0.13.7/yi-language.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-language-0.14.0/yi-language.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-language -version: 0.13.7 +version: 0.14.0 synopsis: Collection of language-related Yi libraries. category: Yi homepage: https://github.com/yi-editor/yi#readme @@ -34,13 +34,13 @@ , template-haskell >= 2.4 , containers , hashable >=1.1.2.5 - , oo-prototypes , pointedlist >= 0.5 , regex-base ==0.93.* , regex-tdfa >= 1.1 && <1.3 , transformers-base , unordered-containers >= 0.1.3 && < 0.3 , microlens-platform + , oo-prototypes build-tools: alex >= 3.0.3 && < 3.2.0 || >= 3.2.1 exposed-modules: @@ -71,7 +71,6 @@ , template-haskell >= 2.4 , containers , hashable >=1.1.2.5 - , oo-prototypes , pointedlist >= 0.5 , regex-base ==0.93.* , regex-tdfa >= 1.1 && <1.3

1 0

commit ghc-yi-keymap-vim for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-keymap-vim for openSUSE:Factory checked in at 2017-08-31 21:02:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-keymap-vim (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-keymap-vim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-keymap-vim" Thu Aug 31 21:02:36 2017 rev:3 rq:513557 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-keymap-vim/ghc-yi-keymap-vim.changes 2017-07-06 00:00:14.988921903 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-keymap-vim.new/ghc-yi-keymap-vim.changes 2017-08-31 21:02:38.167380299 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:46 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-keymap-vim-0.13.7.tar.gz New: ---- yi-keymap-vim-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-keymap-vim.spec ++++++ --- /var/tmp/diff_new_pack.LGB2wy/_old 2017-08-31 21:02:39.919134175 +0200 +++ /var/tmp/diff_new_pack.LGB2wy/_new 2017-08-31 21:02:39.919134175 +0200 @@ -19,7 +19,7 @@ %global pkg_name yi-keymap-vim %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Vim keymap for Yi editor License: GPL-2.0+ @@ -490,6 +490,7 @@ %{_datadir}/%{pkg_name}-%{version}/tests/vimtests/sort/3.test %{_datadir}/%{pkg_name}-%{version}/tests/vimtests/sort/4.test %{_datadir}/%{pkg_name}-%{version}/tests/vimtests/sort/5.test +%{_datadir}/%{pkg_name}-%{version}/tests/vimtests/sort/6.test %{_datadir}/%{pkg_name}-%{version}/tests/vimtests/switchcase/g_capU.test %{_datadir}/%{pkg_name}-%{version}/tests/vimtests/switchcase/gtilde.test %{_datadir}/%{pkg_name}-%{version}/tests/vimtests/switchcase/gtilde_1.test ++++++ yi-keymap-vim-0.13.7.tar.gz -> yi-keymap-vim-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/Ex/Commands/Reload.hs new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/Ex/Commands/Reload.hs --- old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/Ex/Commands/Reload.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/Ex/Commands/Reload.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_HADDOCK show-extensions #-} - --- | --- Module : Yi.Keymap.Vim.Ex.Commands.Reload --- License : GPL-2 --- Maintainer : yi-devel(a)googlegroups.com --- Stability : experimental --- Portability : portable - -module Yi.Keymap.Vim.Ex.Commands.Reload (parse) where - -import Data.Text () -import Yi.Boot.Internal (reload) -import Yi.Keymap (Action (YiA)) -import Yi.Keymap.Vim.Common (EventString) -import Yi.Keymap.Vim.Ex.Commands.Common (impureExCommand) -import Yi.Keymap.Vim.Ex.Types (ExCommand (cmdAction, cmdShow)) - -parse :: EventString -> Maybe ExCommand -parse "reload" = Just $ impureExCommand { - cmdShow = "reload" - , cmdAction = YiA reload - } -parse _ = Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/Ex.hs new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/Ex.hs --- old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/Ex.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/Ex.hs 2017-06-19 21:01:10.000000000 +0200 @@ -30,7 +30,6 @@ import qualified Yi.Keymap.Vim.Ex.Commands.Paste as Paste (parse) import qualified Yi.Keymap.Vim.Ex.Commands.Quit as Quit (parse) import qualified Yi.Keymap.Vim.Ex.Commands.Read as Read (parse) -import qualified Yi.Keymap.Vim.Ex.Commands.Reload as Reload (parse) import qualified Yi.Keymap.Vim.Ex.Commands.Shell as Shell (parse) import qualified Yi.Keymap.Vim.Ex.Commands.Sort as Sort (parse) import qualified Yi.Keymap.Vim.Ex.Commands.Substitute as Substitute (parse) @@ -60,7 +59,6 @@ , Paste.parse , Quit.parse , Read.parse - , Reload.parse , Sort.parse , Substitute.parse , Shell.parse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/Motion.hs new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/Motion.hs --- old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/Motion.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/Motion.hs 2017-06-19 21:00:18.000000000 +0200 @@ -205,12 +205,12 @@ matchGotoCharMove (m:[]) | m `elem` ('f' : "FtT") = PartialMatch matchGotoCharMove (m:"<lt>") | m `elem` ('f' : "FtT") = matchGotoCharMove (m:"<") matchGotoCharMove (m:c:[]) | m `elem` ('f' : "FtT") = WholeMatch $ Move style False action - where (dir, style, move, offset) = + where (style, move, offset) = case m of - 'f' -> (Forward, Inclusive, nextCInLineInc c, pure ()) - 't' -> (Forward, Inclusive, nextCInLineInc c, moveB Character Backward) - 'F' -> (Backward, Exclusive, prevCInLineInc c, pure ()) - 'T' -> (Backward, Exclusive, prevCInLineInc c, moveB Character Forward) + 'f' -> (Inclusive, nextCInLineInc c, pure ()) + 't' -> (Inclusive, nextCInLineInc c, moveB Character Backward) + 'F' -> (Exclusive, prevCInLineInc c, pure ()) + 'T' -> (Exclusive, prevCInLineInc c, moveB Character Forward) _ -> error "can't happen" action mcount = do let count = fromMaybe 1 mcount diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/VisualMap.hs new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/VisualMap.hs --- old/yi-keymap-vim-0.13.7/src/Yi/Keymap/Vim/VisualMap.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/src/Yi/Keymap/Vim/VisualMap.hs 2017-06-19 21:00:18.000000000 +0200 @@ -30,7 +30,7 @@ import Yi.Keymap.Vim.Utils (matchFromBool, mkChooseRegisterBinding, mkMotionBinding, addNewLineIfNecessary) import Yi.MiniBuffer (spawnMinibufferE) import Yi.Monad (whenM) -import qualified Yi.Rope as R (toText, countNewLines) +import qualified Yi.Rope as R (toText) import Yi.Tag (Tag (Tag)) import Yi.Utils (SemiNum ((-~))) @@ -253,7 +253,7 @@ void $ deleteRegionWithStyleB reg Block moveTo (minimum [here, there, here', there']) insertRopeWithStyleB rope Block - (Just (Register _ rope), Block) -> + (Just (Register _ _), Block) -> printMsg "Pasting non-block string into a block selection is not implemented" (Just (Register _style rope), _) -> withCurrentBuffer $ do region <- regionOfSelectionB diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/tests/Generic/TestPureBufferManipulations.hs new/yi-keymap-vim-0.14.0/tests/Generic/TestPureBufferManipulations.hs --- old/yi-keymap-vim-0.13.7/tests/Generic/TestPureBufferManipulations.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/tests/Generic/TestPureBufferManipulations.hs 2017-06-19 21:00:18.000000000 +0200 @@ -4,7 +4,7 @@ -- cursor. For example, opening a second buffer is not considered a pure buffer -- operation. -module Generic.TestPureBufferManipulations where +module Generic.TestPureBufferManipulations (getTests) where import Test.Tasty.HUnit import Test.Tasty (TestTree, testGroup) @@ -24,7 +24,6 @@ import Yi.Config (Config) import Yi.Editor import Yi.Window -import Yi.Region import Generic.TestUtils @@ -152,9 +151,9 @@ return $ testsFromDirs ++ testsFromFiles optionalSettingAction :: OptionalSetting -> EditorM () -optionalSettingAction (WindowSize w h) = - let region = mkSizeRegion (Point 0) (Size (w*h)) - in currentWindowA %= (\w -> w { height = h, actualLines = h, winRegion = region }) +optionalSettingAction (WindowSize width' height') = + let region = mkSizeRegion (Point 0) (Size (width' * height')) + in currentWindowA %= (\w -> w { height = height', actualLines = height', winRegion = region }) mkTestCase :: Config -> KeymapTest -> TestTree mkTestCase cf t = testCase (ktName t) $ do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/tests/Vim/EditorManipulations/BufferExCommand.hs new/yi-keymap-vim-0.14.0/tests/Vim/EditorManipulations/BufferExCommand.hs --- old/yi-keymap-vim-0.13.7/tests/Vim/EditorManipulations/BufferExCommand.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/tests/Vim/EditorManipulations/BufferExCommand.hs 2017-06-19 21:00:18.000000000 +0200 @@ -14,7 +14,7 @@ type BufferName = String --- | Create three buffers and return the 'BufferRef' and buffer name of +-- | Create three bufs and return the 'BufferRef' and buffer name of -- each. createInitialBuffers :: EditorM [(BufferRef, BufferName)] createInitialBuffers = do @@ -25,10 +25,10 @@ nthBufferRef :: Int -> [(BufferRef, BufferName)] -> BufferRef -nthBufferRef n buffers = fst $ buffers !! n +nthBufferRef n bufs = fst $ bufs !! n nthBufferName :: Int -> [(BufferRef, BufferName)] -> BufferName -nthBufferName n buffers = snd $ buffers !! n +nthBufferName n bufs = snd $ bufs !! n tests :: Config -> KeyEval -> TestTree @@ -37,15 +37,15 @@ testCase ":buffer {bufname} switches to the named buffer" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertNotCurrentBuffer (nthBufferRef 1 buffers) editor + preConditions editor bufs = + assertNotCurrentBuffer (nthBufferRef 1 bufs) editor - testActions buffers = - ev $ ":buffer " ++ nthBufferName 1 buffers ++ "<CR>" + testActions bufs = + ev $ ":buffer " ++ nthBufferName 1 bufs ++ "<CR>" - assertions editor buffers = do + assertions editor bufs = do assertContentOfCurrentBuffer c "Buffer two" editor - assertCurrentBuffer (nthBufferRef 1 buffers) editor + assertCurrentBuffer (nthBufferRef 1 bufs) editor runTest setupActions preConditions testActions assertions c @@ -53,16 +53,16 @@ , testCase ":buffer N switches to the numbered buffer" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertNotCurrentBuffer (nthBufferRef 1 buffers) editor + preConditions editor bufs = + assertNotCurrentBuffer (nthBufferRef 1 bufs) editor - testActions buffers = - let (BufferRef bref) = nthBufferRef 1 buffers + testActions bufs = + let (BufferRef bref) = nthBufferRef 1 bufs in ev $ ":buffer " ++ show bref ++ "<CR>" - assertions editor buffers = do + assertions editor bufs = do assertContentOfCurrentBuffer c "Buffer two" editor - assertCurrentBuffer (nthBufferRef 1 buffers) editor + assertCurrentBuffer (nthBufferRef 1 bufs) editor runTest setupActions preConditions testActions assertions c @@ -70,17 +70,17 @@ , testCase ":buffer # switches to the previous buffer" $ do let setupActions = createInitialBuffers - preConditions editor buffers = + preConditions editor bufs = assertEqual "Unexpected buffer stack" - [nthBufferRef 2 buffers, nthBufferRef 1 buffers] + [nthBufferRef 2 bufs, nthBufferRef 1 bufs] (take 2 . NE.toList $ bufferStack editor) testActions _ = ev $ ":buffer #<CR>" - assertions editor buffers = do + assertions editor bufs = do assertEqual "Unexpected buffer stack" - [nthBufferRef 1 buffers, nthBufferRef 2 buffers] + [nthBufferRef 1 bufs, nthBufferRef 2 bufs] (take 2 . NE.toList $ bufferStack editor) runTest setupActions preConditions testActions assertions c @@ -89,15 +89,15 @@ , testCase ":buffer % is a no-op" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertCurrentBuffer (nthBufferRef 2 buffers) editor + preConditions editor bufs = + assertCurrentBuffer (nthBufferRef 2 bufs) editor testActions _ = ev $ ":buffer %<CR>" - assertions editor buffers = do + assertions editor bufs = do assertContentOfCurrentBuffer c "Buffer three" editor - assertCurrentBuffer (nthBufferRef 2 buffers) editor + assertCurrentBuffer (nthBufferRef 2 bufs) editor runTest setupActions preConditions testActions assertions c @@ -105,15 +105,15 @@ , testCase ":buffer is a no-op" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertCurrentBuffer (nthBufferRef 2 buffers) editor + preConditions editor bufs = + assertCurrentBuffer (nthBufferRef 2 bufs) editor testActions _ = ev $ ":buffer<CR>" - assertions editor buffers = do + assertions editor bufs = do assertContentOfCurrentBuffer c "Buffer three" editor - assertCurrentBuffer (nthBufferRef 2 buffers) editor + assertCurrentBuffer (nthBufferRef 2 bufs) editor runTest setupActions preConditions testActions assertions c @@ -121,15 +121,15 @@ , testCase "A modified buffer is not abandoned" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertNotCurrentBuffer (nthBufferRef 1 buffers) editor + preConditions editor bufs = + assertNotCurrentBuffer (nthBufferRef 1 bufs) editor - testActions buffers = do + testActions bufs = do withCurrentBuffer $ insertN "The buffer is altered" - ev $ ":buffer " ++ nthBufferName 1 buffers ++ "<CR>" + ev $ ":buffer " ++ nthBufferName 1 bufs ++ "<CR>" - assertions editor buffers = do - assertNotCurrentBuffer (nthBufferRef 1 buffers) editor + assertions editor bufs = do + assertNotCurrentBuffer (nthBufferRef 1 bufs) editor runTest setupActions preConditions testActions assertions c @@ -137,15 +137,15 @@ , testCase "A modified buffer can be abandoned with a bang" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertNotCurrentBuffer (nthBufferRef 1 buffers) editor + preConditions editor bufs = + assertNotCurrentBuffer (nthBufferRef 1 bufs) editor - testActions buffers = do + testActions bufs = do withCurrentBuffer $ insertN "The buffer is altered" - ev $ ":buffer! " ++ nthBufferName 1 buffers ++ "<CR>" + ev $ ":buffer! " ++ nthBufferName 1 bufs ++ "<CR>" - assertions editor buffers = do - assertCurrentBuffer (nthBufferRef 1 buffers) editor + assertions editor bufs = do + assertCurrentBuffer (nthBufferRef 1 bufs) editor runTest setupActions preConditions testActions assertions c @@ -153,18 +153,18 @@ , testCase ":Nbuffer switches to the numbered buffer" $ do let setupActions = createInitialBuffers - preConditions editor buffers = - assertNotCurrentBuffer (nthBufferRef 1 buffers) editor + preConditions editor bufs = + assertNotCurrentBuffer (nthBufferRef 1 bufs) editor - testActions buffers = + testActions bufs = -- return () - let (BufferRef bref) = nthBufferRef 1 buffers + let (BufferRef bref) = nthBufferRef 1 bufs in ev $ ":" ++ show bref ++ "buffer<CR>" -- in ev $ ":buffer " ++ show bref ++ "<CR>" - assertions editor buffers = do + assertions editor bufs = do -- assertContentOfCurrentBuffer c "Buffer two" editor - assertCurrentBuffer (nthBufferRef 1 buffers) editor + assertCurrentBuffer (nthBufferRef 1 bufs) editor runTest setupActions preConditions testActions assertions c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/tests/Vim/TestExCommandParsers.hs new/yi-keymap-vim-0.14.0/tests/Vim/TestExCommandParsers.hs --- old/yi-keymap-vim-0.13.7/tests/Vim/TestExCommandParsers.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/tests/Vim/TestExCommandParsers.hs 2017-06-19 21:00:18.000000000 +0200 @@ -1,7 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} module Vim.TestExCommandParsers (tests) where -import Control.Applicative import Data.List (inits) import Data.Maybe import Data.Monoid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/tests/vimtests/sort/6.test new/yi-keymap-vim-0.14.0/tests/vimtests/sort/6.test --- old/yi-keymap-vim-0.13.7/tests/vimtests/sort/6.test 1970-01-01 01:00:00.000000000 +0100 +++ new/yi-keymap-vim-0.14.0/tests/vimtests/sort/6.test 2017-06-18 15:15:20.000000000 +0200 @@ -0,0 +1,20 @@ +-- Input +(1,1) +#pragma once + +#include <memory> +#include <future> +#include <string> + +namespace stuff { +-- Output +(6,1) +#pragma once + +#include <future> +#include <memory> +#include <string> + +namespace stuff { +-- Events +jjVjj:sort<CR> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-vim-0.13.7/yi-keymap-vim.cabal new/yi-keymap-vim-0.14.0/yi-keymap-vim.cabal --- old/yi-keymap-vim-0.13.7/yi-keymap-vim.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-keymap-vim-0.14.0/yi-keymap-vim.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-keymap-vim -version: 0.13.7 +version: 0.14.0 synopsis: Vim keymap for Yi editor category: Yi homepage: https://github.com/yi-editor/yi#readme @@ -384,6 +384,7 @@ tests/vimtests/sort/3.test tests/vimtests/sort/4.test tests/vimtests/sort/5.test + tests/vimtests/sort/6.test tests/vimtests/switchcase/g_capU.test tests/vimtests/switchcase/gtilde.test tests/vimtests/switchcase/gtilde_1.test @@ -531,7 +532,6 @@ Yi.Keymap.Vim.Ex.Commands.Paste Yi.Keymap.Vim.Ex.Commands.Quit Yi.Keymap.Vim.Ex.Commands.Read - Yi.Keymap.Vim.Ex.Commands.Reload Yi.Keymap.Vim.Ex.Commands.Shell Yi.Keymap.Vim.Ex.Commands.Sort Yi.Keymap.Vim.Ex.Commands.Substitute

1 0

commit ghc-yi-keymap-emacs for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-keymap-emacs for openSUSE:Factory checked in at 2017-08-31 21:02:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-keymap-emacs (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-keymap-emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-keymap-emacs" Thu Aug 31 21:02:34 2017 rev:3 rq:513556 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-keymap-emacs/ghc-yi-keymap-emacs.changes 2017-07-06 00:00:12.353293191 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-keymap-emacs.new/ghc-yi-keymap-emacs.changes 2017-08-31 21:02:35.775716333 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:17 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-keymap-emacs-0.13.7.tar.gz New: ---- yi-keymap-emacs-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-keymap-emacs.spec ++++++ --- /var/tmp/diff_new_pack.QhTVN0/_old 2017-08-31 21:02:37.199516286 +0200 +++ /var/tmp/diff_new_pack.QhTVN0/_new 2017-08-31 21:02:37.227512352 +0200 @@ -18,7 +18,7 @@ %global pkg_name yi-keymap-emacs Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Emacs keymap for Yi editor License: GPL-2.0+ ++++++ yi-keymap-emacs-0.13.7.tar.gz -> yi-keymap-emacs-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-emacs-0.13.7/yi-keymap-emacs.cabal new/yi-keymap-emacs-0.14.0/yi-keymap-emacs.cabal --- old/yi-keymap-emacs-0.13.7/yi-keymap-emacs.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-keymap-emacs-0.14.0/yi-keymap-emacs.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-keymap-emacs -version: 0.13.7 +version: 0.14.0 synopsis: Emacs keymap for Yi editor category: Yi homepage: https://github.com/yi-editor/yi#readme

1 0

commit ghc-yi-keymap-cua for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-keymap-cua for openSUSE:Factory checked in at 2017-08-31 21:02:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-keymap-cua (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-keymap-cua.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-keymap-cua" Thu Aug 31 21:02:29 2017 rev:3 rq:513555 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-keymap-cua/ghc-yi-keymap-cua.changes 2017-07-06 00:00:09.413707297 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-keymap-cua.new/ghc-yi-keymap-cua.changes 2017-08-31 21:02:31.944254661 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:33 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-keymap-cua-0.13.7.tar.gz New: ---- yi-keymap-cua-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-keymap-cua.spec ++++++ --- /var/tmp/diff_new_pack.06eUx0/_old 2017-08-31 21:02:34.999825347 +0200 +++ /var/tmp/diff_new_pack.06eUx0/_new 2017-08-31 21:02:35.023821975 +0200 @@ -18,7 +18,7 @@ %global pkg_name yi-keymap-cua Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Cua keymap for Yi editor License: GPL-2.0+ ++++++ yi-keymap-cua-0.13.7.tar.gz -> yi-keymap-cua-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-keymap-cua-0.13.7/yi-keymap-cua.cabal new/yi-keymap-cua-0.14.0/yi-keymap-cua.cabal --- old/yi-keymap-cua-0.13.7/yi-keymap-cua.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-keymap-cua-0.14.0/yi-keymap-cua.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-keymap-cua -version: 0.13.7 +version: 0.14.0 synopsis: Cua keymap for Yi editor category: Yi homepage: https://github.com/yi-editor/yi#readme

1 0

commit ghc-yi-ireader for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-ireader for openSUSE:Factory checked in at 2017-08-31 21:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-ireader (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-ireader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-ireader" Thu Aug 31 21:02:26 2017 rev:3 rq:513554 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-ireader/ghc-yi-ireader.changes 2017-07-06 00:00:05.318284229 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-ireader.new/ghc-yi-ireader.changes 2017-08-31 21:02:27.764841877 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:08:04 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-ireader-0.13.7.tar.gz New: ---- yi-ireader-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-ireader.spec ++++++ --- /var/tmp/diff_new_pack.k0jI1a/_old 2017-08-31 21:02:28.936677231 +0200 +++ /var/tmp/diff_new_pack.k0jI1a/_new 2017-08-31 21:02:28.956674422 +0200 @@ -18,7 +18,7 @@ %global pkg_name yi-ireader Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Yi editor incremental reader License: GPL-2.0+ ++++++ yi-ireader-0.13.7.tar.gz -> yi-ireader-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-ireader-0.13.7/yi-ireader.cabal new/yi-ireader-0.14.0/yi-ireader.cabal --- old/yi-ireader-0.13.7/yi-ireader.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-ireader-0.14.0/yi-ireader.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-ireader -version: 0.13.7 +version: 0.14.0 synopsis: Yi editor incremental reader category: Yi homepage: https://github.com/yi-editor/yi#readme

1 0

commit ghc-yi-fuzzy-open for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-fuzzy-open for openSUSE:Factory checked in at 2017-08-31 21:02:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-fuzzy-open (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-fuzzy-open.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-fuzzy-open" Thu Aug 31 21:02:24 2017 rev:3 rq:513553 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-fuzzy-open/ghc-yi-fuzzy-open.changes 2017-07-06 00:00:02.638661713 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-fuzzy-open.new/ghc-yi-fuzzy-open.changes 2017-08-31 21:02:24.961235789 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:26 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-fuzzy-open-0.13.7.tar.gz New: ---- yi-fuzzy-open-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-fuzzy-open.spec ++++++ --- /var/tmp/diff_new_pack.EDRpIS/_old 2017-08-31 21:02:25.853110479 +0200 +++ /var/tmp/diff_new_pack.EDRpIS/_new 2017-08-31 21:02:25.877107107 +0200 @@ -18,7 +18,7 @@ %global pkg_name yi-fuzzy-open Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Fuzzy open plugin for yi License: GPL-2.0+ ++++++ yi-fuzzy-open-0.13.7.tar.gz -> yi-fuzzy-open-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-fuzzy-open-0.13.7/yi-fuzzy-open.cabal new/yi-fuzzy-open-0.14.0/yi-fuzzy-open.cabal --- old/yi-fuzzy-open-0.13.7/yi-fuzzy-open.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-fuzzy-open-0.14.0/yi-fuzzy-open.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-fuzzy-open -version: 0.13.7 +version: 0.14.0 synopsis: Fuzzy open plugin for yi description: This plugin tries to do what ctrl-p does for vim and helm does for emacs. category: Yi @@ -33,8 +33,8 @@ , text >= 1.2 , transformers-base >= 0.4.4 , vector >= 0.11 - , yi-core >= 0.13.1 - , yi-language >= 0.13.1 + , yi-core >= 0.14.0 + , yi-language >= 0.14.0 , yi-rope >= 0.7 exposed-modules: Yi.Fuzzy

1 0

commit ghc-yi-frontend-vty for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-frontend-vty for openSUSE:Factory checked in at 2017-08-31 21:02:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-frontend-vty (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-frontend-vty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-frontend-vty" Thu Aug 31 21:02:22 2017 rev:3 rq:513552 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-frontend-vty/ghc-yi-frontend-vty.changes 2017-07-05 23:59:59.855053846 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-frontend-vty.new/ghc-yi-frontend-vty.changes 2017-08-31 21:02:23.157489220 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:27 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-frontend-vty-0.13.7.tar.gz New: ---- yi-frontend-vty-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-frontend-vty.spec ++++++ --- /var/tmp/diff_new_pack.pJE5iS/_old 2017-08-31 21:02:24.749265571 +0200 +++ /var/tmp/diff_new_pack.pJE5iS/_new 2017-08-31 21:02:24.749265571 +0200 @@ -18,7 +18,7 @@ %global pkg_name yi-frontend-vty Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Vty frontend for Yi editor License: GPL-2.0+ ++++++ yi-frontend-vty-0.13.7.tar.gz -> yi-frontend-vty-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-frontend-vty-0.13.7/src/Yi/Frontend/Vty.hs new/yi-frontend-vty-0.14.0/src/Yi/Frontend/Vty.hs --- old/yi-frontend-vty-0.13.7/src/Yi/Frontend/Vty.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-frontend-vty-0.14.0/src/Yi/Frontend/Vty.hs 2017-06-19 21:00:18.000000000 +0200 @@ -402,5 +402,5 @@ baseAttr False sty = attributesToAttr (appEndo (tabNotFocusedStyle uiStyle) sty) Vty.defAttr `Vty.withStyle` Vty.underline - padding = Vty.charFill (tabAttr False) ' ' (SL.sizeX r - width) 1 - width = sum . map ((+2) . T.length . fst) $ ts + padding = Vty.charFill (tabAttr False) ' ' (SL.sizeX r - width') 1 + width' = sum . map ((+2) . T.length . fst) $ ts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-frontend-vty-0.13.7/yi-frontend-vty.cabal new/yi-frontend-vty-0.14.0/yi-frontend-vty.cabal --- old/yi-frontend-vty-0.13.7/yi-frontend-vty.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-frontend-vty-0.14.0/yi-frontend-vty.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-frontend-vty -version: 0.13.7 +version: 0.14.0 synopsis: Vty frontend for Yi editor category: Yi homepage: https://github.com/yi-editor/yi#readme

1 0

commit ghc-yi-core for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-yi-core for openSUSE:Factory checked in at 2017-08-31 21:02:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yi-core (Old) and /work/SRC/openSUSE:Factory/.ghc-yi-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yi-core" Thu Aug 31 21:02:20 2017 rev:3 rq:513551 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yi-core/ghc-yi-core.changes 2017-07-05 23:59:56.535521475 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yi-core.new/ghc-yi-core.changes 2017-08-31 21:02:21.425732535 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:08:16 UTC 2017 - psimons(a)suse.com + +- Update to version 0.14.0. + +------------------------------------------------------------------- Old: ---- yi-core-0.13.7.tar.gz New: ---- yi-core-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yi-core.spec ++++++ --- /var/tmp/diff_new_pack.IdshH6/_old 2017-08-31 21:02:22.585569575 +0200 +++ /var/tmp/diff_new_pack.IdshH6/_new 2017-08-31 21:02:22.621564518 +0200 @@ -19,7 +19,7 @@ %global pkg_name yi-core %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.7 +Version: 0.14.0 Release: 0 Summary: Yi editor core library License: GPL-2.0+ @@ -27,7 +27,6 @@ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-Hclip-devel BuildRequires: ghc-ListLike-devel BuildRequires: ghc-array-devel BuildRequires: ghc-attoparsec-devel @@ -39,7 +38,6 @@ BuildRequires: ghc-dlist-devel BuildRequires: ghc-dynamic-state-devel BuildRequires: ghc-dyre-devel -BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-microlens-platform-devel @@ -51,7 +49,6 @@ BuildRequires: ghc-process-devel BuildRequires: ghc-process-extras-devel BuildRequires: ghc-rpm-macros -BuildRequires: ghc-safe-devel BuildRequires: ghc-semigroups-devel BuildRequires: ghc-split-devel BuildRequires: ghc-text-devel @@ -61,7 +58,6 @@ BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-word-trie-devel BuildRequires: ghc-xdg-basedir-devel BuildRequires: ghc-yi-language-devel BuildRequires: ghc-yi-rope-devel ++++++ yi-core-0.13.7.tar.gz -> yi-core-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/System/CanonicalizePath.hs new/yi-core-0.14.0/src/System/CanonicalizePath.hs --- old/yi-core-0.13.7/src/System/CanonicalizePath.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/System/CanonicalizePath.hs 2017-06-19 21:00:18.000000000 +0200 @@ -12,7 +12,6 @@ -- System.Directory.canonicalizePath replacement module System.CanonicalizePath ( canonicalizePath - , normalisePath , replaceShorthands ) where @@ -32,13 +31,6 @@ pathSeparators, takeDirectory, (</>)) import System.PosixCompat.Files (readSymbolicLink) --- | Removes `/./` `//` and `/../` sequences from path, --- doesn't follow symlinks -normalisePath :: FilePath -> IO FilePath -normalisePath path = do - absPath <- makeAbsolute path - return $ foldl combinePath "/" $ splitPath absPath - -- | Returns absolute name of the file, which doesn't contain -- any `/./`, `/../`, `//` sequences or symlinks canonicalizePath :: FilePath -> IO FilePath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Boot/Internal.hs new/yi-core-0.14.0/src/Yi/Boot/Internal.hs --- old/yi-core-0.13.7/src/Yi/Boot/Internal.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Boot/Internal.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -{-# OPTIONS_HADDOCK show-extensions #-} - --- | --- Module : Yi.Boot.Internal --- License : GPL-2 --- Maintainer : yi-devel(a)googlegroups.com --- Stability : experimental --- Portability : portable --- --- Internal use for Yi.Boot - -module Yi.Boot.Internal where - -import Config.Dyre.Relaunch (relaunchWithBinaryState) -import Control.Monad.Base (liftBase) -import Control.Monad.State (get) -import Yi.Keymap (YiM, withUI) -import Yi.Types (withEditor) -import Yi.UI.Common (end) - --- | "reloads" the configuration --- --- Serializes the editor state and relaunches Yi using the serialized --- state. The launch of Yi will result in recompilation of the user's --- custom Yi. This, in effect, "reloads" the configuration. -reload :: YiM () -reload = do - editor <- withEditor get - withUI (`end` False) - liftBase $ relaunchWithBinaryState (Just editor) Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Boot.hs new/yi-core-0.14.0/src/Yi/Boot.hs --- old/yi-core-0.13.7/src/Yi/Boot.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Boot.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_HADDOCK show-extensions #-} - --- | --- Module : Yi.Boot --- License : GPL-2 --- Maintainer : yi-devel(a)googlegroups.com --- Stability : experimental --- Portability : portable --- --- Boot process of Yi. --- --- Uses Dyre to implement the XMonad-style dynamic reconfiguration. - -module Yi.Boot (yi, yiDriver, yiDriver', reload) where - -import qualified Config.Dyre as Dyre -import qualified Config.Dyre.Options as Dyre -import qualified Config.Dyre.Params as Dyre -import Config.Dyre.Relaunch -import Lens.Micro.Platform -import Data.Text () -import qualified Data.Text.IO as T (putStrLn) -import System.Environment -import System.Exit -import Yi.Boot.Internal -import Yi.Buffer.Misc (BufferId(..)) -import Yi.Config -import Yi.Editor -import Yi.Keymap -import Yi.Main -import Yi.Option (OptionError(..)) -import Yi.Paths (getCustomConfigPath) -import Yi.Rope (fromString) - --- | Once the custom yi is compiled this restores the editor state (if --- requested) then proceeds to run the editor. -realMain :: (Config, ConsoleConfig) -> IO () -realMain configs = restoreBinaryState Nothing >>= main configs - --- | If the custom yi compile produces errors or warnings then the --- messages are presented as a separate activity in the editor. --- --- The use of a separate activity prevents any other initial actions --- from immediately masking the output. -showErrorsInConf :: (Config, ConsoleConfig) -> String -> (Config, ConsoleConfig) -showErrorsInConf c errs = c & _1 . initialActionsA %~ (makeAction openErrBuf :) - where - openErrBuf = splitE >> newBufferE (MemBuffer "*errors*") (fromString errs) - --- | Handy alias for 'yiDriver'. -yi :: Config -> IO () -yi = yiDriver - --- | Called from the yi built with the user's configuration. Does not --- ignore unknown arguments. -yiDriver :: Config -> IO () -yiDriver = yiDriver' False - --- | Used by both the yi executable and the custom yi that is built --- from the user's configuration. The yi executable uses a default --- config. -yiDriver' :: Bool -> Config -> IO () -yiDriver' ignoreUnknownArgs cfg = do - args <- Dyre.withDyreOptions Dyre.defaultParams getArgs - -- we do the arg processing before dyre, so we can extract - -- '--ghc-option=' and '--help' and so on. - case do_args ignoreUnknownArgs cfg args of - Left (OptionError err code) -> T.putStrLn err >> exitWith code - Right (finalCfg, cfgcon) -> do - modules <- getCustomConfigPath (userConfigDir cfgcon) "modules" - let yiParams = Dyre.defaultParams - { Dyre.projectName = "yi" - , Dyre.realMain = realMain - , Dyre.showError = showErrorsInConf - , Dyre.configDir = Just $ userConfigDir cfgcon - , Dyre.ghcOpts = ["-threaded", "-O2", "-rtsopts"] - ++ ["-i" ++ modules] - ++ profilingParams - ++ ghcOptions cfgcon - , Dyre.includeCurrentDirectory = False - , Dyre.rtsOptsHandling = Dyre.RTSAppend ["-I5"] - } - Dyre.wrapMain yiParams (finalCfg, cfgcon) - --- | CPP-guarded profiling params. -profilingParams :: [String] -profilingParams = -#ifdef EVENTLOG - ["-eventlog", "-rtsopts"] ++ -#endif -#ifdef PROFILING - ["-prof", "-auto-all", "-rtsopts" - , "-osuf=p_o", "-hisuf=p_hi"] ++ -#endif - [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Buffer/Implementation.hs new/yi-core-0.14.0/src/Yi/Buffer/Implementation.hs --- old/yi-core-0.13.7/src/Yi/Buffer/Implementation.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Buffer/Implementation.hs 2017-06-19 21:00:18.000000000 +0200 @@ -24,17 +24,16 @@ , Update (..) , updateIsDelete , Point - , Mark, MarkValue(..) + , Mark, MarkValue (..) , Size , Direction (..) - , BufferImpl(..) + , BufferImpl (mem, marks, markNames, hlCache, overlays, dirtyOffset) , Overlay (..) , mkOverlay , overlayUpdate , applyUpdateI , isValidUpdate , reverseUpdateI - , nelemsBI , sizeBI , newBI , solPoint @@ -62,7 +61,6 @@ , SearchExp , markPointAA , markGravityAA - , mem ) where import GHC.Generics (Generic) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Buffer/Indent.hs new/yi-core-0.14.0/src/Yi/Buffer/Indent.hs --- old/yi-core-0.13.7/src/Yi/Buffer/Indent.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Buffer/Indent.hs 2017-06-19 21:00:18.000000000 +0200 @@ -38,7 +38,6 @@ import Yi.Buffer.Basic (Direction (..)) import Yi.Buffer.HighLevel (firstNonSpaceB, getNextLineB, getNextNonBlankLineB, moveToSol, readLnB) import Yi.Buffer.Misc -import Yi.Buffer.Normal () import Yi.Buffer.Region (Region (regionStart), mkRegion, modifyRegionB, readRegionB) import Yi.Buffer.TextUnit (regionWithTwoMovesB) import Yi.Rope (YiString) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Buffer/Misc.hs new/yi-core-0.14.0/src/Yi/Buffer/Misc.hs --- old/yi-core-0.13.7/src/Yi/Buffer/Misc.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Buffer/Misc.hs 2017-06-19 21:00:18.000000000 +0200 @@ -224,7 +224,7 @@ import Yi.Buffer.Implementation import Yi.Buffer.Undo import Yi.Interact as I (P (End)) -import Yi.Monad (getsAndModify) +import Yi.Monad (getsAndModify, uses) import Yi.Region (Region, mkRegion) import Yi.Rope (YiString) import qualified Yi.Rope as R @@ -233,9 +233,6 @@ import Yi.Utils (SemiNum ((+~)), makeClassyWithSuffix, makeLensesWithSuffix) import Yi.Window (Window (width, wkey, actualLines), dummyWindow) - -uses l f = f <$> use l - -- In addition to Buffer's text, this manages (among others): -- * Log of updates mades -- * Undo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Buffer/Region.hs new/yi-core-0.14.0/src/Yi/Buffer/Region.hs --- old/yi-core-0.13.7/src/Yi/Buffer/Region.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Buffer/Region.hs 2017-06-19 21:00:18.000000000 +0200 @@ -130,7 +130,6 @@ linesOfRegionB :: Region -> BufferM [Region] linesOfRegionB region = do let start = regionStart region - end = regionEnd region direction = regionDirection region ls <- R.lines' <$> readRegionB region return $ case ls of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Buffer/Undo.hs new/yi-core-0.14.0/src/Yi/Buffer/Undo.hs --- old/yi-core-0.13.7/src/Yi/Buffer/Undo.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Buffer/Undo.hs 2017-06-19 21:00:18.000000000 +0200 @@ -57,7 +57,6 @@ ) where import Data.Binary (Binary (..)) -import Data.Monoid import qualified Data.Sequence as S import GHC.Generics (Generic) import Yi.Buffer.Implementation @@ -147,7 +146,7 @@ where -- Apply a /valid/ update and also move point in buffer to update position applyUpdateWithMoveI :: Update -> BufferImpl syntax -> BufferImpl syntax - applyUpdateWithMoveI u = case updateDirection u of + applyUpdateWithMoveI upd = case updateDirection upd of Forward -> apply . move Backward -> move . apply where move = modifyMarkBI pointMark (\v -> v {markPoint = updatePoint u}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/CompletionTree.hs new/yi-core-0.14.0/src/Yi/CompletionTree.hs --- old/yi-core-0.13.7/src/Yi/CompletionTree.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/CompletionTree.hs 2017-06-19 21:00:18.000000000 +0200 @@ -177,9 +177,9 @@ | mempty == ct = [] | otherwise = toList' ct where - toList' (CompletionTree ct) - | M.null ct = [mempty] - | otherwise = concat $ M.elems $ M.mapWithKey (\k v -> map (k `LL.append`) $ toList' v) ct + toList' (CompletionTree ct') + | M.null ct' = [mempty] + | otherwise = concat $ M.elems $ M.mapWithKey (\k v -> map (k `LL.append`) $ toList' v) ct' -- TODO: make this function display a tree and rename to showTree -- | For debugging purposes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Config/Simple.hs new/yi-core-0.14.0/src/Yi/Config/Simple.hs --- old/yi-core-0.13.7/src/Yi/Config/Simple.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Config/Simple.hs 2017-06-19 21:01:10.000000000 +0200 @@ -22,6 +22,7 @@ -- -- @ -- import Yi.Config.Simple +-- import Yi.Boot -- import qualified Yi.Mode.Haskell as Haskell -- -- note: don't import "Yi", or else there will be name clashes -- @@ -45,7 +46,6 @@ module Yi.Config.Simple ( -- * The main interface ConfigM, - configMain, Field, -- * Modes, commands, and keybindings globalBindKeys, @@ -98,7 +98,6 @@ -- we can't just export 'module Yi', because then we would get -- clashes with Yi.Config - module Yi.Boot, module Yi.Buffer, module Yi.Core, module Yi.Dired, @@ -120,7 +119,6 @@ import qualified Data.Text as T import qualified Data.Sequence as S import Text.Printf(printf) -import Yi.Boot import Yi.Buffer hiding (modifyMode) import Yi.Config.Default import Yi.Config.Misc @@ -157,11 +155,6 @@ --------------- Main interface -- newtype ConfigM a (imported) --- | Starts with the given initial config, makes the described --- modifications, then starts yi. -configMain :: Config -> ConfigM () -> IO () -configMain c m = yi =<< execStateT (runConfigM m) c - ------------------------- Modes, commands, and keybindings -- | Adds the given key bindings to the `global keymap'. The bindings -- will override existing bindings in the case of a clash. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Core.hs new/yi-core-0.14.0/src/Yi/Core.hs --- old/yi-core-0.13.7/src/Yi/Core.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Core.hs 2017-06-19 21:00:18.000000000 +0200 @@ -85,7 +85,7 @@ import Yi.Keymap import Yi.Keymap.Keys import Yi.KillRing (krEndCmd) -import Yi.Monad (gets) +import Yi.Monad (gets, uses) import Yi.PersistentState (loadPersistentState, savePersistentState) import Yi.Process import qualified Yi.Rope as R (YiString, fromString, readFile) @@ -95,8 +95,6 @@ import Yi.Utils (io) import Yi.Window (bufkey, dummyWindow, isMini, winRegion, wkey) - -uses l f = f <$> use l -- | Make an action suitable for an interactive run. -- UI will be refreshed. interactive :: IsRefreshNeeded -> [Action] -> YiM () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Editor.hs new/yi-core-0.14.0/src/Yi/Editor.hs --- old/yi-core-0.13.7/src/Yi/Editor.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Editor.hs 2017-06-19 21:00:18.000000000 +0200 @@ -102,12 +102,11 @@ import Lens.Micro.Platform (Lens', lens, mapped, use, view, (%=), (%~), - (&), (.~), (^.), (.=), - ASetter) + (&), (.~), (^.)) import Control.Monad (forM_, liftM) import Control.Monad.Reader (MonadReader (ask), asks, unless, when) -import Control.Monad.State (gets, modify, MonadState) +import Control.Monad.State (gets, modify) import Data.Binary (Binary, get, put) import Data.Default (Default, def) import qualified Data.DelayList as DelayList (insert) @@ -137,7 +136,7 @@ import Yi.JumpList (Jump (..), JumpList, addJump, jumpBack, jumpForward) import Yi.KillRing (krEmpty, krGet, krPut, krSet) import Yi.Layout -import Yi.Monad (getsAndModify) +import Yi.Monad (assign, getsAndModify, uses) import Yi.Rope (YiString, empty, fromText) import qualified Yi.Rope as R (YiString, fromText, snoc) import Yi.String (listify) @@ -147,11 +146,6 @@ import Yi.Utils import Yi.Window -assign :: MonadState s m => ASetter s s a b -> b -> m () -assign = (.=) - -uses l f = f <$> use l - instance Binary Editor where put (Editor bss bs supply ts dv _sl msh kr regex _dir _ev _cwa ) = let putNE (x :| xs) = put x >> put xs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Eval.hs new/yi-core-0.14.0/src/Yi/Eval.hs --- old/yi-core-0.13.7/src/Yi/Eval.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Eval.hs 2017-06-19 21:00:18.000000000 +0200 @@ -42,7 +42,7 @@ import Prelude hiding (mapM_) import Lens.Micro.Platform ( (^.), (.=), (%=) ) -import Control.Monad (when, void, forever) +import Control.Monad (when) import Data.Array ( elems ) import Data.Binary ( Binary ) import Data.Default ( Default, def ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/MiniBuffer.hs new/yi-core-0.14.0/src/Yi/MiniBuffer.hs --- old/yi-core-0.13.7/src/Yi/MiniBuffer.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/MiniBuffer.hs 2017-06-19 21:00:18.000000000 +0200 @@ -10,6 +10,7 @@ {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_HADDOCK show-extensions #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} -- | -- Module : Yi.Minibuffer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Monad.hs new/yi-core-0.14.0/src/Yi/Monad.hs --- old/yi-core-0.13.7/src/Yi/Monad.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Monad.hs 2017-06-19 21:00:18.000000000 +0200 @@ -1,8 +1,10 @@ module Yi.Monad ( + assign, gets, getsAndModify, maybeM, repeatUntilM, + uses, whenM, with, ) where @@ -10,6 +12,7 @@ import Control.Monad.Base (MonadBase, liftBase) import Control.Monad.Reader (MonadReader, ask) import Control.Monad.State (MonadState, get, gets, put, when) +import Lens.Micro.Platform (Getting, ASetter, (.=), use) -- | Combination of the Control.Monad.State 'modify' and 'gets' getsAndModify :: MonadState s m => (s -> (s,a)) -> m a @@ -39,3 +42,9 @@ then (do xs <- repeatUntilM m return (x:xs)) else return [x] + +assign :: MonadState s m => ASetter s s a b -> b -> m () +assign = (.=) + +uses :: MonadState s m => Getting a s a -> (a -> b) -> m b +uses l f = f <$> use l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Syntax/Tree.hs new/yi-core-0.14.0/src/Yi/Syntax/Tree.hs --- old/yi-core-0.13.7/src/Yi/Syntax/Tree.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Syntax/Tree.hs 2017-06-19 21:00:18.000000000 +0200 @@ -41,10 +41,9 @@ import Data.Monoid (First (First, getFirst), Last (Last, getLast), (<>)) import Yi.Buffer.Basic (Point) import Yi.Debug (error, trace) -import Yi.Lexer.Alex (Posn (Posn, posnLine, posnOfs), - Tok (Tok, tokPosn), tokBegin, tokEnd) -import Yi.Region (Region (regionEnd, regionStart), - includedRegion, mkRegion) +import Yi.Lexer.Alex (posnLine, posnOfs, + Tok (tokPosn), tokBegin, tokEnd) +import Yi.Region (Region (regionEnd, regionStart), mkRegion) import Yi.String (showT) #ifdef TESTING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi/Tag.hs new/yi-core-0.14.0/src/Yi/Tag.hs --- old/yi-core-0.13.7/src/Yi/Tag.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi/Tag.hs 2017-06-19 21:00:18.000000000 +0200 @@ -41,8 +41,8 @@ import qualified Data.Foldable as F (concat) import Data.Map (Map, fromListWith, keys, lookup) import Data.Maybe (mapMaybe) -import qualified Data.Text as T (Text, append, isPrefixOf, lines, pack, unpack, words) -import qualified Data.Text.Encoding as E (decodeUtf8, encodeUtf8) +import qualified Data.Text as T (Text, append, isPrefixOf, lines, unpack, words) +import qualified Data.Text.Encoding as E (decodeUtf8) import qualified Data.Text.Read as R (decimal) import qualified Yi.CompletionTree as CT import System.FilePath (takeDirectory, takeFileName, (</>)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/src/Yi.hs new/yi-core-0.14.0/src/Yi.hs --- old/yi-core-0.13.7/src/Yi.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/src/Yi.hs 2017-06-19 21:01:10.000000000 +0200 @@ -20,7 +20,6 @@ module Yi ( module Data.Prototype, -- prototypes are mainly there for config; makes sense to export them. - module Yi.Boot, module Yi.Buffer, module Yi.Config, module Yi.Config.Default, @@ -38,7 +37,6 @@ ) where import Data.Prototype -import Yi.Boot import Yi.Buffer import Yi.Config import Yi.Config.Default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/test/Yi/CompletionTests.hs new/yi-core-0.14.0/test/Yi/CompletionTests.hs --- old/yi-core-0.13.7/test/Yi/CompletionTests.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/test/Yi/CompletionTests.hs 2017-06-19 21:00:18.000000000 +0200 @@ -1,13 +1,11 @@ module Yi.CompletionTests (testSuite) where -import Data.List (sort,nub) import Data.Maybe(isJust) import Data.Monoid import Data.Text.Arbitrary() import Test.Tasty import Test.Tasty.QuickCheck import Yi.Completion as C -import qualified Data.Map as M import qualified Data.Text as T testSuite :: TestTree diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/test/Yi/Mode/CommonTests.hs new/yi-core-0.14.0/test/Yi/Mode/CommonTests.hs --- old/yi-core-0.13.7/test/Yi/Mode/CommonTests.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/test/Yi/Mode/CommonTests.hs 2017-06-19 21:00:18.000000000 +0200 @@ -2,7 +2,6 @@ module Yi.Mode.CommonTests (testSuite) where import Test.Tasty -import Test.Tasty.QuickCheck import Test.Tasty.HUnit import Yi.Mode.Common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/test/Yi/TagTests.hs new/yi-core-0.14.0/test/Yi/TagTests.hs --- old/yi-core-0.13.7/test/Yi/TagTests.hs 2017-06-14 18:26:30.000000000 +0200 +++ new/yi-core-0.14.0/test/Yi/TagTests.hs 2017-06-19 21:00:18.000000000 +0200 @@ -2,7 +2,6 @@ module Yi.TagTests (testSuite) where import Test.Tasty -import Test.Tasty.QuickCheck import Test.Tasty.HUnit import Yi.Tag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yi-core-0.13.7/yi-core.cabal new/yi-core-0.14.0/yi-core.cabal --- old/yi-core-0.13.7/yi-core.cabal 2017-06-17 19:57:23.000000000 +0200 +++ new/yi-core-0.14.0/yi-core.cabal 2017-06-19 21:18:28.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: yi-core -version: 0.13.7 +version: 0.14.0 synopsis: Yi editor core library category: Yi homepage: https://github.com/yi-editor/yi#readme @@ -52,11 +52,8 @@ , directory , dlist >= 0.4.1 , dynamic-state >= 0.1.0.5 - , dyre >= 0.8.11 - , exceptions , filepath >= 1.1 , hashable >= 1.1.2.5 - , Hclip >= 3 , ListLike >= 4.5 , microlens-platform , mtl >= 0.1.0.1 @@ -66,8 +63,6 @@ , pointedlist >= 0.5 , process >= 1.0.1.1 , process-extras >= 0.3.3.8 - , safe >= 0.3.4 - , semigroups , split >= 0.2 , text >= 1.1.1.3 , text-icu >= 0.7 @@ -75,10 +70,11 @@ , transformers-base , unix-compat >= 0.1 , unordered-containers >= 0.1.3 - , word-trie >= 0.2.0.4 , xdg-basedir >= 0.2.1 , yi-language >= 0.1.1.0 , yi-rope >= 0.7.0.0 + , semigroups + , dyre >= 0.8.11 if os(win32) build-depends: Win32 @@ -101,8 +97,6 @@ , random exposed-modules: Yi - Yi.Boot - Yi.Boot.Internal Yi.Buffer Yi.Buffer.Adjusted Yi.Buffer.HighLevel @@ -194,11 +188,8 @@ , directory , dlist >= 0.4.1 , dynamic-state >= 0.1.0.5 - , dyre >= 0.8.11 - , exceptions , filepath >= 1.1 , hashable >= 1.1.2.5 - , Hclip >= 3 , ListLike >= 4.5 , microlens-platform , mtl >= 0.1.0.1 @@ -208,8 +199,6 @@ , pointedlist >= 0.5 , process >= 1.0.1.1 , process-extras >= 0.3.3.8 - , safe >= 0.3.4 - , semigroups , split >= 0.2 , text >= 1.1.1.3 , text-icu >= 0.7 @@ -217,7 +206,6 @@ , transformers-base , unix-compat >= 0.1 , unordered-containers >= 0.1.3 - , word-trie >= 0.2.0.4 , xdg-basedir >= 0.2.1 , yi-language >= 0.1.1.0 , yi-rope >= 0.7.0.0 @@ -258,11 +246,8 @@ , directory , dlist >= 0.4.1 , dynamic-state >= 0.1.0.5 - , dyre >= 0.8.11 - , exceptions , filepath >= 1.1 , hashable >= 1.1.2.5 - , Hclip >= 3 , ListLike >= 4.5 , microlens-platform , mtl >= 0.1.0.1 @@ -272,8 +257,6 @@ , pointedlist >= 0.5 , process >= 1.0.1.1 , process-extras >= 0.3.3.8 - , safe >= 0.3.4 - , semigroups , split >= 0.2 , text >= 1.1.1.3 , text-icu >= 0.7 @@ -281,7 +264,6 @@ , transformers-base , unix-compat >= 0.1 , unordered-containers >= 0.1.3 - , word-trie >= 0.2.0.4 , xdg-basedir >= 0.2.1 , yi-language >= 0.1.1.0 , yi-rope >= 0.7.0.0

1 0