[gtksourceview] typescript.lang: Update context ids



commit c4372356a80bf5582ba81ef25c2d9c1774a0a50b
Author: Jeffery To <jeffery to gmail com>
Date:   Tue Nov 12 04:49:39 2019 +0800

    typescript.lang: Update context ids
    
    This updates context ids with "parameter-list" to "parameters-list",
    because lists have multiple items (and to match other similarly named
    contexts).

 .../typescript-js-functions-classes.lang               | 18 +++++++++---------
 data/language-specs/typescript-js-modules.lang         |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/data/language-specs/typescript-js-functions-classes.lang 
b/data/language-specs/typescript-js-functions-classes.lang
index 24e6c113..2f834514 100644
--- a/data/language-specs/typescript-js-functions-classes.lang
+++ b/data/language-specs/typescript-js-functions-classes.lang
@@ -120,29 +120,29 @@
            property: 'value'
     -->
 
-    <context id="_function-parameter-list-and-type-annotation" once-only="true">
+    <context id="_function-parameters-list-and-type-annotation" once-only="true">
       <start>(?=\()</start>
       <end>\%{js:before-next-token}</end>
       <include>
         <context ref="js:comments"/>
 
-        <context id="_function-parameter-list-and-type-annotation-content">
+        <context id="_function-parameters-list-and-type-annotation-content">
           <include>
             <context ref="js-fn:_ordered-function-parameters-list" style-ref="js:function-expression"/>
             <context ref="typescript:ordered-type-annotation"/>
           </include>
-        </context> <!-- /_function-parameter-list-and-type-annotation-content -->
+        </context> <!-- /_function-parameters-list-and-type-annotation-content -->
 
       </include>
-    </context> <!-- /_function-parameter-list-and-type-annotation -->
+    </context> <!-- /_function-parameters-list-and-type-annotation -->
 
-    <context id="_ordered-function-parameter-list-and-type-annotation" once-only="true">
+    <context id="_ordered-function-parameters-list-and-type-annotation" once-only="true">
       <start>\%{js:before-next-token}</start>
       <end>\%{js:before-next-token}</end>
       <include>
-        <context ref="_function-parameter-list-and-type-annotation"/>
+        <context ref="_function-parameters-list-and-type-annotation"/>
       </include>
-    </context> <!-- /_ordered-function-parameter-list-and-type-annotation -->
+    </context> <!-- /_ordered-function-parameters-list-and-type-annotation -->
 
     <!-- replaces js-fn:_method-definition-content -->
     <context id="method-definition-content">
@@ -159,7 +159,7 @@
              assertion cannot both be specified -->
         <context ref="typescript:ordered-definite-assignment-assertion"/>
         <context ref="typescript-type-gen:ordered-type-parameters-list"/>
-        <context ref="_ordered-function-parameter-list-and-type-annotation"/>
+        <context ref="_ordered-function-parameters-list-and-type-annotation"/>
         <context ref="js-fn:_last-function-body" style-ref="js:function-expression"/>
       </include>
     </context> <!-- /method-definition-content -->
@@ -300,7 +300,7 @@
           <include>
             <context ref="js-fn:ordered-method-definition"/>
             <!-- method-definition has a type-annotation, but it is tied
-                 to function-parameter-list -->
+                 to function-parameters-list -->
             <context ref="typescript:ordered-type-annotation"/>
             <context ref="js:ordered-default-value-assignment"/>
           </include>
diff --git a/data/language-specs/typescript-js-modules.lang b/data/language-specs/typescript-js-modules.lang
index 96805908..90a154a7 100644
--- a/data/language-specs/typescript-js-modules.lang
+++ b/data/language-specs/typescript-js-modules.lang
@@ -128,20 +128,20 @@
         <context id="_import-require-content">
           <include>
 
-            <context id="_import-require-parameter-list" once-only="true">
+            <context id="_import-require-parameters-list" once-only="true">
               <start>\(</start>
               <end>\)</end>
               <include>
                 <context ref="js:comments"/>
 
-                <context id="_import-require-parameter-list-content">
+                <context id="_import-require-parameters-list-content">
                   <include>
                     <context ref="typescript:js-ordered-string"/>
                   </include>
-                </context> <!-- /_import-require-parameter-list-content -->
+                </context> <!-- /_import-require-parameters-list-content -->
 
               </include>
-            </context> <!-- /_import-require-parameter-list -->
+            </context> <!-- /_import-require-parameters-list -->
 
           </include>
         </context> <!-- /_import-require-content -->


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]