[gtksourceview] javascript.lang: Group properties/methods by object

[Christian Hergert <chergert src gnome org>]

commit f8f408a995abb8c58a7a5cc80ff41bc0e0b0b1d5
Author: Jeffery To <jeffery to gmail com>
Date:   Mon Jul 2 03:38:54 2018 +0800

    javascript.lang: Group properties/methods by object
    
    This should make maintenance easier, instead of dealing with two giant
    contexts.
    
    This also ensures methods are preceded by a dot (but not spread or rest
    parameter syntax), and changes highlighting of properties so that the
    dot is not highlighted.

 data/language-specs/javascript.lang | 218 ++++++++++++++++++++++++------------
 1 file changed, 147 insertions(+), 71 deletions(-)
---
diff --git a/data/language-specs/javascript.lang b/data/language-specs/javascript.lang
index 3d176f31..431f2b40 100644
--- a/data/language-specs/javascript.lang
+++ b/data/language-specs/javascript.lang
@@ -52,6 +52,8 @@
 
   <definitions>
 
+    <define-regex id="is-member">(?&lt;=[^.]\.)</define-regex>
+
     <!--regex-->
     <define-regex id="regex-opts">[gim]*</define-regex>
 
@@ -231,29 +233,40 @@
       <keyword>NaN</keyword>
     </context>
 
-    <context id="functions" style-ref="function">
-      <keyword>abs</keyword>
-      <keyword>acos</keyword>
-      <keyword>apply</keyword>
-      <keyword>asin</keyword>
-      <keyword>atan2</keyword>
-      <keyword>atan</keyword>
-      <keyword>call</keyword>
-      <keyword>ceil</keyword>
-      <keyword>charAt</keyword>
-      <keyword>charCodeAt</keyword>
-      <keyword>concat</keyword>
-      <keyword>cos</keyword>
+    <context id="global-functions" style-ref="function">
       <keyword>decodeURIComponent</keyword>
       <keyword>decodeURI</keyword>
       <keyword>encodeURIComponent</keyword>
       <keyword>encodeURI</keyword>
       <keyword>escape</keyword>
       <keyword>eval</keyword>
-      <keyword>exec</keyword>
-      <keyword>exp</keyword>
-      <keyword>floor</keyword>
-      <keyword>fromCharCode</keyword>
+      <keyword>isFinite</keyword>
+      <keyword>isNaN</keyword>
+      <keyword>parseFloat</keyword>
+      <keyword>parseInt</keyword>
+      <keyword>unescape</keyword>
+    </context>
+
+    <context id="array-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
+      <keyword>length</keyword>
+    </context>
+
+    <context id="array-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>concat</keyword>
+      <keyword>join</keyword>
+      <keyword>pop</keyword>
+      <keyword>push</keyword>
+      <keyword>reverse</keyword>
+      <keyword>shift</keyword>
+      <keyword>slice</keyword>
+      <keyword>sort</keyword>
+      <keyword>unshift</keyword>
+    </context>
+
+    <context id="date-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
       <keyword>getDate</keyword>
       <keyword>getDay</keyword>
       <keyword>getFullYear</keyword>
@@ -273,30 +286,7 @@
       <keyword>getUTCMonth</keyword>
       <keyword>getUTCSeconds</keyword>
       <keyword>getYear</keyword>
-      <keyword>hasOwnProperty</keyword>
-      <keyword>indexOf</keyword>
-      <keyword>isFinite</keyword>
-      <keyword>isNaN</keyword>
-      <keyword>isPrototypeOf</keyword>
-      <keyword>join</keyword>
-      <keyword>lastIndexOf</keyword>
-      <keyword>localeCompare</keyword>
-      <keyword>log</keyword>
-      <keyword>match</keyword>
-      <keyword>max</keyword>
-      <keyword>min</keyword>
-      <keyword>parseFloat</keyword>
-      <keyword>parseInt</keyword>
       <keyword>parse</keyword>
-      <keyword>pop</keyword>
-      <keyword>pow</keyword>
-      <keyword>propertyIsEnumerable</keyword>
-      <keyword>push</keyword>
-      <keyword>random</keyword>
-      <keyword>replace</keyword>
-      <keyword>reverse</keyword>
-      <keyword>round</keyword>
-      <keyword>search</keyword>
       <keyword>setDate</keyword>
       <keyword>setFullYear</keyword>
       <keyword>setHours</keyword>
@@ -313,52 +303,124 @@
       <keyword>setUTCMonth</keyword>
       <keyword>setUTCSeconds</keyword>
       <keyword>setYear</keyword>
-      <keyword>shift</keyword>
-      <keyword>sin</keyword>
-      <keyword>slice</keyword>
-      <keyword>sort</keyword>
-      <keyword>split</keyword>
-      <keyword>sqrt</keyword>
-      <keyword>substring</keyword>
-      <keyword>substr</keyword>
-      <keyword>tan</keyword>
       <keyword>toDateString</keyword>
-      <keyword>toExponential</keyword>
-      <keyword>toFixed</keyword>
       <keyword>toGMTString</keyword>
       <keyword>toLocaleDateString</keyword>
