Merge branch 'master' of https://github.com/PrettyFlower/KateTypeScri…

…ptSyntaxHighlighting
PrettyFlower · Dec 22, 2012 · ba05fdc · ba05fdc
2 parents 302ce93 + d619eff
commit ba05fdc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: PrettyFlower <[email protected]>
 pkgname=kate-typescript-syntax-highlighting
-pkgver=20121013
+pkgver=20121015
 pkgrel=1
 pkgdesc="Syntax highlighting for TypeScript in Kate"
 arch=('any')

diff --git a/typescript.xml b/typescript.xml
@@ -31,13 +31,17 @@
         <item> const </item>
         <item> default </item>
         <item> this </item>
+        <item> null </item>
+        <item> undefined </item>
 
         <item> class </item>
         <item> export </item>
+        <item> declare </item>
         <item> module </item>
         <item> import </item>
         <item> static </item>
         <item> interface </item>
+        <item> implements </item>
         <item> constructor </item>
         <item> public </item>
         <item> private </item>
@@ -51,7 +55,7 @@
     <contexts>
         <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
             <DetectSpaces/>
-            <keyword attribute="Keyword" context="#stay" String="keywords" />
+            <keyword attribute="Keyword" context="#stay" String="keywords"/>
             <DetectChar attribute="String" context="String" char="&quot;"/>
             <DetectChar attribute="String Char" context="String 1" char="'"/>
             <StringDetect attribute="Reference" context="Reference" String="///" />
@@ -86,6 +90,8 @@
         </context>
 
         <context attribute="Reference" lineEndContext="#pop" name="Reference">
+            <DetectChar attribute="ReferenceBracket" context="#stay" char="&lt;"/>
+            <DetectChar attribute="ReferenceBracket" context="#stay" char="&gt;"/>
             <DetectChar attribute="ReferenceFile" context="ReferenceFile" char="&quot;"/>
             <DetectChar attribute="ReferenceFile" context="ReferenceFile 1" char="'"/>
         </context>
@@ -105,13 +111,14 @@
         </context>
     </contexts>
     <itemDatas>
-        <itemData name="Normal Text" defStyleNum="dsNormal"  spellChecking="false"/>
-        <itemData name="Keyword" defStyleNum="dsNormal" spellChecking="false" color="#00f"/>
-        <itemData name="Char" defStyleNum="dsChar" spellChecking="false"/>
+        <itemData name="Normal Text" defStyleNum="dsNormal"/>
+        <itemData name="Keyword" defStyleNum="dsNormal" color="#00f"/>
+        <itemData name="Char" defStyleNum="dsChar"/>
         <itemData name="String" defStyleNum="dsString" color="#a31515"/>
-        <itemData name="String Char" defStyleNum="dsChar" spellChecking="false" color="#a31515"/>
+        <itemData name="String Char" defStyleNum="dsString" color="#a31515"/>
         <itemData name="Comment" defStyleNum="dsNormal" italic="true" color="#080"/>
-        <itemData name="Reference" defStyleNum="dsNormal" color="#888"/>
+        <itemData name="Reference" defStyleNum="dsNormal" color="#aeb9ae"/>
+        <itemData name="ReferenceBracket" defStyleNum="dsNormal" color="#708870" bold="true"/>
         <itemData name="ReferenceFile" defStyleNum="dsNormal" color="#2c51cc"/>
     </itemDatas>
 </highlighting>
@@ -120,6 +127,6 @@
         <comment name="singleLine" start="//" />
         <comment name="multiLine" start="/*" end="*/" />
     </comments>
-    <keywords casesensitive="1" />
+    <keywords casesensitive="1"/>
 </general>
 </language>