summaryrefslogtreecommitdiffstats
path: root/kate/data
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2017-01-30 00:22:38 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2017-01-30 00:24:12 +0900
commitb75f1b6d5e99b8466ddbaf3a99cb34e122f00ae9 (patch)
treeacea5a2fc2a6fb9784af7c0abf577435ef07bb0e /kate/data
parent97b5a9f18f1708bc0fb9b3eb6c8c22be848aabdd (diff)
downloadtdelibs-b75f1b6d5e99b8466ddbaf3a99cb34e122f00ae9.tar.gz
tdelibs-b75f1b6d5e99b8466ddbaf3a99cb34e122f00ae9.zip
Fixed javascript syntax highlighting in Kate
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit b14a2da3b92460ef7dddbc98b4a794d61840a97c)
Diffstat (limited to 'kate/data')
-rw-r--r--kate/data/javascript-php.xml3
-rw-r--r--kate/data/javascript.xml3
-rw-r--r--kate/data/update-files.xml4
3 files changed, 6 insertions, 4 deletions
diff --git a/kate/data/javascript-php.xml b/kate/data/javascript-php.xml
index 3c5305a3a..f5a53d0b6 100644
--- a/kate/data/javascript-php.xml
+++ b/kate/data/javascript-php.xml
@@ -9,7 +9,7 @@
-<language name="JavaScript/PHP" hidden="true" version="1.22" kateversion="2.4" section="Other" extensions=""
+<language name="JavaScript/PHP" hidden="true" version="1.22-1" kateversion="2.4" section="Other" extensions=""
mimetype="" indenter="cstyle"
author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
<highlighting>
@@ -80,6 +80,7 @@
<context name="Shebang" lineEndContext="Normal" attribute="Syntax Error" fallthrough="true" fallthroughContext="Normal" >
<IncludeRules context="FindPHP" />
<Detect2Chars column="0" char="#" char1="!" context="Comment" attribute="Comment" />
+ <IncludeRules context="Normal" />
</context>
<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index c9b5f4bcc..e90f0b051 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -3,7 +3,7 @@
<!-- Author: Anders Lund <anders@alweb.dk> //-->
<!-- Minor changes: Joseph Wenninger <jowenn@kde.org> //-->
<!-- Full JavaScript 1.0 support by Whitehawk Stormchaser //-->
-<language name="JavaScript" version="1.22" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
+<language name="JavaScript" version="1.22-1" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
mimetype="text/x-javascript;application/x-javascript" indenter="cstyle"
author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
<highlighting>
@@ -73,6 +73,7 @@
-->
<context name="Shebang" lineEndContext="Normal" attribute="Syntax Error" fallthrough="true" fallthroughContext="Normal" >
<Detect2Chars column="0" char="#" char1="!" context="Comment" attribute="Comment" />
+ <IncludeRules context="Normal" />
</context>
<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index d0fc2465a..66a842757 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -108,8 +108,8 @@
<Definition name="ISO C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/isocpp.xml" version="2.5-1"/>
<Definition name="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="1"/>
<Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="2"/>
-<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.22"/>
-<Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.22"/>
+<Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.22-1"/>
+<Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.22-1"/>
<Definition name="Java" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/java.xml" version="1.21"/>
<Definition name="JSON" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/json.xml" version="2"/>
<Definition name="JSP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jsp.xml" version="2"/>