-      <keyword>toLocaleLowerCase</keyword>
-      <keyword>toLocaleString</keyword>
       <keyword>toLocaleTimeString</keyword>
-      <keyword>toLocaleUpperCase</keyword>
-      <keyword>toLowerCase</keyword>
-      <keyword>toPrecision</keyword>
-      <keyword>toString</keyword>
       <keyword>toTimeString</keyword>
-      <keyword>toUpperCase</keyword>
       <keyword>toUTCString</keyword>
-      <keyword>unescape</keyword>
-      <keyword>unshift</keyword>
       <keyword>UTC</keyword>
-      <keyword>valueOf</keyword>
     </context>
 
-    <context id="properties" style-ref="properties">
-      <prefix>\.</prefix>
-      <keyword>constructor</keyword>
-      <keyword>global</keyword>
-      <keyword>ignoreCase</keyword>
-      <keyword>lastIndex</keyword>
-      <keyword>length</keyword>
+    <context id="error-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
       <keyword>message</keyword>
-      <keyword>multiline</keyword>
       <keyword>name</keyword>
+    </context>
+
+    <context id="function-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
+      <keyword>length</keyword>
+    </context>
+
+    <context id="function-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>apply</keyword>
+      <keyword>call</keyword>
+    </context>
+
+    <context id="math-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>abs</keyword>
+      <keyword>acos</keyword>
+      <keyword>asin</keyword>
+      <keyword>atan2</keyword>
+      <keyword>atan</keyword>
+      <keyword>ceil</keyword>
+      <keyword>cos</keyword>
+      <keyword>exp</keyword>
+      <keyword>floor</keyword>
+      <keyword>log</keyword>
+      <keyword>max</keyword>
+      <keyword>min</keyword>
+      <keyword>pow</keyword>
+      <keyword>random</keyword>
+      <keyword>round</keyword>
+      <keyword>sin</keyword>
+      <keyword>sqrt</keyword>
+      <keyword>tan</keyword>
+    </context>
+
+    <context id="number-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
       <keyword>NEGATIVE_INFINITY</keyword>
       <keyword>POSITIVE_INFINITY</keyword>
+    </context>
+
+    <context id="number-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>toExponential</keyword>
+      <keyword>toFixed</keyword>
+      <keyword>toPrecision</keyword>
+    </context>
+
+    <context id="object-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
+      <keyword>constructor</keyword>
       <keyword>prototype</keyword>
+    </context>
+
+    <context id="object-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>hasOwnProperty</keyword>
+      <keyword>isPrototypeOf</keyword>
+      <keyword>propertyIsEnumerable</keyword>
+      <keyword>toLocaleString</keyword>
+      <keyword>toString</keyword>
+      <keyword>valueOf</keyword>
+    </context>
+
+    <context id="regexp-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
+      <keyword>global</keyword>
+      <keyword>ignoreCase</keyword>
+      <keyword>lastIndex</keyword>
+      <keyword>multiline</keyword>
       <keyword>source</keyword>
     </context>
 
+    <context id="regexp-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>exec</keyword>
+    </context>
+
+    <context id="string-properties" style-ref="properties">
+      <prefix>\%{is-member}</prefix>
+      <keyword>length</keyword>
+    </context>
+
+    <context id="string-methods" style-ref="function">
+      <prefix>\%{is-member}</prefix>
+      <keyword>charAt</keyword>
+      <keyword>charCodeAt</keyword>
+      <keyword>concat</keyword>
+      <keyword>fromCharCode</keyword>
+      <keyword>indexOf</keyword>
+      <keyword>lastIndexOf</keyword>
+      <keyword>localeCompare</keyword>
+      <keyword>match</keyword>
+      <keyword>replace</keyword>
+      <keyword>search</keyword>
+      <keyword>slice</keyword>
+      <keyword>split</keyword>
+      <keyword>substring</keyword>
+      <keyword>substr</keyword>
+      <keyword>toLocaleLowerCase</keyword>
+      <keyword>toLocaleUpperCase</keyword>
+      <keyword>toLowerCase</keyword>
+      <keyword>toUpperCase</keyword>
+    </context>
+
     <context id="constructors" style-ref="constructors">
       <keyword>Array</keyword>
       <keyword>Boolean</keyword>
@@ -419,8 +481,22 @@
         <context ref="boolean"/>
         <context ref="keywords"/>
         <context ref="types"/>
-        <context ref="functions"/>
-        <context ref="properties"/>
+        <context ref="global-functions"/>
+        <context ref="array-properties"/>
+        <context ref="array-methods"/>
+        <context ref="date-methods"/>
+        <context ref="error-properties"/>
+        <context ref="function-properties"/>
+        <context ref="function-methods"/>
+        <context ref="math-methods"/>
+        <context ref="number-properties"/>
+        <context ref="number-methods"/>
+        <context ref="object-properties"/>
+        <context ref="object-methods"/>
+        <context ref="regexp-properties"/>
+        <context ref="regexp-methods"/>
+        <context ref="string-properties"/>
+        <context ref="string-methods"/>
         <context ref="constructors"/>
         <context ref="future-words"/>
         <context ref="regex-simple"/>