[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/kate/syntax/data
From:       Milian Wolff <mail () milianw ! de>
Date:       2010-03-31 21:50:31
Message-ID: 20100331215031.DFB12AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1109728 by mwolff:

Backport recent fixes and changes to Javascript language file

CCBUG: 229605

 M  +21 -271   javascript.xml  


--- branches/KDE/4.4/kdelibs/kate/syntax/data/javascript.xml #1109727:1109728
@@ -3,7 +3,9 @@
 <!-- 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.15" kateversion="2.4" section="Scripts" \
extensions="*.js" mimetype="text/x-javascript;application/x-javascript" \
author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk \
Stormchaser (zerokode@gmx.net)" license=""> +<language name="JavaScript" \
version="1.18" kateversion="2.4" section="Scripts" extensions="*.js" +          \
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>
     <list name="keywords">
         <item> if </item>
@@ -125,286 +127,25 @@
          <item>onSubmit</item>
          <item>onUnload</item>
     </list>
-    <list name="methods">
-        <item>above</item>
-        <item>action</item>
-        <item>alinkColor</item>
-        <item>alert</item>
-        <item>anchor</item>
-        <item>anchors</item>
-        <item>appCodeName</item>
-        <item>applets</item>
-        <item>apply</item>
-        <item>appName</item>
-        <item>appVersion</item>
-        <item>argument</item>
-        <item>arguments</item>
-        <item>arity</item>
-        <item>availHeight</item>
-        <item>availWidth</item>
-        <item>back</item>
-        <item>background</item>
-        <item>below</item>
-        <item>bgColor</item>
-        <item>border</item>
-        <item>big</item>
-        <item>blink</item>
-        <item>blur</item>
-        <item>bold</item>
-        <item>border</item>
-        <item>call</item>
-        <item>caller</item>
-        <item>charAt</item>
-        <item>charCodeAt</item>
-        <item>checked</item>
-        <item>clearInterval</item>
-        <item>clearTimeout</item>
-        <item>click</item>
-        <item>clip</item>
-        <item>close</item>
-        <item>closed</item>
-        <item>colorDepth</item>
-        <item>complete</item>
-        <item>compile</item>
-        <item>constructor</item>
-        <item>confirm</item>
-        <item>cookie</item>
-        <item>current</item>
-        <item>cursor</item>
-        <item>data</item>
-        <item>defaultChecked</item>
-        <item>defaultSelected</item>
-        <item>defaultStatus</item>
-        <item>defaultValue</item>
-        <item>description</item>
-        <item>disableExternalCapture</item>
-        <item>domain</item>
-        <item>elements</item>
-        <item>embeds</item>
-        <item>enabledPlugin</item>
-        <item>enableExternalCapture</item>
-        <item>encoding</item>
-        <item>eval</item>
-        <item>exec</item>
-        <item>fgColor</item>
-        <item>filename</item>
-        <item>find</item>
-        <item>fixed</item>
-        <item>focus</item>
-        <item>fontcolor</item>
-        <item>fontsize</item>
-        <item>form</item>
-        <item>forms</item>
-        <item>formName</item>
-        <item>forward</item>
-        <item>frames</item>
-        <item>fromCharCode</item>
-        <item>getDate</item>
-        <item>getDay</item>
-        <item>getHours</item>
-        <item>getMiliseconds</item>
-        <item>getMinutes</item>
-        <item>getMonth</item>
-        <item>getSeconds</item>
-        <item>getSelection</item>
-        <item>getTime</item>
-        <item>getTimezoneOffset</item>
-        <item>getUTCDate</item>
-        <item>getUTCDay</item>
-        <item>getUTCFullYear</item>
-        <item>getUTCHours</item>
-        <item>getUTCMilliseconds</item>
-        <item>getUTCMinutes</item>
-        <item>getUTCMonth</item>
-        <item>getUTCSeconds</item>
-        <item>getYear</item>
-        <item>global</item>
-        <item>go</item>
-        <item>hash</item>
-        <item>height</item>
-        <item>history</item>
-        <item>home</item>
-        <item>host</item>
-        <item>hostname</item>
-        <item>href</item>
-        <item>hspace</item>
-        <item>ignoreCase</item>
-        <item>images</item>
-        <item>index</item>
-        <item>indexOf</item>
-        <item>innerHeight</item>
-        <item>innerWidth</item>
-        <item>input</item>
-        <item>italics</item>
-        <item>javaEnabled</item>
-        <item>join</item>
-        <item>language</item>
-        <item>lastIndex</item>
-        <item>lastIndexOf</item>
-        <item>lastModified</item>
-        <item>lastParen</item>
-        <item>layers</item>
-        <item>layerX</item>
-        <item>layerY</item>
-        <item>left</item>
-        <item>leftContext</item>
-        <item>length</item>
-        <item>link</item>
-        <item>linkColor</item>
-        <item>links</item>
-        <item>location</item>
-        <item>locationbar</item>
-        <item>load</item>
-        <item>lowsrc</item>
-        <item>match</item>
-        <item>MAX_VALUE</item>
-        <item>menubar</item>
-        <item>method</item>
-        <item>mimeTypes</item>
-        <item>MIN_VALUE</item>
-        <item>modifiers</item>
-        <item>moveAbove</item>
-        <item>moveBelow</item>
-        <item>moveBy</item>
-        <item>moveTo</item>
-        <item>moveToAbsolute</item>
-        <item>multiline</item>
-        <item>name</item>
-        <item>NaN</item>
-        <item>NEGATIVE_INFINITY</item>
-        <item>negative_infinity</item>
-        <item>next</item>
-        <item>open</item>
-        <item>opener</item>
-        <item>options</item>
-        <item>outerHeight</item>
-        <item>outerWidth</item>
-        <item>pageX</item>
-        <item>pageY</item>
-        <item>pageXoffset</item>
-        <item>pageYoffset</item>
-        <item>parent</item>
-        <item>parse</item>
-        <item>pathname</item>
-        <item>personalbar</item>
-        <item>pixelDepth</item>
-        <item>platform</item>
-        <item>plugins</item>
-        <item>pop</item>
-        <item>port</item>
-        <item>POSITIVE_INFINITY</item>
-        <item>positive_infinity</item>
-        <item>preference</item>
-        <item>previous</item>
-        <item>print</item>
-        <item>prompt</item>
-        <item>protocol</item>
-        <item>prototype</item>
-        <item>push</item>
-        <item>referrer</item>
-        <item>refresh</item>
-        <item>releaseEvents</item>
-        <item>reload</item>
-        <item>replace</item>
-        <item>reset</item>
-        <item>resizeBy</item>
-        <item>resizeTo</item>
-        <item>reverse</item>
-        <item>rightContext</item>
-        <item>screenX</item>
-        <item>screenY</item>
-        <item>scroll</item>
-        <item>scrollbar</item>
-        <item>scrollBy</item>
-        <item>scrollTo</item>
-        <item>search</item>
-        <item>select</item>
-        <item>selected</item>
-        <item>selectedIndex</item>
-        <item>self</item>
-        <item>setDate</item>
-        <item>setHours</item>
-        <item>setMinutes</item>
-        <item>setMonth</item>
-        <item>setSeconds</item>
-        <item>setTime</item>
-        <item>setTimeout</item>
-        <item>setUTCDate</item>
-        <item>setUTCDay</item>
-        <item>setUTCFullYear</item>
-        <item>setUTCHours</item>
-        <item>setUTCMilliseconds</item>
-        <item>setUTCMinutes</item>
-        <item>setUTCMonth</item>
-        <item>setUTCSeconds</item>
-        <item>setYear</item>
-        <item>shift</item>
-        <item>siblingAbove</item>
-        <item>siblingBelow</item>
-        <item>small</item>
-        <item>sort</item>
-        <item>source</item>
-        <item>splice</item>
-        <item>split</item>
-        <item>src</item>
-        <item>status</item>
-        <item>statusbar</item>
-        <item>strike</item>
-        <item>sub</item>
-        <item>submit</item>
-        <item>substr</item>
-        <item>substring</item>
-        <item>suffixes</item>
-        <item>sup</item>
-        <item>taintEnabled</item>
-        <item>target</item>
-        <item>test</item>
-        <item>text</item>
-        <item>title</item>
-        <item>toGMTString</item>
-        <item>toLocaleString</item>
-        <item>toLowerCase</item>
-        <item>toolbar</item>
-        <item>toSource</item>
-        <item>toString</item>
-        <item>top</item>
-        <item>toUpperCase</item>
-        <item>toUTCString</item>
-        <item>type</item>
-        <item>URL</item>
-        <item>unshift</item>
-        <item>unwatch</item>
-        <item>userAgent</item>
-        <item>UTC</item>
-        <item>value</item>
-        <item>valueOf</item>
-        <item>visibility</item>
-        <item>vlinkColor</item>
-        <item>vspace</item>
-        <item>width</item>
-        <item>watch</item>
-        <item>which</item>
-        <item>width</item>
-        <item>write</item>
-        <item>writeln</item>
-        <item>x</item>
-        <item>y</item>
-        <item>zIndex</item>
-    </list>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
 	<DetectSpaces/>
         <StringDetect attribute="Region Marker" context="region_marker" \
                String="//BEGIN" beginRegion="Region1"/>
         <StringDetect attribute="Region Marker" context="region_marker" \
String="//END" endRegion="Region1"/> +        <Float attribute="Float" \
context="#stay" /> +        <Int attribute="Decimal" context="#stay" />
+        <RegExpr attribute="JSON" context="#stay" String="\b[\w\.]+\b\s*(?=:)" />
+
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <keyword attribute="Function" context="#stay" String="functions" />
         <keyword attribute="Objects" context="#stay" String="objects" />
         <keyword attribute="Math" context="#stay" String="math" />
         <keyword attribute="Events" context="#stay" String="events" />
-        <keyword attribute="Data Type" context="#stay" String="methods" />
+
+        <DetectChar context="ObjectMember" char="." />
+        <RegExpr attribute="Objects" context="ObjectMember" String="\b[\w\.]+(?=\.)" \
/> +
 	<DetectIdentifier/>
-        <Float attribute="Float" context="#stay" />
-        <Int attribute="Decimal" context="#stay" />
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <DetectChar attribute="String Char" context="String 1" char="'"/>
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
@@ -458,6 +199,7 @@
       </context>
       <context attribute="Pattern Character Class" lineEndContext="#stay" \
                name="Regular Expression Character Class">
         <RegExpr attribute="Pattern Character Class" context="#stay" \
String="\\[\[\]]" /> +        <RegExpr attribute="Pattern Internal Operator" \
                context="#stay" String="\\." />
         <DetectChar attribute="Pattern Character Class" context="#pop#pop" char="]" \
/>  </context>
       <context attribute="Pattern Internal Operator" lineEndContext="#pop" \
name="(regex caret first check)" fallthrough="true" fallthroughContext="Regular \
Expression"> @@ -471,15 +213,22 @@
 	<DetectIdentifier />
 	<DetectSpaces />
       </context>
+
+      <context name="ObjectMember" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar context="#stay" char="." />
+        <DetectIdentifier attribute="Object Member" />
+        <DetectSpaces context="#pop" />
+        <AnyChar lookAhead="true" context="#pop" \
String="(){}:!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/> +      </context>
     </contexts>
     <itemDatas>
       <itemData name="Normal Text"  defStyleNum="dsNormal"  spellChecking="false"/>
       <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
       <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
       <itemData name="Objects" defStyleNum="dsKeyword" color="#008000" \
selColor="#00ffff" bold="0" italic="0" spellChecking="false"/> +      <itemData \
                name="Object Member" defStyleNum="dsFunction" spellChecking="false"/>
       <itemData name="Math" defStyleNum="dsKeyword" color="#DBA716" \
                selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
       <itemData name="Events" defStyleNum="dsKeyword" color="#F766D5" \
                selColor="#00ffff" bold="0" italic="0" spellChecking="false"/>
-      <itemData name="Data Type"    defStyleNum="dsDataType" spellChecking="false"/>
       <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
       <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
       <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
@@ -491,6 +240,7 @@
       <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" \
                spellChecking="false"/>
       <itemData name="Pattern Character Class" defStyleNum="dsBaseN" \
                spellChecking="false"/>
       <itemData name="Region Marker" defStyleNum="dsRegionMarker" \
spellChecking="false"/> +      <itemData name="JSON" defStyleNum="dsDataType" \
spellChecking="false"/>  </itemDatas>
   </highlighting>
   <general>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic