Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-skylighting-core for
openSUSE:Factory checked in at 2022-08-01 21:30:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-skylighting-core (Old)
and /work/SRC/openSUSE:Factory/.ghc-skylighting-core.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-skylighting-core"
Mon Aug 1 21:30:33 2022 rev:29 rq:987091 version:0.12.3.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-skylighting-core/ghc-skylighting-core.changes
2022-02-26 17:02:46.631542518 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-skylighting-core.new.1533/ghc-skylighting-core.changes
2022-08-01 21:30:55.961748341 +0200
@@ -1,0 +2,19 @@
+Thu May 19 17:52:09 UTC 2022 - Peter Simons <[email protected]>
+
+- Update skylighting-core to version 0.12.3.1.
+ ## 0.12.3.1
+
+ * Allow mtl 2.3.
+
+ * Update syntax defs from upstream: bash, cmake, go, haxe, lua, zsh.
+
+ * Add nix.xml (#149).
+
+ * Add Pygments styles for `Import` and `BuiltIn` token types (#147,
+ Bryan A. Danielak).
+
+ * Use StrictData.
+
+ * Remove unused dependencies (silences cabal warnings) (Andreas Abel).
+
+-------------------------------------------------------------------
Old:
----
skylighting-core-0.12.3.tar.gz
New:
----
skylighting-core-0.12.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-skylighting-core.spec ++++++
--- /var/tmp/diff_new_pack.CbRcbK/_old 2022-08-01 21:30:56.905751049 +0200
+++ /var/tmp/diff_new_pack.CbRcbK/_new 2022-08-01 21:30:56.909751060 +0200
@@ -19,7 +19,7 @@
%global pkg_name skylighting-core
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.12.3
+Version: 0.12.3.1
Release: 0
Summary: Syntax highlighting library
License: BSD-3-Clause
++++++ skylighting-core-0.12.3.tar.gz -> skylighting-core-0.12.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/changelog.md
new/skylighting-core-0.12.3.1/changelog.md
--- old/skylighting-core-0.12.3/changelog.md 2022-02-18 20:09:38.000000000
+0100
+++ new/skylighting-core-0.12.3.1/changelog.md 2022-05-19 17:27:28.000000000
+0200
@@ -1,5 +1,20 @@
# Revision history for skylighting and skylighting-core
+## 0.12.3.1
+
+ * Allow mtl 2.3.
+
+ * Update syntax defs from upstream: bash, cmake, go, haxe, lua, zsh.
+
+ * Add nix.xml (#149).
+
+ * Add Pygments styles for `Import` and `BuiltIn` token types (#147,
+ Bryan A. Danielak).
+
+ * Use StrictData.
+
+ * Remove unused dependencies (silences cabal warnings) (Andreas Abel).
+
## 0.12.3
* Add scss, sass, systemverilog, orgmode.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/skylighting-core.cabal
new/skylighting-core-0.12.3.1/skylighting-core.cabal
--- old/skylighting-core-0.12.3/skylighting-core.cabal 2022-02-18
20:06:07.000000000 +0100
+++ new/skylighting-core-0.12.3.1/skylighting-core.cabal 2022-05-19
17:24:58.000000000 +0200
@@ -1,5 +1,5 @@
name: skylighting-core
-version: 0.12.3
+version: 0.12.3.1
synopsis: syntax highlighting library
description: Skylighting is a syntax highlighting library.
It derives its tokenizers from XML syntax
@@ -181,7 +181,6 @@
filepath,
text,
containers,
- directory,
criterion >= 1.0 && < 1.6
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
if impl(ghc >= 8.4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/src/Regex/KDE/Compile.hs
new/skylighting-core-0.12.3.1/src/Regex/KDE/Compile.hs
--- old/skylighting-core-0.12.3/src/Regex/KDE/Compile.hs 2022-01-20
19:01:30.000000000 +0100
+++ new/skylighting-core-0.12.3.1/src/Regex/KDE/Compile.hs 2022-05-19
18:14:20.000000000 +0200
@@ -15,6 +15,7 @@
import Data.Char
import Control.Applicative
import Regex.KDE.Regex
+import Control.Monad
import Control.Monad.State.Strict
#if !MIN_VERSION_base(4,11,0)
import Data.Semigroup ((<>))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/src/Skylighting/Loader.hs
new/skylighting-core-0.12.3.1/src/Skylighting/Loader.hs
--- old/skylighting-core-0.12.3/src/Skylighting/Loader.hs 2021-10-25
04:55:33.000000000 +0200
+++ new/skylighting-core-0.12.3.1/src/Skylighting/Loader.hs 2022-05-19
16:25:47.000000000 +0200
@@ -7,7 +7,7 @@
where
import Control.Monad (filterM, foldM)
-import Control.Monad.Except (ExceptT(ExceptT), runExceptT)
+import Control.Monad.Trans.Except (ExceptT(ExceptT), runExceptT)
import Control.Monad.IO.Class (liftIO)
import System.Directory (listDirectory, doesFileExist)
import System.FilePath ((</>), takeExtension)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/src/Skylighting/Parser.hs
new/skylighting-core-0.12.3.1/src/Skylighting/Parser.hs
--- old/skylighting-core-0.12.3/src/Skylighting/Parser.hs 2022-01-20
19:01:30.000000000 +0100
+++ new/skylighting-core-0.12.3.1/src/Skylighting/Parser.hs 2022-05-19
18:19:30.000000000 +0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE TupleSections #-}
@@ -26,8 +27,12 @@
import System.FilePath
import Text.XML
import qualified Control.Exception as E
-import Control.Monad.Except
+import Control.Monad.Trans.Except
+import Control.Monad.Error.Class
import Control.Monad.Identity
+#if MIN_VERSION_mtl(2,3,0)
+import Control.Monad
+#endif
-- | Adds a syntax definition to a syntax map,
-- replacing any existing definition with the same name.
@@ -337,8 +342,8 @@
in KeywordAttr { keywordCaseSensitive =
vBool True $ getAttrValue "casesensitive" x
, keywordDelims = Set.union standardDelims
- (Set.fromList additionalDelim) Set.\\
- Set.fromList weakDelim }
+ (Set.fromList additionalDelim)
+ Set.\\ Set.fromList weakDelim }
parseContextSwitch :: Text -> Text -> [ContextSwitch]
parseContextSwitch syntaxname t =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/src/Skylighting/Styles.hs
new/skylighting-core-0.12.3.1/src/Skylighting/Styles.hs
--- old/skylighting-core-0.12.3/src/Skylighting/Styles.hs 2019-09-27
17:54:45.000000000 +0200
+++ new/skylighting-core-0.12.3.1/src/Skylighting/Styles.hs 2022-05-09
17:16:21.000000000 +0200
@@ -130,11 +130,11 @@
, (SpecialCharTok, defStyle{ tokenColor = color 0x4070a0 })
, (VerbatimStringTok, defStyle{ tokenColor = color 0x4070a0 })
, (SpecialStringTok, defStyle{ tokenColor = color 0xBB6688 })
- , (ImportTok, defStyle)
+ , (ImportTok, defStyle{ tokenColor = color 0x008000, tokenBold = True})
, (VariableTok, defStyle{ tokenColor = color 0x19177C })
, (ControlFlowTok, defStyle{ tokenColor = color 0x007020, tokenBold = True
})
, (OperatorTok, defStyle{ tokenColor = color 0x666666 })
- , (BuiltInTok, defStyle)
+ , (BuiltInTok, defStyle{ tokenColor = color 0x008000})
, (ExtensionTok, defStyle)
, (PreprocessorTok, defStyle{ tokenColor = color 0xBC7A00 })
, (AttributeTok, defStyle{ tokenColor = color 0x7D9029 })
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/src/Skylighting/Tokenizer.hs
new/skylighting-core-0.12.3.1/src/Skylighting/Tokenizer.hs
--- old/skylighting-core-0.12.3/src/Skylighting/Tokenizer.hs 2021-10-25
04:55:33.000000000 +0200
+++ new/skylighting-core-0.12.3.1/src/Skylighting/Tokenizer.hs 2022-05-19
18:14:51.000000000 +0200
@@ -1,4 +1,6 @@
{-# OPTIONS_GHC -fno-warn-missing-methods #-}
+{-# LANGUAGE StrictData #-}
+{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE FlexibleInstances #-}
@@ -12,6 +14,7 @@
) where
import Control.Applicative
+import Control.Monad
import Control.Monad.Except
import Control.Monad.Reader
import Control.Monad.State.Strict
@@ -133,7 +136,7 @@
-- | Tokenize some text using 'Syntax'.
tokenize :: TokenizerConfig -> Syntax -> Text -> Either String [SourceLine]
tokenize config syntax inp =
- eitherStack >>= \stack ->
+ eitherStack >>= \(!stack) ->
case runTokenizerM action
config{ syntaxMap = Map.map (resolveKeywords (syntaxMap config))
(syntaxMap config) }
@@ -194,11 +197,11 @@
doContextSwitch :: ContextSwitch -> TokenizerM ()
doContextSwitch Pop = popContextStack
-doContextSwitch (Push (syn,c)) = do
+doContextSwitch (Push (!syn,!c)) = do
syntaxes <- asks syntaxMap
case Map.lookup syn syntaxes >>= lookupContext c of
- Just con -> pushContextStack con
- Nothing -> throwError $ "Unknown syntax or context: " ++ show (syn, c)
+ Just !con -> pushContextStack con
+ Nothing -> throwError $ "Unknown syntax or context: " ++ show (syn, c)
doContextSwitches :: [ContextSwitch] -> TokenizerM ()
doContextSwitches = mapM_ doContextSwitch
@@ -211,16 +214,16 @@
lookupContext name syntax = Map.lookup name $ sContexts syntax
tokenizeLine :: (ByteString, Int) -> TokenizerM [Token]
-tokenizeLine (ln, linenum) = do
+tokenizeLine (!ln, !linenum) = do
modify $ \st -> st{ input = ln, endline = BS.null ln, prevChar = '\n' }
cur <- currentContext
lineCont <- gets lineContinuation
if lineCont
then modify $ \st -> st{ lineContinuation = False }
else do
+ let !mbFirstNonspace = BS.findIndex (not . isSpace) $! ln
modify $ \st -> st{ column = 0
- , firstNonspaceColumn =
- BS.findIndex (not . isSpace) ln }
+ , firstNonspaceColumn = mbFirstNonspace }
doContextSwitches (cLineBeginContext cur)
if BS.null ln
then doContextSwitches (cLineEmptyContext cur)
@@ -240,7 +243,7 @@
getToken = do
inp <- gets input
gets endline >>= guard . not
- context <- currentContext
+ !context <- currentContext
msum (map (\r -> tryRule r inp) (cRules context)) <|>
case cFallthroughContext context of
[] | cFallthrough context -> Nothing <$ doContextSwitches [Pop]
@@ -257,7 +260,7 @@
inp <- gets input
let (bs,rest) = UTF8.splitAt numchars inp
guard $ not (BS.null bs)
- t <- decodeBS bs
+ !t <- decodeBS bs
modify $ \st -> st{ input = rest,
endline = BS.null rest,
prevChar = Text.last t,
@@ -273,8 +276,8 @@
Just n -> gets column >>= guard . (== n)
when (rFirstNonspace rule) $ do
- firstNonspace <- gets firstNonspaceColumn
- col <- gets column
+ !firstNonspace <- gets firstNonspaceColumn
+ !col <- gets column
guard (firstNonspace == Just col)
oldstate <- if rLookahead rule
@@ -599,11 +602,13 @@
normalizeHighlighting :: [Token] -> [Token]
normalizeHighlighting [] = []
-normalizeHighlighting ((t,x):xs)
+normalizeHighlighting ((!t,!x):xs)
| Text.null x = normalizeHighlighting xs
| otherwise =
- (t, Text.concat (x : map snd matches)) : normalizeHighlighting rest
+ (t, matchedText) : normalizeHighlighting rest
where (matches, rest) = span (\(z,_) -> z == t) xs
+ !matchedText = Text.concat (x : map snd matches)
+
parseCStringChar :: ByteString -> TokenizerM Text
parseCStringChar inp = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/src/Skylighting/Types.hs
new/skylighting-core-0.12.3.1/src/Skylighting/Types.hs
--- old/skylighting-core-0.12.3/src/Skylighting/Types.hs 2022-01-20
19:01:30.000000000 +0100
+++ new/skylighting-core-0.12.3.1/src/Skylighting/Types.hs 2022-04-05
17:59:32.000000000 +0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE StrictData #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveGeneric #-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/test/expected/abc.go.native
new/skylighting-core-0.12.3.1/test/expected/abc.go.native
--- old/skylighting-core-0.12.3/test/expected/abc.go.native 2021-07-17
20:58:07.000000000 +0200
+++ new/skylighting-core-0.12.3.1/test/expected/abc.go.native 2022-05-09
18:54:47.000000000 +0200
@@ -34,7 +34,7 @@
, ( OperatorTok , ")" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "return" )
+ , ( ControlFlowTok , "return" )
, ( NormalTok , " " )
, ( KeywordTok , "func" )
, ( OperatorTok , "(" )
@@ -47,7 +47,7 @@
, ( OperatorTok , "{" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "return" )
+ , ( ControlFlowTok , "return" )
, ( NormalTok , " r" )
, ( OperatorTok , "(" )
, ( NormalTok , "word" )
@@ -74,7 +74,7 @@
, ( OperatorTok , "{" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "if" )
+ , ( ControlFlowTok , "if" )
, ( NormalTok , " word " )
, ( OperatorTok , "==" )
, ( NormalTok , " " )
@@ -83,7 +83,7 @@
, ( OperatorTok , "{" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "return" )
+ , ( ControlFlowTok , "return" )
, ( NormalTok , " " )
, ( OtherTok , "true" )
]
@@ -100,7 +100,7 @@
, ( DecValTok , "32" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "for" )
+ , ( ControlFlowTok , "for" )
, ( NormalTok , " i" )
, ( OperatorTok , "," )
, ( NormalTok , " b " )
@@ -111,7 +111,7 @@
, ( OperatorTok , "{" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "if" )
+ , ( ControlFlowTok , "if" )
, ( NormalTok , " c " )
, ( OperatorTok , "==" )
, ( NormalTok , " b" )
@@ -148,7 +148,7 @@
, ( NormalTok , " b" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "if" )
+ , ( ControlFlowTok , "if" )
, ( NormalTok , " r" )
, ( OperatorTok , "(" )
, ( NormalTok , "word" )
@@ -167,7 +167,7 @@
, ( OperatorTok , "{" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "return" )
+ , ( ControlFlowTok , "return" )
, ( NormalTok , " " )
, ( OtherTok , "true" )
]
@@ -196,7 +196,7 @@
, [ ( NormalTok , " " ) , ( OperatorTok , "}" ) ]
, [ ( NormalTok , " " ) , ( OperatorTok , "}" ) ]
, [ ( NormalTok , " " )
- , ( KeywordTok , "return" )
+ , ( ControlFlowTok , "return" )
, ( NormalTok , " " )
, ( OtherTok , "false" )
]
@@ -220,7 +220,7 @@
, ( OperatorTok , ")" )
]
, [ ( NormalTok , " " )
- , ( KeywordTok , "for" )
+ , ( ControlFlowTok , "for" )
, ( NormalTok , " _" )
, ( OperatorTok , "," )
, ( NormalTok , " word " )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/bash.xml
new/skylighting-core-0.12.3.1/xml/bash.xml
--- old/skylighting-core-0.12.3/xml/bash.xml 2022-02-18 20:08:19.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/bash.xml 2022-05-09 17:17:36.000000000
+0200
@@ -39,7 +39,7 @@
<!ENTITY arithmetic_as_subshell
"\(((?:[^`'"()$]++|\$\{[^`'"(){}$]+\}|\$(?=[^{`'"()])|`[^`]*+`|\((?1)(?:[)]|(?=['"])))++)(?:[)](?=$|[^)])|["'])">
]>
-<language name="Bash" version="36" kateversion="5.79" section="Scripts"
extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD"
mimetype="application/x-shellscript" casesensitive="1" author="Wilbert
Berendsen ([email protected])" license="LGPL">
+<language name="Bash" version="38" kateversion="5.79" section="Scripts"
extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD"
mimetype="application/x-shellscript" casesensitive="1" author="Wilbert
Berendsen ([email protected])" license="LGPL">
<!-- (c) 2004 by Wilbert Berendsen ([email protected])
Changes by Matthew Woehlke ([email protected])
@@ -787,16 +787,30 @@
<!-- FindPathThenPopInAlternateValue consumes path in ${xx:here}-->
<context attribute="Normal Text" lineEndContext="#pop"
name="FindPathThenPopInAlternateValue">
- <IncludeRules context="FindExtGlobAndPopInAlternateValue"/>
+ <Detect2Chars context="#pop!PathThenPopInAlternateValue" char="?"
char1="(" lookAhead="1"/>
+ <Detect2Chars context="#pop!PathThenPopInAlternateValue" char="*"
char1="(" lookAhead="1"/>
+ <Detect2Chars context="#pop!PathThenPopInAlternateValue" char="+"
char1="(" lookAhead="1"/>
+ <Detect2Chars context="#pop!PathThenPopInAlternateValue" char="@"
char1="(" lookAhead="1"/>
+ <Detect2Chars context="#pop!PathThenPopInAlternateValue" char="!"
char1="(" lookAhead="1"/>
<AnyChar attribute="Glob" context="#pop!PathThenPopInAlternateValue"
String="?*"/>
<RegExpr attribute="Path" context="#pop!PathThenPopInAlternateValue"
String="&pathpart_alt;"/>
</context>
- <context attribute="Path" lineEndContext="#stay"
name="FindExtGlobAndPopInAlternateValue">
+ <context attribute="Path" lineEndContext="#pop#pop"
name="PathThenPopInAlternateValue">
+ <DetectChar attribute="Parameter Expansion" context="#pop" char="}"/>
+ <IncludeRules context="FindWord"/>
<Detect2Chars attribute="Glob" context="ExtGlobAndPopInAlternateValue"
char="?" char1="("/>
<Detect2Chars attribute="Glob" context="ExtGlobAndPopInAlternateValue"
char="*" char1="("/>
<Detect2Chars attribute="Glob" context="ExtGlobAndPopInAlternateValue"
char="+" char1="("/>
<Detect2Chars attribute="Glob" context="ExtGlobAndPopInAlternateValue"
char="@" char1="("/>
<Detect2Chars attribute="Glob" context="ExtGlobAndPopInAlternateValue"
char="!" char1="("/>
+ <AnyChar attribute="Glob" context="#stay" String="?*"/>
+ <RegExpr attribute="Path" context="#stay" String="&path_alt;"/>
+ </context>
+ <context attribute="Path" lineEndContext="#stay"
name="ExtGlobAndPopInAlternateValue">
+ <DetectChar attribute="Glob" context="#pop" char=")"/>
+ <DetectChar attribute="Error" context="#pop#pop" char="}"/>
+ <IncludeRules context="FindWord"/>
+ <IncludeRules context="FindExtGlobInAlternateValue"/>
</context>
<context attribute="Path" lineEndContext="#stay"
name="FindExtGlobInAlternateValue">
<Detect2Chars attribute="Glob"
context="RecursiveExtGlobInAlternateValue" char="?" char1="("/>
@@ -812,19 +826,6 @@
<IncludeRules context="FindWord"/>
<IncludeRules context="FindExtGlobInAlternateValue"/>
</context>
- <context attribute="Path" lineEndContext="#stay"
name="ExtGlobAndPopInAlternateValue">
- <DetectChar attribute="Glob"
context="#pop!PathThenPopInAlternateValue" char=")"/>
- <DetectChar attribute="Error" context="#pop#pop" char="}"/>
- <IncludeRules context="FindWord"/>
- <IncludeRules context="FindExtGlobInAlternateValue"/>
- </context>
- <context attribute="Path" lineEndContext="#pop#pop"
name="PathThenPopInAlternateValue">
- <DetectChar attribute="Parameter Expansion" context="#pop#pop"
char="}"/>
- <IncludeRules context="FindWord"/>
- <IncludeRules context="FindExtGlobAndPopInAlternateValue"/>
- <AnyChar attribute="Glob" context="#stay" String="?*"/>
- <RegExpr attribute="Path" context="#stay" String="&path_alt;"/>
- </context>
<context attribute="Pattern" lineEndContext="#stay" name="FindPattern">
<Detect2Chars attribute="Glob" context="ExtPattern" char="?"
char1="("/>
@@ -1494,7 +1495,7 @@
</context>
<context attribute="Pattern" lineEndContext="#stay" name="Regex">
<DetectSpaces attribute="Normal Text"
context="#pop!ExprDblBracketFinal"/>
- <DetectChar attribute="Error" context="#stay" char=")"/>
+ <DetectChar attribute="Operator" context="#pop" char=")"/>
<Detect2Chars attribute="Operator" context="RegexChar" char="["
char1="^"/>
<DetectChar attribute="Operator" context="RegexChar" char="["/>
<IncludeRules context="FindRegex"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/cmake.xml
new/skylighting-core-0.12.3.1/xml/cmake.xml
--- old/skylighting-core-0.12.3/xml/cmake.xml 2022-02-18 20:08:19.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/cmake.xml 2022-05-09 17:17:36.000000000
+0200
@@ -25,7 +25,7 @@
<language
name="CMake"
- version="37"
+ version="38"
kateversion="5.0"
section="Other"
extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -966,6 +966,7 @@
<item>FULL_DOCS</item>
<item>GLOBAL</item>
<item>INHERITED</item>
+ <item>INITIALIZE_FROM_VARIABLE</item>
<item>PROPERTY</item>
<item>SOURCE</item>
<item>TEST</item>
@@ -1034,6 +1035,7 @@
<item>FILES</item>
<item>FILES_MATCHING</item>
<item>FILE_PERMISSIONS</item>
+ <item>FILE_SET</item>
<item>FRAMEWORK</item>
<item>IMPORTED_RUNTIME_ARTIFACTS</item>
<item>INCLUDES</item>
@@ -1263,9 +1265,13 @@
<item>REUSE_FROM</item>
</list>
<list name="target_sources_nargs">
+ <item>BASE_DIRS</item>
+ <item>FILES</item>
+ <item>FILE_SET</item>
<item>INTERFACE</item>
<item>PRIVATE</item>
<item>PUBLIC</item>
+ <item>TYPE</item>
</list>
<list name="try_compile_nargs">
<item>CMAKE_FLAGS</item>
@@ -1470,8 +1476,12 @@
</list>
<list name="check_pie_supported_sargs">
<item>C</item>
+ <item>CUDA</item>
<item>CXX</item>
<item>Fortran</item>
+ <item>HIP</item>
+ <item>OBJC</item>
+ <item>OBJCXX</item>
</list>
<list name="check_source_compiles_nargs">
<item>FAIL_REGEX</item>
@@ -1729,6 +1739,7 @@
<item>USES_TERMINAL_CONFIGURE</item>
<item>USES_TERMINAL_DOWNLOAD</item>
<item>USES_TERMINAL_INSTALL</item>
+ <item>USES_TERMINAL_PATCH</item>
<item>USES_TERMINAL_TEST</item>
<item>USES_TERMINAL_UPDATE</item>
</list>
@@ -2256,6 +2267,8 @@
<item>CMAKE_CUDA_COMPILE_FEATURES</item>
<item>CMAKE_CUDA_EXTENSIONS</item>
<item>CMAKE_CUDA_HOST_COMPILER</item>
+ <item>CMAKE_CUDA_LINK_NO_PIE_SUPPORTED</item>
+ <item>CMAKE_CUDA_LINK_PIE_SUPPORTED</item>
<item>CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS</item>
<item>CMAKE_CUDA_RUNTIME_LIBRARY</item>
<item>CMAKE_CUDA_SEPARABLE_COMPILATION</item>
@@ -2291,6 +2304,7 @@
<item>CMAKE_DIRECTORY_LABELS</item>
<item>CMAKE_DISABLE_PRECOMPILE_HEADERS</item>
<item>CMAKE_DL_LIBS</item>
+ <item>CMAKE_DOTNET_SDK</item>
<item>CMAKE_DOTNET_TARGET_FRAMEWORK</item>
<item>CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION</item>
<item>CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES</item>
@@ -2370,6 +2384,8 @@
<item>CMAKE_HAS_ANSI_STRING_STREAM</item>
<item>CMAKE_HIP_ARCHITECTURES</item>
<item>CMAKE_HIP_EXTENSIONS</item>
+ <item>CMAKE_HIP_LINK_NO_PIE_SUPPORTED</item>
+ <item>CMAKE_HIP_LINK_PIE_SUPPORTED</item>
<item>CMAKE_HIP_STANDARD</item>
<item>CMAKE_HIP_STANDARD_REQUIRED</item>
<item>CMAKE_HOST_APPLE</item>
@@ -2382,6 +2398,7 @@
<item>CMAKE_HOST_WIN32</item>
<item>CMAKE_HP_PTHREADS_INIT</item>
<item>CMAKE_IGNORE_PATH</item>
+ <item>CMAKE_IGNORE_PREFIX_PATH</item>
<item>CMAKE_IMPORT_LIBRARY_PREFIX</item>
<item>CMAKE_IMPORT_LIBRARY_SUFFIX</item>
<item>CMAKE_INCLUDE_CURRENT_DIR</item>
@@ -2461,6 +2478,7 @@
<item>CMAKE_LINK_DEPENDS_NO_SHARED</item>
<item>CMAKE_LINK_DIRECTORIES_BEFORE</item>
<item>CMAKE_LINK_INTERFACE_LIBRARIES</item>
+ <item>CMAKE_LINK_LIBRARIES_ONLY_TARGETS</item>
<item>CMAKE_LINK_LIBRARY_FILE_FLAG</item>
<item>CMAKE_LINK_LIBRARY_FLAG</item>
<item>CMAKE_LINK_LIBRARY_SUFFIX</item>
@@ -2496,9 +2514,13 @@
<item>CMAKE_NO_STD_NAMESPACE</item>
<item>CMAKE_NO_SYSTEM_FROM_IMPORTED</item>
<item>CMAKE_OBJCXX_EXTENSIONS</item>
+ <item>CMAKE_OBJCXX_LINK_NO_PIE_SUPPORTED</item>
+ <item>CMAKE_OBJCXX_LINK_PIE_SUPPORTED</item>
<item>CMAKE_OBJCXX_STANDARD</item>
<item>CMAKE_OBJCXX_STANDARD_REQUIRED</item>
<item>CMAKE_OBJC_EXTENSIONS</item>
+ <item>CMAKE_OBJC_LINK_NO_PIE_SUPPORTED</item>
+ <item>CMAKE_OBJC_LINK_PIE_SUPPORTED</item>
<item>CMAKE_OBJC_STANDARD</item>
<item>CMAKE_OBJC_STANDARD_REQUIRED</item>
<item>CMAKE_OBJECT_PATH_MAX</item>
@@ -2564,6 +2586,7 @@
<item>CMAKE_SYSTEM_APPBUNDLE_PATH</item>
<item>CMAKE_SYSTEM_FRAMEWORK_PATH</item>
<item>CMAKE_SYSTEM_IGNORE_PATH</item>
+ <item>CMAKE_SYSTEM_IGNORE_PREFIX_PATH</item>
<item>CMAKE_SYSTEM_INCLUDE_PATH</item>
<item>CMAKE_SYSTEM_LIBRARY_PATH</item>
<item>CMAKE_SYSTEM_NAME</item>
@@ -2596,6 +2619,7 @@
<item>CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD</item>
<item>CMAKE_VS_JUST_MY_CODE_DEBUGGING</item>
<item>CMAKE_VS_MSBUILD_COMMAND</item>
+ <item>CMAKE_VS_NUGET_PACKAGE_RESTORE</item>
<item>CMAKE_VS_NsightTegra_VERSION</item>
<item>CMAKE_VS_PLATFORM_NAME</item>
<item>CMAKE_VS_PLATFORM_TOOLSET</item>
@@ -2625,6 +2649,7 @@
<item>CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER</item>
<item>CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS</item>
<item>CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE</item>
+ <item>CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE</item>
<item>CMAKE_XCODE_SCHEME_ENVIRONMENT</item>
<item>CMAKE_XCODE_SCHEME_GUARD_MALLOC</item>
<item>CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP</item>
@@ -2714,6 +2739,8 @@
<item>CPACK_EXTERNAL_REQUESTED_VERSIONS</item>
<item>CPACK_GENERATOR</item>
<item>CPACK_IFW_ADMIN_TARGET_DIRECTORY</item>
+ <item>CPACK_IFW_ARCHIVE_COMPRESSION</item>
+ <item>CPACK_IFW_ARCHIVE_FORMAT</item>
<item>CPACK_IFW_BINARYCREATOR_EXECUTABLE</item>
<item>CPACK_IFW_DEVTOOL_EXECUTABLE</item>
<item>CPACK_IFW_DOWNLOAD_ALL</item>
@@ -2725,15 +2752,21 @@
<item>CPACK_IFW_PACKAGE_BACKGROUND</item>
<item>CPACK_IFW_PACKAGE_BANNER</item>
<item>CPACK_IFW_PACKAGE_CONTROL_SCRIPT</item>
+ <item>CPACK_IFW_PACKAGE_DISABLE_COMMAND_LINE_INTERFACE</item>
<item>CPACK_IFW_PACKAGE_GROUP</item>
<item>CPACK_IFW_PACKAGE_ICON</item>
<item>CPACK_IFW_PACKAGE_LOGO</item>
<item>CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_INI_FILE</item>
<item>CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME</item>
<item>CPACK_IFW_PACKAGE_NAME</item>
+ <item>CPACK_IFW_PACKAGE_PRODUCT_IMAGES</item>
<item>CPACK_IFW_PACKAGE_PUBLISHER</item>
<item>CPACK_IFW_PACKAGE_REMOVE_TARGET_DIR</item>
<item>CPACK_IFW_PACKAGE_RESOURCES</item>
+ <item>CPACK_IFW_PACKAGE_RUN_PROGRAM</item>
+ <item>CPACK_IFW_PACKAGE_RUN_PROGRAM_ARGUMENTS</item>
+ <item>CPACK_IFW_PACKAGE_RUN_PROGRAM_DESCRIPTION</item>
+ <item>CPACK_IFW_PACKAGE_SIGNING_IDENTITY</item>
<item>CPACK_IFW_PACKAGE_START_MENU_DIRECTORY</item>
<item>CPACK_IFW_PACKAGE_STYLE_SHEET</item>
<item>CPACK_IFW_PACKAGE_TITLE</item>
@@ -2846,6 +2879,11 @@
<item>CPACK_PRODUCTBUILD_BACKGROUND_MIME_TYPE</item>
<item>CPACK_PRODUCTBUILD_BACKGROUND_SCALING</item>
<item>CPACK_PRODUCTBUILD_BACKGROUND_UTI</item>
+ <item>CPACK_PRODUCTBUILD_DOMAINS</item>
+ <item>CPACK_PRODUCTBUILD_DOMAINS_ANYWHERE</item>
+ <item>CPACK_PRODUCTBUILD_DOMAINS_ROOT</item>
+ <item>CPACK_PRODUCTBUILD_DOMAINS_USER</item>
+ <item>CPACK_PRODUCTBUILD_IDENTIFIER</item>
<item>CPACK_PRODUCTBUILD_IDENTITY_NAME</item>
<item>CPACK_PRODUCTBUILD_KEYCHAIN_PATH</item>
<item>CPACK_PRODUCTBUILD_RESOURCES_DIR</item>
@@ -2944,6 +2982,7 @@
<item>CPACK_WIX_ROOT_FEATURE_TITLE</item>
<item>CPACK_WIX_ROOT_FOLDER_ID</item>
<item>CPACK_WIX_SKIP_PROGRAM_FOLDER</item>
+ <item>CPACK_WIX_SKIP_WIX_UI_EXTENSION</item>
<item>CPACK_WIX_TEMPLATE</item>
<item>CPACK_WIX_UI_BANNER</item>
<item>CPACK_WIX_UI_DIALOG</item>
@@ -3010,6 +3049,7 @@
<item>CTEST_SCP_COMMAND</item>
<item>CTEST_SITE</item>
<item>CTEST_SOURCE_DIRECTORY</item>
+ <item>CTEST_SUBMIT_INACTIVITY_TIMEOUT</item>
<item>CTEST_SUBMIT_URL</item>
<item>CTEST_SVN_COMMAND</item>
<item>CTEST_SVN_OPTIONS</item>
@@ -3523,6 +3563,7 @@
<item>LDFLAGS</item>
<item>MACOSX_DEPLOYMENT_TARGET</item>
<item>PATH</item>
+ <item>QTIFWDIR</item>
<item>RC</item>
<item>RCFLAGS</item>
<item>SWIFTC</item>
@@ -3682,6 +3723,7 @@
<item>DEPLOYMENT_REMOTE_DIRECTORY</item>
<item>DEPRECATION</item>
<item>DISABLE_PRECOMPILE_HEADERS</item>
+ <item>DOTNET_SDK</item>
<item>DOTNET_TARGET_FRAMEWORK</item>
<item>DOTNET_TARGET_FRAMEWORK_VERSION</item>
<item>ENABLE_EXPORTS</item>
@@ -3700,6 +3742,13 @@
<item>GENERATOR_FILE_NAME</item>
<item>GNUtoMS</item>
<item>HAS_CXX</item>
+ <item>HEADER_DIRS</item>
+ <item>HEADER_SET</item>
+ <item>HEADER_SETS</item>
+ <item>HIP_ARCHITECTURES</item>
+ <item>HIP_EXTENSIONS</item>
+ <item>HIP_STANDARD</item>
+ <item>HIP_STANDARD_REQUIRED</item>
<item>IMPLICIT_DEPENDS_INCLUDE_TRANSFORM</item>
<item>IMPORTED</item>
<item>IMPORTED_COMMON_LANGUAGE_RUNTIME</item>
@@ -3713,6 +3762,7 @@
<item>IMPORTED_LINK_INTERFACE_MULTIPLICITY</item>
<item>IMPORTED_LOCATION</item>
<item>IMPORTED_NO_SONAME</item>
+ <item>IMPORTED_NO_SYSTEM</item>
<item>IMPORTED_OBJECTS</item>
<item>IMPORTED_SONAME</item>
<item>IMPORT_PREFIX</item>
@@ -3726,6 +3776,7 @@
<item>INTERFACE_COMPILE_DEFINITIONS</item>
<item>INTERFACE_COMPILE_FEATURES</item>
<item>INTERFACE_COMPILE_OPTIONS</item>
+ <item>INTERFACE_HEADER_SETS</item>
<item>INTERFACE_INCLUDE_DIRECTORIES</item>
<item>INTERFACE_LINK_DEPENDS</item>
<item>INTERFACE_LINK_DIRECTORIES</item>
@@ -3753,6 +3804,7 @@
<item>LINK_INTERFACE_LIBRARIES</item>
<item>LINK_INTERFACE_MULTIPLICITY</item>
<item>LINK_LIBRARIES</item>
+ <item>LINK_LIBRARIES_ONLY_TARGETS</item>
<item>LINK_OPTIONS</item>
<item>LINK_SEARCH_END_STATIC</item>
<item>LINK_SEARCH_START_STATIC</item>
@@ -3864,6 +3916,7 @@
<item>XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER</item>
<item>XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS</item>
<item>XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE</item>
+ <item>XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE</item>
<item>XCODE_SCHEME_ENVIRONMENT</item>
<item>XCODE_SCHEME_EXECUTABLE</item>
<item>XCODE_SCHEME_GUARD_MALLOC</item>
@@ -7284,7 +7337,7 @@
</context>
<context attribute="Normal Text" lineEndContext="#stay" name="Detect
More target-properties">
- <RegExpr attribute="Property" context="#stay"
String="\b(?:XCODE_EMBED_&var_ref_re;_REMOVE_HEADERS_ON_COPY|XCODE_EMBED_&var_ref_re;_PATH|XCODE_EMBED_&var_ref_re;_CODE_SIGN_ON_COPY|XCODE_EMBED_&var_ref_re;|XCODE_ATTRIBUTE_&var_ref_re;|VS_SOURCE_SETTINGS_&var_ref_re;|VS_GLOBAL_&var_ref_re;|VS_DOTNET_REFERENCE_&var_ref_re;|VS_DOTNET_REFERENCEPROP_&var_ref_re;_TAG_&var_ref_re;|STATIC_LIBRARY_FLAGS_&var_ref_re;|RUNTIME_OUTPUT_NAME_&var_ref_re;|RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|PDB_OUTPUT_DIRECTORY_&var_ref_re;|PDB_NAME_&var_ref_re;|OUTPUT_NAME_&var_ref_re;|OSX_ARCHITECTURES_&var_ref_re;|MAP_IMPORTED_CONFIG_&var_ref_re;|LOCATION_&var_ref_re;|LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|LINK_INTERFACE_LIBRARIES_&var_ref_re;|LINK_FLAGS_&var_ref_re;|LIBRARY_OUTPUT_NAME_&var_ref_re;|LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|IMPORTED_SONAME_&var_ref_re;|IMPORTED_OBJECTS_&var_ref_re;|IMPORTED_NO_SONAME_&var_ref_re;|IMPORTED_LOCATION_&var_ref_re;|IMP
ORTED_LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|IMPORTED_LINK_INTERFACE_LIBRARIES_&var_ref_re;|IMPORTED_LINK_INTERFACE_LANGUAGES_&var_ref_re;|IMPORTED_LINK_DEPENDENT_LIBRARIES_&var_ref_re;|IMPORTED_LIBNAME_&var_ref_re;|IMPORTED_IMPLIB_&var_ref_re;|FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|EXCLUDE_FROM_DEFAULT_BUILD_&var_ref_re;|COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|COMPILE_PDB_NAME_&var_ref_re;|ARCHIVE_OUTPUT_NAME_&var_ref_re;|ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|&var_ref_re;_VISIBILITY_PRESET|&var_ref_re;_POSTFIX|&var_ref_re;_OUTPUT_NAME|&var_ref_re;_LINKER_LAUNCHER|&var_ref_re;_INCLUDE_WHAT_YOU_USE|&var_ref_re;_CPPLINT|&var_ref_re;_CPPCHECK|&var_ref_re;_COMPILER_LAUNCHER|&var_ref_re;_CLANG_TIDY)\b"
/>
+ <RegExpr attribute="Property" context="#stay"
String="\b(?:XCODE_EMBED_&var_ref_re;_REMOVE_HEADERS_ON_COPY|XCODE_EMBED_&var_ref_re;_PATH|XCODE_EMBED_&var_ref_re;_CODE_SIGN_ON_COPY|XCODE_EMBED_&var_ref_re;|XCODE_ATTRIBUTE_&var_ref_re;|VS_SOURCE_SETTINGS_&var_ref_re;|VS_GLOBAL_&var_ref_re;|VS_DOTNET_REFERENCE_&var_ref_re;|VS_DOTNET_REFERENCEPROP_&var_ref_re;_TAG_&var_ref_re;|STATIC_LIBRARY_FLAGS_&var_ref_re;|RUNTIME_OUTPUT_NAME_&var_ref_re;|RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|PDB_OUTPUT_DIRECTORY_&var_ref_re;|PDB_NAME_&var_ref_re;|OUTPUT_NAME_&var_ref_re;|OSX_ARCHITECTURES_&var_ref_re;|MAP_IMPORTED_CONFIG_&var_ref_re;|LOCATION_&var_ref_re;|LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|LINK_INTERFACE_LIBRARIES_&var_ref_re;|LINK_FLAGS_&var_ref_re;|LIBRARY_OUTPUT_NAME_&var_ref_re;|LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|IMPORTED_SONAME_&var_ref_re;|IMPORTED_OBJECTS_&var_ref_re;|IMPORTED_NO_SONAME_&var_ref_re;|IMPORTED_LOCATION_&var_ref_re;|IMP
ORTED_LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|IMPORTED_LINK_INTERFACE_LIBRARIES_&var_ref_re;|IMPORTED_LINK_INTERFACE_LANGUAGES_&var_ref_re;|IMPORTED_LINK_DEPENDENT_LIBRARIES_&var_ref_re;|IMPORTED_LIBNAME_&var_ref_re;|IMPORTED_IMPLIB_&var_ref_re;|HEADER_SET_&var_ref_re;|HEADER_DIRS_&var_ref_re;|FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|EXCLUDE_FROM_DEFAULT_BUILD_&var_ref_re;|COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|COMPILE_PDB_NAME_&var_ref_re;|ARCHIVE_OUTPUT_NAME_&var_ref_re;|ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|&var_ref_re;_VISIBILITY_PRESET|&var_ref_re;_POSTFIX|&var_ref_re;_OUTPUT_NAME|&var_ref_re;_LINKER_LAUNCHER|&var_ref_re;_INCLUDE_WHAT_YOU_USE|&var_ref_re;_CPPLINT|&var_ref_re;_CPPCHECK|&var_ref_re;_COMPILER_LAUNCHER|&var_ref_re;_CLANG_TIDY)\b"
/>
</context>
<context attribute="Normal Text" lineEndContext="#stay" name="Detect
More source-properties">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/go.xml
new/skylighting-core-0.12.3.1/xml/go.xml
--- old/skylighting-core-0.12.3/xml/go.xml 2022-02-18 20:08:19.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/go.xml 2022-05-09 17:17:36.000000000
+0200
@@ -26,35 +26,37 @@
-->
-<language name="Go" version="7" kateversion="5.0" section="Sources"
indenter="cstyle" extensions="*.go" author="Miquel Sabat??
([email protected])" license="GPLv2+">
+<language name="Go" version="8" kateversion="5.0" section="Sources"
indenter="cstyle" extensions="*.go" author="Miquel Sabat??
([email protected])" license="GPLv2+">
<highlighting>
<list name="keywords">
<!-- Keywords have been taken from The Go Programming Language Specification
-> Keywords section -->
- <item>break</item>
- <item>case</item>
<item>chan</item>
<item>const</item>
+ <item>func</item>
+ <item>import</item>
+ <item>interface</item>
+ <item>map</item>
+ <item>package</item>
+ <item>range</item>
+ <item>struct</item>
+ <item>type</item>
+ <item>var</item>
+ </list>
+ <list name="controlflow">
+ <item>break</item>
+ <item>case</item>
<item>continue</item>
<item>default</item>
<item>defer</item>
<item>else</item>
<item>fallthrough</item>
<item>for</item>
- <item>func</item>
<item>go</item>
<item>goto</item>
<item>if</item>
- <item>import</item>
- <item>interface</item>
- <item>map</item>
- <item>package</item>
- <item>range</item>
<item>return</item>
<item>select</item>
- <item>struct</item>
<item>switch</item>
- <item>type</item>
- <item>var</item>
</list>
<list name="types">
<item>bool</item>
@@ -104,6 +106,7 @@
<contexts>
<context name="normal" attribute="Normal Text" lineEndContext="#stay">
<keyword attribute="Keyword" context="#stay" String="keywords" />
+ <keyword attribute="Control Flow" context="#stay" String="controlflow"
/>
<keyword attribute="Predeclared Identifier" context="#stay"
String="predeclared" />
<keyword attribute="Data Type" context="#stay" String="types" />
<keyword attribute="Builtin Function" context="#stay" String="builtin"
/>
@@ -151,6 +154,7 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal"
spellChecking="false"/>
<itemData name="Keyword" defStyleNum="dsKeyword"
spellChecking="false"/>
+ <itemData name="Control Flow" defStyleNum="dsControlFlow"
spellChecking="false"/>
<itemData name="Predeclared Identifier" defStyleNum="dsOthers"
spellChecking="false" />
<itemData name="Builtin Function" defStyleNum="dsBuiltIn"
spellChecking="false" />
<itemData name="Data Type" defStyleNum="dsDataType"
spellChecking="false"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/haxe.xml
new/skylighting-core-0.12.3.1/xml/haxe.xml
--- old/skylighting-core-0.12.3/xml/haxe.xml 2022-02-18 20:08:19.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/haxe.xml 2022-05-09 17:17:36.000000000
+0200
@@ -12,7 +12,7 @@
========================================================================
-->
-<language name="Haxe" section="Sources" extensions="*.hx;*.Hx;*.hX;*.HX;"
mimetype="text/x-hxsrc" version="5" kateversion="5.0" casesensitive="true"
author="Chad Joan" license="MIT">
+<language name="Haxe" section="Sources" extensions="*.hx;*.Hx;*.hX;*.HX;"
mimetype="text/x-hxsrc" version="6" kateversion="5.0" casesensitive="true"
author="Chad Joan" license="MIT">
<highlighting>
<list name="keywords">
@@ -133,7 +133,10 @@
<!-- Strings -->
<!-- '...' -->
<context attribute="RawString" lineEndContext="#stay" name="RawString">
+ <Detect2Chars attribute="RawString" context="#stay" char="\"
char1="'"/>
<DetectChar attribute="RawString" context="#pop" char="'"/>
+ <HlCStringChar attribute="EscapeSequence"/>
+ <RegExpr attribute="EscapeSequence" context="#stay"
String="\\(u[\da-fA-F]{4}|U[\da-fA-F]{8}|&[a-zA-Z]\w+;)" />
</context>
<!-- "..." -->
<context attribute="String" lineEndContext="#stay" name="String">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/lua.xml
new/skylighting-core-0.12.3.1/xml/lua.xml
--- old/skylighting-core-0.12.3/xml/lua.xml 2022-02-18 20:08:19.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/lua.xml 2022-05-09 17:17:36.000000000
+0200
@@ -48,7 +48,7 @@
- NOTE, FIXME, TODO alerts added on comments
- improved highlighting
-->
-<language name="Lua" version="14" indenter="lua" kateversion="5.0"
section="Scripts" extensions="*.lua" mimetype="text/x-lua">
+<language name="Lua" version="15" indenter="lua" kateversion="5.0"
section="Scripts" extensions="*.lua" mimetype="text/x-lua">
<highlighting>
<list name="keywords">
<item>and</item>
@@ -530,6 +530,7 @@
<context name="Local" attribute="Normal Text" lineEndContext="#pop"
fallthrough="true" fallthroughContext="#pop">
<DetectSpaces />
+ <WordDetect attribute="Keyword" context="#pop!Function"
beginRegion="chunk" String="function" />
<Detect2Chars attribute="Comment" context="MatchComment" char="-"
char1="-" lookAhead="true"/>
<RegExpr attribute="Constant" context="LocalVariable"
String="\b[A-Z_][A-Z0-9_]*\b" />
<DetectIdentifier attribute="Variable" context="LocalVariable" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/nix.xml
new/skylighting-core-0.12.3.1/xml/nix.xml
--- old/skylighting-core-0.12.3/xml/nix.xml 1970-01-01 01:00:00.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/nix.xml 2022-05-09 17:17:36.000000000
+0200
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd" [
+ <!ENTITY ident "[a-zA-Z_][a-zA-Z0-9_\-']*">
+]>
+
+<!--
+ SPDX-FileCopyrightText: 2021 Marco Rebhan <[email protected]>
+ SPDX-FileContributor: Tuan Le <[email protected]>
+
+ SPDX-License-Identifier: MIT
+-->
+
+<language
+ name="Nix"
+ version="1"
+ kateversion="5.79"
+ section="Scripts"
+ extensions="*.nix"
+ casesensitive="1"
+ author="Marco Rebhan <[email protected]>"
+ license="MIT"
+ priority="1"
+>
+ <highlighting>
+ <list name="keywords">
+ <item>assert</item>
+ <item>rec</item>
+ <item>and</item>
+ <item>or</item>
+ </list>
+ <list name="builtins">
+ <item>abort</item>
+ <item>baseNameOf</item>
+ <item>builtins</item>
+ <item>derivation</item>
+ <item>dirOf</item>
+ <item>fetchTarball</item>
+ <item>import</item>
+ <item>isNull</item>
+ <item>map</item>
+ <item>removeAttrs</item>
+ <item>throw</item>
+ <item>toString</item>
+ </list>
+ <contexts>
+ <context name="Expression" attribute="Normal Text"
lineEndContext="#stay">
+ <IncludeRules context="Single Expression" />
+
+ <keyword String="keywords" attribute="Keyword" />
+ <WordDetect String="let" attribute="Keyword" context="Let" />
+ <WordDetect String="if" attribute="Keyword" context="If" />
+ <WordDetect String="with" attribute="Keyword" context="With" />
+ <Detect2Chars char="/" char1="/" attribute="Operator" />
+ <Detect2Chars char="?" char1="?" attribute="Operator" />
+ <Detect2Chars char="+" char1="+" attribute="Operator" />
+ <Detect2Chars char="|" char1="|" attribute="Operator" />
+ <Detect2Chars char="&" char1="&" attribute="Operator"
/>
+ <AnyChar String="+-*/?!" attribute="Operator" />
+ <RegExpr String="\b&ident;\s*:" context="Function"
lookAhead="true" />
+ </context>
+ <context name="Single Expression" attribute="Normal Text"
lineEndContext="#stay">
+ <IncludeRules context="Comment Rules" />
+
+ <keyword String="builtins" attribute="Builtin" />
+ <DetectChar char=""" attribute="String" context="String"
/>
+ <Detect2Chars char="'" char1="'" attribute="String"
context="String2" />
+ <DetectChar char="{" attribute="Symbol" context="Any Brace"
beginRegion="Set" />
+ <DetectChar char="[" attribute="Symbol" context="List"
beginRegion="List" />
+ <DetectChar char="(" attribute="Symbol" context="Parentheses"
/>
+ <RegExpr String="[a-zA-Z0-9-_.]*(/[a-zA-Z0-9-_.]+)+"
attribute="Path" />
+ <Int attribute="Int" />
+ <Float attribute="Float" />
+ <WordDetect String="true" attribute="Constant" />
+ <WordDetect String="false" attribute="Constant" />
+ <WordDetect String="null" attribute="Constant" />
+ </context>
+ <context name="Parentheses" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=")" attribute="Symbol" context="#pop" />
+
+ <IncludeRules context="Expression" />
+ </context>
+
+ <context name="Comment Rules" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="#" attribute="Comment" context="Comment" />
+ <Detect2Chars char="/" char1="*" attribute="Comment"
context="Multi-Line Comment" beginRegion="Comment" />
+ </context>
+ <context name="Comment" attribute="Comment" lineEndContext="#pop">
+ <DetectSpaces attribute="Comment"/>
+ <IncludeRules context="##Comments"/>
+ <DetectIdentifier attribute="Comment" context="#stay" />
+ </context>
+ <context name="Multi-Line Comment" attribute="Comment"
lineEndContext="#stay">
+ <Detect2Chars char="*" char1="/" attribute="Comment"
context="#pop" endRegion="Comment" />
+
+ <DetectSpaces attribute="Comment"/>
+ <IncludeRules context="##Comments"/>
+ <DetectIdentifier attribute="Comment" context="#stay" />
+ </context>
+
+ <context name="String" attribute="String" lineEndContext="#stay">
+ <RegExpr String="\\." attribute="Special Char" />
+ <DetectChar char=""" attribute="String" context="#pop" />
+
+ <Detect2Chars char="$" char1="{" attribute="Special Char"
context="Interpolated String" />
+ </context>
+ <context name="String2" attribute="String" lineEndContext="#stay">
+ <RegExpr String="''(?:['$]|\\.)" attribute="Special Char" />
+ <Detect2Chars char="'" char1="'" attribute="String"
context="#pop" />
+
+ <Detect2Chars char="$" char1="{" attribute="Special Char"
context="Interpolated String" />
+ </context>
+ <context name="Interpolated String" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="}" attribute="Special Char" context="#pop" />
+
+ <IncludeRules context="Expression" />
+ </context>
+
+ <!--
+ we don't know whether this is a set { k = v; k1 = v1; ... } or
+ the beginning of a function declaration { x1, x2, x3, ... }:
...
+ yet
+ -->
+ <context name="Any Brace" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="}" attribute="Symbol" context="#pop"
endRegion="Set"/>
+
+ <WordDetect String="inherit" attribute="Keyword" context="Any
Brace - Inherit" />
+ <DetectChar char=";" attribute="Symbol" context="#pop!Set" />
+ <DetectChar char="=" attribute="Operator" context="Any Brace -
Set Value" />
+ <DetectChar char=""" attribute="String" context="Any
Brace - String" />
+ <Detect2Chars char="'" char1="'" attribute="String"
context="Any Brace - String2" />
+
+ <DetectChar char="," attribute="Symbol" context="#pop!Set
Expansion" />
+ <DetectChar char="?" attribute="Symbol" context="Any Brace -
Default Value" />
+ <StringDetect String="..." attribute="Symbol"
context="#pop!Set Expansion" />
+
+ <RegExpr String="&ident;" attribute="Identifier" />
+
+ <IncludeRules context="Comment Rules" />
+ </context>
+ <!--
+ can't push two contexts so we need separate ones specifically
+ for this
+ -->
+ <context name="Any Brace - Set Value" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=";" attribute="Symbol" context="#pop#pop!Set"
/>
+ <IncludeRules context="Set Value" />
+ </context>
+ <context name="Any Brace - String" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=""" attribute="String"
context="#pop#pop!Set" />
+ <IncludeRules context="String" />
+ </context>
+ <context name="Any Brace - String2" attribute="Normal Text"
lineEndContext="#stay">
+ <Detect2Chars char="'" char1="'" attribute="String"
context="#pop#pop!Set" />
+ <IncludeRules context="String" />
+ </context>
+ <context name="Any Brace - Inherit" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=";" attribute="Symbol" context="#pop#pop!Set"
/>
+ <IncludeRules context="Inherit" />
+ </context>
+ <context name="Any Brace - Default Value" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="," attribute="Symbol" context="#pop#pop!Set
Expansion" />
+ <IncludeRules context="Default Value" />
+ </context>
+
+ <!-- include for sets and let expressions -->
+ <context name="Set-Like" attribute="Normal Text"
lineEndContext="#stay">
+ <WordDetect String="inherit" attribute="Keyword"
context="Inherit" />
+ <DetectChar char=""" attribute="String" context="String"
/>
+ <Detect2Chars char="'" char1="'" attribute="String"
context="String2" />
+ <DetectChar char="=" attribute="Operator" context="Set Value"
/>
+ <RegExpr String="&ident;" attribute="Identifier" />
+ <IncludeRules context="Comment Rules" />
+ </context>
+ <context name="Inherit" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=";" attribute="Symbol" context="#pop" />
+ <IncludeRules context="Single Expression" />
+ </context>
+
+ <context name="Set" attribute="Normal Text" lineEndContext="#stay">
+ <DetectChar char="}" attribute="Symbol" context="#pop"
endRegion="Set" />
+
+ <IncludeRules context="Set-Like" />
+ </context>
+ <context name="Set Value" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=";" attribute="Symbol" context="#pop" />
+ <DetectChar char="}" attribute="Error" context="#pop#pop"
endRegion="Set" />
+
+ <IncludeRules context="Expression" />
+ </context>
+
+ <context name="Set Expansion" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="}" attribute="Symbol" context="#pop"
endRegion="Set"/>
+
+ <DetectChar char="," attribute="Symbol" />
+ <DetectChar char="?" attribute="Symbol" context="Default
Value" />
+ <StringDetect String="..." attribute="Symbol" />
+ <RegExpr String="&ident;" attribute="Identifier" />
+ <IncludeRules context="Comment Rules" />
+ </context>
+ <context name="Default Value" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="," attribute="Symbol" context="#pop" />
+ <DetectChar char="}" attribute="Symbol" context="#pop#pop" />
+
+ <IncludeRules context="Expression" />
+ </context>
+
+ <context name="List" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char="]" attribute="Symbol" context="#pop"
endRegion="List" />
+
+ <IncludeRules context="Single Expression" />
+ </context>
+
+ <context name="Function" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=":" attribute="Symbol" context="#pop" />
+
+ <RegExpr String="&ident;" attribute="Identifier" />
+
+ <IncludeRules context="Comment Rules" />
+ </context>
+
+ <context name="Let" attribute="Normal Text" lineEndContext="#stay">
+ <WordDetect String="in" attribute="Keyword" context="#pop" />
+
+ <RegExpr String="&ident;" attribute="Identifier" />
+ <IncludeRules context="Set-Like" />
+ </context>
+
+ <context name="If" attribute="Normal Text" lineEndContext="#stay">
+ <WordDetect String="then" attribute="Keyword"
context="#pop!Then" />
+
+ <IncludeRules context="Expression" />
+ </context>
+ <context name="Then" attribute="Normal Text"
lineEndContext="#stay">
+ <WordDetect String="else" attribute="Keyword" context="#pop" />
+
+ <IncludeRules context="Expression" />
+ </context>
+
+ <context name="With" attribute="Normal Text"
lineEndContext="#stay">
+ <DetectChar char=";" attribute="Symbol" context="#pop" />
+ <IncludeRules context="Expression" />
+ </context>
+ </contexts>
+ <itemDatas>
+ <itemData name="Normal Text" defStyleNum="dsNormal" />
+ <itemData name="Builtin" defStyleNum="dsBuiltIn" />
+ <itemData name="Int" defStyleNum="dsDecVal" />
+ <itemData name="Float" defStyleNum="dsFloat" />
+ <itemData name="Constant" defStyleNum="dsConstant" />
+ <itemData name="String" defStyleNum="dsString" />
+ <itemData name="Special Char" defStyleNum="dsSpecialChar" />
+ <itemData name="Path" defStyleNum="dsSpecialString" />
+ <itemData name="Keyword" defStyleNum="dsKeyword" />
+ <itemData name="Comment" defStyleNum="dsComment" />
+ <itemData name="Symbol" defStyleNum="dsOperator" />
+ <itemData name="Operator" defStyleNum="dsOperator" />
+ <itemData name="Identifier" defStyleNum="dsVariable" />
+ <itemData name="Error" defStyleNum="dsError" />
+ </itemDatas>
+ </highlighting>
+ <general>
+ <comments>
+ <comment name="singleLine" start="#" />
+ <comment name="multiLine" start="/*" end="*/" region="Comment" />
+ </comments>
+ <keywords casesensitive="1" />
+ </general>
+</language>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.12.3/xml/zsh.xml
new/skylighting-core-0.12.3.1/xml/zsh.xml
--- old/skylighting-core-0.12.3/xml/zsh.xml 2022-02-18 20:08:19.000000000
+0100
+++ new/skylighting-core-0.12.3.1/xml/zsh.xml 2022-05-09 17:17:36.000000000
+0200
@@ -57,7 +57,7 @@
<!ENTITY int "(?:[0-9]++[_0-9]*+)">
<!ENTITY exp "(?:[eE][-+]?∫)">
]>
-<language name="Zsh" version="25" kateversion="5.79" section="Scripts"
extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile"
mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen
([email protected])" license="MIT">
+<language name="Zsh" version="26" kateversion="5.79" section="Scripts"
extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile"
mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen
([email protected])" license="MIT">
<highlighting>
<list name="keywords">
@@ -1609,12 +1609,12 @@
<RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[
&tab;;|&)]))" endRegion="expression"/>
</context>
- <context attribute="Normal Text" lineEndContext="#stay"
name="ExprDblBracketRegex">
- <DetectSpaces attribute="Normal Text" context="#pop!Regex"/>
+ <context attribute="Normal Text" lineEndContext="#stay"
name="ExprDblBracketRegex" fallthroughContext="#pop!Regex">
+ <DetectSpaces attribute="Normal Text" context="#stay"/>
</context>
<context attribute="Pattern" lineEndContext="#stay" name="Regex">
<DetectSpaces attribute="Normal Text"
context="#pop!ExprDblBracketFinal"/>
- <DetectChar attribute="Error" context="#stay" char=")"/>
+ <DetectChar attribute="Operator" context="#pop" char=")"/>
<Detect2Chars attribute="Operator" context="RegexChar" char="["
char1="^"/>
<DetectChar attribute="Operator" context="RegexChar" char="["/>
<IncludeRules context="FindRegex"/>
