leksah 0.15.0.4 → 0.15.0.5
raw patch · 2 files changed
+14/−13 lines, 2 filesdep ~gtk3dep ~gtksourceview3dep ~leksahPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: gtk3, gtksourceview3, leksah
API changes (from Hackage documentation)
Files
- leksah.cabal +10/−10
- src/IDE/SourceCandy.hs +4/−3
leksah.cabal view
@@ -1,5 +1,5 @@ name: leksah-version: 0.15.0.4+version: 0.15.0.5 cabal-version: >=1.18 build-type: Simple license: GPL@@ -217,8 +217,8 @@ build-depends: dyre >= 0.8.3 && <0.9 cpp-options: -DLEKSAH_WITH_YI_DYRE - build-depends: gtk3 >=0.13.2 && <0.14,- gtksourceview3 >=0.13.1.0 && <0.14,+ build-depends: gtk3 >=0.13.8 && <0.14,+ gtksourceview3 >=0.13.1.5 && <0.14, webkitgtk3 >=0.13 && <0.14, webkitgtk3-javascriptcore -any cpp-options: -DMIN_VERSION_gtk=MIN_VERSION_gtk3@@ -296,7 +296,7 @@ ghc-options: -threaded hs-source-dirs: main- build-depends: leksah == 0.15.0.4,+ build-depends: leksah == 0.15.0.5, base >= 4.0.0.0 && <=4.9, gtk3 >=0.13.2 && <0.14 if os(linux) && flag(loc)@@ -312,12 +312,12 @@ ghc-options: -rtsopts -fwarn-missing-fields -fwarn-incomplete-patterns -ferror-spans executable bewleksah- build-depends: leksah ==0.15.0.4,+ build-depends: leksah ==0.15.0.5, base >=4.0.0.0 && <=4.9, jsaddle -any, ghcjs-dom -any,- gtk3 >=0.13.2 && <0.14,- gtksourceview3 >=0.13.1.0 && <0.14,+ gtk3 >=0.13.8 && <0.14,+ gtksourceview3 >=0.13.1.5 && <0.14, webkitgtk3 >=0.13 && <0.14, webkitgtk3-javascriptcore -any cpp-options: -DMIN_VERSION_gtk=MIN_VERSION_gtk3@@ -331,7 +331,7 @@ build-depends: base >=4.0.0.0 && <4.9, Cabal >=1.10.2.0 && <1.23, QuickCheck >=2.4.2 && <2.9,- leksah ==0.15.0.4,+ leksah ==0.15.0.5, containers, ltk, leksah-server,@@ -340,8 +340,8 @@ glib, monad-loops, text,- gtk3 >=0.13.2 && <0.14,- gtksourceview3 >=0.13.1.0 && <0.14,+ gtk3 >=0.13.8 && <0.14,+ gtksourceview3 >=0.13.1.5 && <0.14, webkitgtk3 -any cpp-options: -DMIN_VERSION_gtk=MIN_VERSION_gtk3 if flag(yi)
src/IDE/SourceCandy.hs view
@@ -27,11 +27,12 @@ , positionFromCandy -- :: CandyTable -> TextBuffer -> (Int,Int) -> IO (Int,Int) ) where +import Control.Applicative import Prelude hiding(getChar, getLine) import Data.Char(chr) import Data.List (elemIndices, isInfixOf, isSuffixOf)-import Text.ParserCombinators.Parsec+import Text.ParserCombinators.Parsec as P import qualified Text.ParserCombinators.Parsec.Token as P import Text.ParserCombinators.Parsec.Language(emptyDef) import qualified Data.Set as Set@@ -306,7 +307,7 @@ candyParser :: CharParser () CandyTableI candyParser = do whiteSpace- ls <- many oneCandyParser+ ls <- P.many oneCandyParser eof return ls @@ -323,7 +324,7 @@ toReplaceParser = lexeme (do str <- between (char '"') (char '"' <?> "end of string")- (many $noneOf "\"")+ (P.many $noneOf "\"") return $ T.pack str) <?> "to replace string"