Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 2e55bd0c authored by Hamish Rodda's avatar Hamish Rodda

Fix highlighting definitions. Where I couldn't determine the correct settings

and had to use my intuition I have added a comment (xmldebug and ilerpg.xml)

Should probably be backported - if you use one or more of these, please test
them and let me know if they work as they're supposed to.

CCMAIL:53004-done@bugs.kde.org

svn path=/trunk/kdelibs/kate/; revision=201631
parent 27b7b8f1
......@@ -191,16 +191,16 @@
<item> WRITE </item>
<item> XFOOT </item>
<item> XLATE </item>
<item> *BLANKS </item>
<item> *BLANKS </item>
</list>
<contexts>
<context attribute="Normal Text" lineEndContext="#stay" name="Default">
<RegExpr attribute="Comment" context="context2" String="[POIHFDC ]?\*"/>
<RegExpr attribute="Comment" context="context3" String="[POIHFDC ]?\*"/>
<RegExpr attribute="Keyword" context="context1" String="[POIHFDC]"/>
</context>
<context attribute="Normal Text" lineEndContext="#pop" name="context1">
<keyword attribute="Keyword" context="#stay" String="opcodes"/>
<DetectChar attribute="Biff" context="context7" char="%"/>
......@@ -208,7 +208,7 @@
<Float attribute="Float" context="#stay"/>
<RegExpr attribute="Hex" context="#stay" String="[Xx]'[0-9|a-f|A-f]{2,}'"/>
<Int attribute="Decimal" context="#stay" name="context2">
<Int attribute="Decimal" context="#stay">
<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
......@@ -226,48 +226,46 @@
<DetectChar attribute="BoldComment" context="context6" char="!"/>
<RegExpr attribute="DivideComment" context="#stay" String="-|="/>
</context>
<context attribute="Constant" lineEndContext="#stay" name="context4">
<DetectChar attribute="Constant" context="#pop" char="'"/>
</context>
<context attribute="Constant" lineEndContext="#stay" name="context5">
<RegExpr attribute="Normal Text" context="#stay" String="[FHDICO]"/>
<DetectChar attribute="Constant" context="#pop" char=" "/>
</context>
<context attribute="Keyword" lineEndContext="#pop#pop" name="context6">
</context>
<context attribute="BoldComment" lineEndContext="Default" name="context7">
<DetectChar attribute="BoldComment" context="context2" char="!"/>
</context>
<context attribute="Biff" lineEndContext="#pop#pop#pop" name="context8">
<keyword attribute="Biff" context="#pop#pop" String="biffs"/>
<DetectChar attribute="Biff" context="#pop#pop" char=" "/>
</context>
<context attribute="Constant" lineEndContext="#stay" name="context4">
<DetectChar attribute="Constant" context="#pop" char="'"/>
</context>
<context attribute="Constant" lineEndContext="#stay" name="context5">
<RegExpr attribute="Normal Text" context="#stay" String="[FHDICO]"/>
<DetectChar attribute="Constant" context="#pop" char=" "/>
</context>
<context attribute="Keyword" lineEndContext="#pop#pop" name="context6">
</context>
<context attribute="BoldComment" lineEndContext="Default" name="context7">
<DetectChar attribute="BoldComment" context="context3" char="!"/>
</context>
<context attribute="Biff" lineEndContext="#pop#pop#pop" name="context8">
<keyword attribute="Biff" context="#pop#pop" String="biffs"/>
<DetectChar attribute="Biff" context="#pop#pop" char=" "/>
</context>
</contexts>
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Biff" defStyleNum="dsKeyword" />
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Biff" defStyleNum="dsKeyword" />
<itemData name="RegExpr" defStyleNum="dsBaseN" />
<itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Decimal" defStyleNum="dsDecVal" />
<itemData name="Float" defStyleNum="dsFloat"/>
<itemData name="Octal" defStyleNum="dsBaseN"/>
<itemData name="Hex" defStyleNum="dsBaseN"/>
<itemData name="Float" defStyleNum="dsFloat"/>
<itemData name="Base-N" defStyleNum="dsBaseN" />
<itemData name="Float" defStyleNum="dsFloat" />
<itemData name="Char" defStyleNum="dsChar" />
<itemData name="Constant" defStyleNum="dsNormal" color="#FF0000" selColor="#000000" bold="0" italic="0"/>
<itemData name="Fill" defStyleNum="dsNormal" color="#FF6347" selColor="#000000" bold="0" italic="0"/>
<itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="BoldComment" defStyleNum="dsNormal" color="#CD853F" selColor="#808080" bold="1" italic="1"/>
<itemData name="DivideComment" defStyleNum="dsComment" bold="1"/>
<itemData name="Directive" defStyleNum="dsOthers"/>
</itemDatas>
<itemData name="Symbol" defStyleNum="dsNormal"/>
<itemData name="Decimal" defStyleNum="dsDecVal" />
<itemData name="Float" defStyleNum="dsFloat"/>
<itemData name="Octal" defStyleNum="dsBaseN"/>
<itemData name="Hex" defStyleNum="dsBaseN"/>
<itemData name="Float" defStyleNum="dsFloat"/>
<itemData name="Base-N" defStyleNum="dsBaseN" />
<itemData name="Float" defStyleNum="dsFloat" />
<itemData name="Char" defStyleNum="dsChar" />
<itemData name="Constant" defStyleNum="dsNormal" color="#FF0000" selColor="#000000" bold="0" italic="0"/>
<itemData name="Fill" defStyleNum="dsNormal" color="#FF6347" selColor="#000000" bold="0" italic="0"/>
<itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="BoldComment" defStyleNum="dsNormal" color="#CD853F" selColor="#808080" bold="1" italic="1"/>
<itemData name="DivideComment" defStyleNum="dsComment" bold="1"/>
<itemData name="Directive" defStyleNum="dsOthers"/>
</itemDatas>
</highlighting>
<general>
<keywords casesensitive="0" />
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<language name="Perl" version="1.04" kateversion="2.1" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl">
<!DOCTYPE language SYSTEM "language.dtd">
<language name="Perl" version="1.05" kateversion="2.1" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl">
<highlighting>
<list name="keywords">
<item> if </item>
......@@ -394,7 +393,7 @@
<Detect2Chars attribute="String" context="#stay" char="\" char1="\" />
<Detect2Chars attribute="String (interpolated)" context="#stay" char="\" char1="&quot;" />
<DetectChar attribute="String (interpolated)" context="#pop" char="&quot;"/>
<IncludeRules context="2" />
<IncludeRules context="ipstring_internal" />
</context>
<context attribute="String" lineEndContext="#stay" name="string">
<LineContinue attribute="String" context="#stay"/>
......@@ -408,7 +407,7 @@
<Detect2Chars attribute="String (interpolated)" context="#stay" char="\" char1=")" />
<RangeDetect attribute="String (interpolated)" context="#stay" char="(" char1=")" />
<DetectChar attribute="String (interpolated)" context="#pop" char=")" />
<IncludeRules context="2" />
<IncludeRules context="ipstring_internal" />
</context>
<context attribute="String (interpolated)" lineEndContext="#stay" name="ip_string_3">
<LineContinue attribute="String (interpolated)" context="#stay" />
......@@ -416,7 +415,7 @@
<Detect2Chars attribute="String (interpolated)" context="#stay" char="\" char1="}" />
<RangeDetect attribute="String (interpolated)" context="#stay" char="{" char1="}" />
<DetectChar attribute="String (interpolated)" context="#pop" char="}" />
<IncludeRules context="2" />
<IncludeRules context="ipstring_internal" />
</context>
<context attribute="String (interpolated)" lineEndContext="#stay" name="ip_string_4">
<LineContinue attribute="String (interpolated)" context="#stay" />
......@@ -424,7 +423,7 @@
<Detect2Chars attribute="String (interpolated)" context="#stay" char="\" char1="]" />
<RangeDetect attribute="String (interpolated)" context="#stay" char="[" char1="]" />
<DetectChar attribute="String (interpolated)" context="#pop" char="]" />
<IncludeRules context="2" />
<IncludeRules context="ipstring_internal" />
</context>
<context attribute="String (interpolated)" lineEndContext="#stay" name="ip_string_5">
<LineContinue attribute="String (interpolated)" context="#stay" />
......@@ -432,7 +431,7 @@
<Detect2Chars attribute="String (interpolated)" context="#stay" char="\" char1="&gt;" />
<RangeDetect attribute="String (interpolated)" context="#stay" char="&lt;" char1="&gt;" />
<DetectChar attribute="String (interpolated)" context="#pop" char="&gt;" />
<IncludeRules context="2" />
<IncludeRules context="ipstring_internal" />
</context>
<context attribute="String" lineEndContext="#stay" name="string_2">
<LineContinue attribute="String" context="#stay" />
......@@ -467,7 +466,7 @@
<RegExpr attribute="Comment" context="#stay" String="\s+#.*$" />
<Detect2Chars attribute="Pattern" context="#stay" char="\" char1="{" />
<Detect2Chars attribute="Pattern" context="#stay" char="\" char1="}" />
<IncludeRules context="3" />
<IncludeRules context="regex_pattern_internal" />
<DetectChar attribute="Pattern" context="op_s_replace" char="}" />
</context>
<context attribute="Normal Text" lineEndContext="#stay" name="op_s_replace">
......@@ -477,9 +476,10 @@
<RegExpr attribute="Special Variable" context="#stay" String="\$[0-9]+" />
<RegExpr attribute="Data Type" context="#stay" String="\$+#?[a-zA-Z_]+[a-zA-Z0-9_]*" />
<RegExpr attribute="Data Type" context="#stay" String="[@%][\$a-zA-Z_]+[a-zA-Z0-9_]*" />
<keyword attribute="Keyword" context="0" String="keywords" />
<keyword attribute="Operator" context="0" String="operators" />
<keyword attribute="Function" context="0" String="functions" />
<!-- rodda: not too sure about the next three contexts... they were originally "context 0" -->
<keyword attribute="Keyword" context="#stay" String="keywords" />
<keyword attribute="Operator" context="#stay" String="operators" />
<keyword attribute="Function" context="#stay" String="functions" />
<Detect2Chars attribute="Pattern" context="#stay" char="\" char1="{" />
<Detect2Chars attribute="Pattern" context="#stay" char="\" char1="}" />
<DetectChar attribute="Pattern" context="#stay" char="{" />
......@@ -495,7 +495,7 @@
<context attribute="Pattern" lineEndContext="#stay" name="pattern_slash">
<RegExpr attribute="Comment" context="#stay" String="^\s*#.*$" />
<LineContinue attribute="Pattern" context="#stay" />
<IncludeRules context="3" />
<IncludeRules context="regex_pattern_internal" />
<DetectChar attribute="Pattern" context="#pop" char="/" />
</context>
<context attribute="Data" lineEndContext="#stay" name="data_handle">
......@@ -568,33 +568,33 @@
<RegExpr attribute="Note" context="#stay" String="(?:FIXME|TODO|NOTE):?" />
</context>
<context attribute="String (interpolated)" name="Backticked">
<IncludeRules context="2"/>
<IncludeRules context="ipstring_internal"/>
<DetectChar attribute="Operator" context="#pop" char="`"/>
</context>
</contexts>
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Pragma" defStyleNum="dsKeyword" />
<itemData name="Function" defStyleNum="dsNormal" color="#000080" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Operator" defStyleNum="dsKeyword" />
<itemData name="Data Type" defStyleNum="dsDataType" />
<itemData name="Special Variable" defStyleNum="dsDataType" color="#C00000" selColor="#C00000" bold="0" italic="0" />
<itemData name="Decimal" defStyleNum="dsDecVal" />
<itemData name="Octal" defStyleNum="dsBaseN" />
<itemData name="Hex" defStyleNum="dsBaseN" />
<itemData name="Float" defStyleNum="dsFloat" />
<itemData name="String" defStyleNum="dsString" color="#FF6C6C" selColor="#FF6C6C" bold="0" italic="0" />
<itemData name="String (interpolated)" defStyleNum="dsString" />
<itemData name="String Special Character" defStyleNum="dsChar" />
<itemData name="Pattern" defStyleNum="dsOthers" />
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Keyword" defStyleNum="dsKeyword" />
<itemData name="Pragma" defStyleNum="dsKeyword" />
<itemData name="Function" defStyleNum="dsNormal" color="#000080" selColor="#ffffff" bold="0" italic="0"/>
<itemData name="Operator" defStyleNum="dsKeyword" />
<itemData name="Data Type" defStyleNum="dsDataType" />
<itemData name="Special Variable" defStyleNum="dsDataType" color="#C00000" selColor="#C00000" bold="0" italic="0" />
<itemData name="Decimal" defStyleNum="dsDecVal" />
<itemData name="Octal" defStyleNum="dsBaseN" />
<itemData name="Hex" defStyleNum="dsBaseN" />
<itemData name="Float" defStyleNum="dsFloat" />
<itemData name="String" defStyleNum="dsString" color="#FF6C6C" selColor="#FF6C6C" bold="0" italic="0" />
<itemData name="String (interpolated)" defStyleNum="dsString" />
<itemData name="String Special Character" defStyleNum="dsChar" />
<itemData name="Pattern" defStyleNum="dsOthers" />
<itemData name="Pattern Internal Operator" defStyleNum="dsChar" />
<itemData name="Pattern Character Class" defStyleNum="dsBaseN" />
<itemData name="Data" defStyleNum="dsNormal" />
<itemData name="Comment" defStyleNum="dsComment" />
<itemData name="Pod" defStyleNum="dsComment" />
<itemData name="Nothing" defStyleNum="dsComment" />
<itemData name="Note" defStyleNum="dsDecVal" color="#0000FF" selColor="#ffffff" bold="1" italic="0"/>
<itemData name="Pattern Character Class" defStyleNum="dsBaseN" />
<itemData name="Data" defStyleNum="dsNormal" />
<itemData name="Comment" defStyleNum="dsComment" />
<itemData name="Pod" defStyleNum="dsComment" />
<itemData name="Nothing" defStyleNum="dsComment" />
<itemData name="Note" defStyleNum="dsDecVal" color="#0000FF" selColor="#ffffff" bold="1" italic="0"/>
</itemDatas>
</highlighting>
<general>
......
......@@ -385,7 +385,7 @@
<context name="String" attribute="String" lineEndContext="#stay">
<LineContinue attribute="String" context="#pop"/>
<HlCStringChar attribute="String Char" context="#stay"/>
<DetectChar attribute="Symbol" context="#stay" char="\'"/>
<DetectChar attribute="Symbol" context="#stay" char="&#38;"/>
<DetectChar attribute="String" context="#pop" char="'"/>
</context>
<context name="SingleLineComment" attribute="Comment" lineEndContext="#pop"/>
......
......@@ -2,7 +2,7 @@
<!DOCTYPE language SYSTEM "language.dtd">
<!-- Author: Shane Wright <me@shanewright.co.uk> -->
<!-- PostgreSQL SQL, syntax definition based on sql.xml by Yury Lebedev -->
<language name="SQL-PostgreSQL" version="1.01" kateversion="2.1" section="Other" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0">
<language name="SQL-PostgreSQL" version="1.03" kateversion="2.1" section="Other" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0">
<highlighting>
<list name="keywords">
<item> ABORT </item>
......@@ -727,45 +727,46 @@
<item> TIMESTAMPTZ </item>
</list>
<contexts>
<context name="Normal Text" attribute="0" lineEndContext="0">
<keyword attribute="1" context="0" String="keywords"/>
<keyword attribute="2" context="0" String="operators"/>
<keyword attribute="3" context="0" String="functions"/>
<keyword attribute="4" context="0" String="types"/>
<RegExpr attribute="4" context="0" String="%[Bb][Uu][Ll][Kk]_[Ee][Xx][Cc][Ee][Pp][Tt][Ii][Oo][Nn][Ss]\b"/>
<RegExpr attribute="4" context="0" String="%[Bb][Uu][Ll][Kk]_[Rr][Oo][Ww][Cc][Oo][Uu][Nn][Tt]\b"/>
<RegExpr attribute="4" context="0" String="%[Ff][Oo][Uu][Nn][Dd]\b"/>
<RegExpr attribute="4" context="0" String="%[Ii][Ss][Oo][Pp][Ee][Nn]\b"/>
<RegExpr attribute="4" context="0" String="%[Nn][Oo][Tt][Ff][Oo][Uu][Nn][Dd]\b"/>
<RegExpr attribute="4" context="0" String="%[Rr][Oo][Ww][Cc][Oo][Uu][Nn][Tt]\b"/>
<RegExpr attribute="4" context="0" String="%[Rr][Oo][Ww][Tt][Yy][Pp][Ee]\b"/>
<RegExpr attribute="4" context="0" String="%[Tt][Yy][Pp][Ee]\b"/>
<Float attribute="6" context="0"/>
<Int attribute="5" context="0"/>
<DetectChar attribute="7" context="1" char="'"/>
<Detect2Chars attribute="8" context="2" char="-" char1="-"/>
<Detect2Chars attribute="8" context="3" char="/" char1="*"/>
<RegExpr attribute="8" context="4" String="^[Rr][Ee][Mm]\b"/>
<DetectChar attribute="9" context="5" char="&quot;"/>
<AnyChar attribute="10" context="0" String=":&#38;"/>
<RegExpr attribute="10" context="0" String="^/$"/>
<RegExpr attribute="11" context="6" String="^@@?[^@ \t\r\n]"/>
<context name="Normal" attribute="Normal Text" lineEndcontext="#stay">
<keyword attribute="Keyword" context="#stay" String="keywords"/>
<keyword attribute="Operator" context="#stay" String="operators"/>
<keyword attribute="Function" context="#stay" String="functions"/>
<keyword attribute="Data Type" context="#stay" String="types"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Bb][Uu][Ll][Kk]_[Ee][Xx][Cc][Ee][Pp][Tt][Ii][Oo][Nn][Ss]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Bb][Uu][Ll][Kk]_[Rr][Oo][Ww][Cc][Oo][Uu][Nn][Tt]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Ff][Oo][Uu][Nn][Dd]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Ii][Ss][Oo][Pp][Ee][Nn]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Nn][Oo][Tt][Ff][Oo][Uu][Nn][Dd]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Rr][Oo][Ww][Cc][Oo][Uu][Nn][Tt]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Rr][Oo][Ww][Tt][Yy][Pp][Ee]\b"/>
<RegExpr attribute="Data Type" context="#stay" String="%[Tt][Yy][Pp][Ee]\b"/>
<Float attribute="Float" context="#stay"/>
<Int attribute="Decimal" context="#stay"/>
<DetectChar attribute="String" context="String" char="'"/>
<DetectChar attribute="Comment" context="SingleLineComment" char="#"/>
<Detect2Chars attribute="Comment" context="SingleLineComment" char="-" char1="-"/>
<Detect2Chars attribute="Comment" context="MultiLineComment" char="/" char1="*" beginRegion="Comment"/>
<RegExpr attribute="Comment" context="SingleLineComment" String="^[Rr][Ee][Mm]\b"/>
<DetectChar attribute="Comment" context="Identifier" char="&quot;"/>
<AnyChar attribute="Symbol" context="#stay" String=":&#38;"/>
<RegExpr attribute="Symbol" context="#stay" String="^/$"/>
<RegExpr attribute="Preprocessor" context="Preprocessor" String="^@@?[^@ \t\r\n]"/>
</context>
<context name="String" attribute="7" lineEndContext="1">
<LineContinue attribute="7" context="0"/>
<DetectChar attribute="10" context="1" char="&#38;"/>
<DetectChar attribute="7" context="0" char="'"/>
<context name="String" attribute="String" lineEndContext="#stay">
<LineContinue attribute="String" context="#pop"/>
<HlCStringChar attribute="String Char" context="#stay"/>
<DetectChar attribute="Symbol" context="#stay" char="&#38;"/>
<DetectChar attribute="String" context="#pop" char="'"/>
</context>
<context name="Comment" attribute="8" lineEndContext="0"/>
<context name="Comment" attribute="8" lineEndContext="3">
<LineContinue attribute="8" context="0"/>
<Detect2Chars attribute="8" context="0" char="*" char1="/"/>
<context name="SingleLineComment" attribute="Comment" lineEndContext="#pop"/>
<context name="MultiLineComment" attribute="Comment" lineEndContext="#stay">
<LineContinue attribute="Comment" context="#pop"/>
<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
</context>
<context name="Comment" attribute="8" lineEndContext="0"/>
<context name="Identifier" attribute="9" lineEndContext="0">
<DetectChar attribute="9" context="0" char="&quot;"/>
<context name="Identifier" attribute="Identifier" lineEndContext="#pop">
<DetectChar attribute="Identifier" context="#pop" char="&quot;"/>
</context>
<context name="Preprocessor" attribute="11" lineEndContext="0"/>
<context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop"/>
</contexts>
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal"/>
......@@ -776,6 +777,7 @@
<itemData name="Decimal" defStyleNum="dsDecVal"/>
<itemData name="Float" defStyleNum="dsFloat"/>
<itemData name="String" defStyleNum="dsString"/>
<itemData name="String Char" defStyleNum="dsChar"/>
<itemData name="Comment" defStyleNum="dsComment"/>
<itemData name="Identifier" defStyleNum="dsOthers"/>
<itemData name="Symbol" defStyleNum="dsChar"/>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment