[gtksourceview: 3/13] javascript.lang, typescript.lang: Pluralize context ids

[Christian Hergert <chergert src gnome org>]

commit 0cd0c5bff68f2216d2b310024fb7cb39818ab891
Author: Jeffery To <jeffery to gmail com>
Date:   Sun May 31 07:15:36 2020 +0800

    javascript.lang, typescript.lang: Pluralize context ids
    
    This updates certain context ids to be plural, for contexts that can
    match more than once.

 data/language-specs/javascript-expressions.lang | 12 ++++++------
 data/language-specs/javascript-values.lang      |  8 ++++----
 data/language-specs/typescript-js-values.lang   |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/language-specs/javascript-expressions.lang b/data/language-specs/javascript-expressions.lang
index 599ccbbc..561807cb 100644
--- a/data/language-specs/javascript-expressions.lang
+++ b/data/language-specs/javascript-expressions.lang
@@ -58,7 +58,7 @@
         <context ref="js:embedded-lang-hooks"/>
 
         <!-- ES2017, cannot be followed by line terminator -->
-        <context id="_async-pre-primary-expression-keyword" style-ref="js:keyword">
+        <context id="_async-pre-primary-expression-keywords" style-ref="js:keyword">
           <match extended="true">
             \%[ async \%]
             (?=                                       # preceeds arrow function
@@ -75,13 +75,13 @@
               \%[ function \%]
             )
           </match>
-        </context> <!-- /_async-pre-primary-expression-keyword -->
+        </context> <!-- /_async-pre-primary-expression-keywords -->
 
-        <context id="_new-pre-primary-expression-keyword" style-ref="js:keyword">
+        <context id="_new-pre-primary-expression-keywords" style-ref="js:keyword">
           <match extended="true">
             \%[ new \%] (?! \%{js:new-target-object-keyword-suffix} )
           </match>
-        </context> <!-- /_new-pre-primary-expression-keyword -->
+        </context> <!-- /_new-pre-primary-expression-keywords -->
 
       </include>
     </context> <!-- /_pre-primary-expression -->
@@ -354,7 +354,7 @@
 
         <!-- ES2020 -->
         <!-- <OptionalChain> (part of) -->
-        <context id="_optional-chain">
+        <context id="_optional-chains">
           <start>\?\.(?![0-9])</start>
           <end>\%{js:before-next-token}</end>
           <include>
@@ -371,7 +371,7 @@
             </context> <!-- /_optional-chain-content -->
 
           </include>
-        </context> <!-- /_optional-chain -->
+        </context> <!-- /_optional-chains -->
 
         <context ref="_function-arguments-lists"/>
         <context ref="js-lit:template-literals"/>
diff --git a/data/language-specs/javascript-values.lang b/data/language-specs/javascript-values.lang
index 53f25b5e..f1f7e349 100644
--- a/data/language-specs/javascript-values.lang
+++ b/data/language-specs/javascript-values.lang
@@ -120,7 +120,7 @@
           <keyword>this</keyword>
         </context> <!-- /_object-keywords -->
 
-        <context id="_import-function-keyword">
+        <context id="_import-function-keywords">
           <start extended="true">
             \%[ import \%] (?= \%{js:import-function-keyword-suffix} )
           </start>
@@ -130,9 +130,9 @@
             <!-- no embedded-lang-hooks here -->
             <context ref="js:comments"/>
           </include>
-        </context> <!-- /_import-function-keyword -->
+        </context> <!-- /_import-function-keywords -->
 
-        <context id="_new-target-object-keyword">
+        <context id="_new-target-object-keywords">
           <start extended="true">
             \%[ new \%] (?= \%{js:new-target-object-keyword-suffix} )
           </start>
@@ -150,7 +150,7 @@
             </context> <!-- /_new-target-object-keyword-content -->
 
           </include>
-        </context> <!-- /_new-target-object-keyword -->
+        </context> <!-- /_new-target-object-keywords -->
 
       </include>
     </context> <!-- /global-values -->
diff --git a/data/language-specs/typescript-js-values.lang b/data/language-specs/typescript-js-values.lang
index ea9b769f..1365356f 100644
--- a/data/language-specs/typescript-js-values.lang
+++ b/data/language-specs/typescript-js-values.lang
@@ -38,7 +38,7 @@
       <include>
 
         <!-- import.meta: stage 3 proposal -->
-        <context id="_import-meta-object-keyword">
+        <context id="_import-meta-object-keywords">
           <start extended="true">
             \%[ import \%] (?= \%{typescript:import-meta-object-keyword-suffix} )
           </start>
@@ -55,7 +55,7 @@
             </context> <!-- /_import-meta-object-keyword-content -->
 
           </include>
-        </context> <!-- /_import-meta-object-keyword -->
+        </context> <!-- /_import-meta-object-keywords -->
 
         <context ref="js-val:global-values" original="true"/>
       </include>