diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-07-15 17:49:52 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-07-22 02:57:57 +0000 |
| commit | 44f1d4ff91e41d19d50ccac224e0301f809323c5 (patch) | |
| tree | c7e2acf96cfce755161a7f18fd407f438f27553e /src/share | |
| parent | 449f7d824ead6c3af12e9397d97d9544597c9f9e (diff) | |
GenericHighlighter: Update from latest KTextEditor source
Change-Id: Ic0ede8fce1c1cd1296bdf74f3e8591f138f234ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/3rdparty/generic-highlighter/cmake.xml | 22 | ||||
| -rw-r--r-- | src/share/3rdparty/generic-highlighter/doxygen.xml | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/share/3rdparty/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml index de8194e642..3cd4893fe3 100644 --- a/src/share/3rdparty/generic-highlighter/cmake.xml +++ b/src/share/3rdparty/generic-highlighter/cmake.xml @@ -28,7 +28,7 @@ <!-- generated for "cmake version 2.8.12.1, 3.0.2, 3.1.2 and 3.3.0" --> <language name="CMake" - version="1.35" + version="1.36" kateversion="5.0" section="Other" extensions="CMakeLists.txt;*.cmake;*.cmake.in" @@ -1103,22 +1103,22 @@ <DetectSpaces/> <!-- handle folding for if else elseif endif blocks --> - <RegExpr String="\bif\b" attribute="Commands" context="Command Args" beginRegion="ifthenelse" insensitive="true" /> - <RegExpr String="\belse\b" attribute="Commands" context="Command Args" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" /> - <RegExpr String="\belseif\b" attribute="Commands" context="Command Args" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" /> - <RegExpr String="\bendif\b" attribute="Commands" context="Command Args" endRegion="ifthenelse" insensitive="true" /> + <WordDetect String="if" attribute="Commands" context="Command Args" beginRegion="ifthenelse" insensitive="true" /> + <WordDetect String="else" attribute="Commands" context="Command Args" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" /> + <WordDetect String="elseif" attribute="Commands" context="Command Args" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" /> + <WordDetect String="endif" attribute="Commands" context="Command Args" endRegion="ifthenelse" insensitive="true" /> <!-- handle folding for macro endmacro blocks --> - <RegExpr String="\bmacro\b" attribute="Commands" context="Command Args" beginRegion="macro" insensitive="true" /> - <RegExpr String="\bendmacro\b" attribute="Commands" context="Command Args" endRegion="macro" insensitive="true" /> + <WordDetect String="macro" attribute="Commands" context="Command Args" beginRegion="macro" insensitive="true" /> + <WordDetect String="endmacro" attribute="Commands" context="Command Args" endRegion="macro" insensitive="true" /> <!-- handle folding for foreach endforeach blocks --> - <RegExpr String="\bforeach\b" attribute="Commands" context="Command Args" beginRegion="foreach" insensitive="true" /> - <RegExpr String="\bendforeach\b" attribute="Commands" context="Command Args" endRegion="foreach" insensitive="true" /> + <WordDetect String="foreach" attribute="Commands" context="Command Args" beginRegion="foreach" insensitive="true" /> + <WordDetect String="endforeach" attribute="Commands" context="Command Args" endRegion="foreach" insensitive="true" /> <!-- handle folding for while endwhile blocks --> - <RegExpr String="\bwhile\b" attribute="Commands" context="Command Args" beginRegion="while" insensitive="true" /> - <RegExpr String="\bendwhile\b" attribute="Commands" context="Command Args" endRegion="while" insensitive="true" /> + <WordDetect String="while" attribute="Commands" context="Command Args" beginRegion="while" insensitive="true" /> + <WordDetect String="endwhile" attribute="Commands" context="Command Args" endRegion="while" insensitive="true" /> <keyword attribute="Commands" context="Command Args" String="commands" insensitive="true" /> <keyword attribute="Third-Party Commands" context="#stay" String="itkvtk_commands" insensitive="true" /> diff --git a/src/share/3rdparty/generic-highlighter/doxygen.xml b/src/share/3rdparty/generic-highlighter/doxygen.xml index 5128903e91..302df7146c 100644 --- a/src/share/3rdparty/generic-highlighter/doxygen.xml +++ b/src/share/3rdparty/generic-highlighter/doxygen.xml @@ -29,7 +29,7 @@ --> <language name="Doxygen" - version="1.39" + version="1.41" kateversion="5.0" section="Markup" extensions="*.dox;*.doxygen" @@ -485,12 +485,12 @@ </contexts> <itemDatas> <itemData name="Normal Text" defStyleNum="dsNormal" /> - <itemData name="Tags" defStyleNum="dsAnnotation" bold="1" italic="0" /> - <itemData name="Custom Tags" defStyleNum="dsNormal" color="#458C61" bold="1" italic="0" /> + <itemData name="Tags" defStyleNum="dsAnnotation" bold="1" /> + <itemData name="Custom Tags" defStyleNum="dsAnnotation" /> <itemData name="Word" defStyleNum="dsCommentVar" bold="1" italic="0" /> <itemData name="HTML Tag" defStyleNum="dsKeyword" color="#000000" bold="1" italic="0" /> <itemData name="Entities" defStyleNum="dsOthers" color="#4086C0" bold="1" italic="1" /> - <itemData name="Description" defStyleNum="dsString" color="#ff0000" /> + <itemData name="Description" defStyleNum="dsDocumentation" /> <itemData name="Comment" defStyleNum="dsComment" /> <itemData name="Region" defStyleNum="dsRegionMarker" /> <itemData name="Identifier" defStyleNum="dsOthers" /> |