[gtksourceview: 1/13] javascript.lang, typescript.lang: Rename "false-clause" contexts



commit baef58a2b5b4ac4431433c0e9193244218d6ced9
Author: Jeffery To <jeffery to gmail com>
Date:   Thu Nov 28 23:58:53 2019 +0800

    javascript.lang, typescript.lang: Rename "false-clause" contexts
    
    This renames:
    
    * "_ternary-operator-without-comma-false-clause" to
      "_ternary-operator-without-comma-false-expression" in
      javascript-expressions.lang
    
    * "_conditional-type-operator-false-clause" to
      "_conditional-type-operator-false-type" in
      typescript-type-expressions.lang

 data/language-specs/javascript-expressions.lang      | 20 ++++++++++----------
 data/language-specs/typescript-type-expressions.lang | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/language-specs/javascript-expressions.lang b/data/language-specs/javascript-expressions.lang
index 5527741f..599ccbbc 100644
--- a/data/language-specs/javascript-expressions.lang
+++ b/data/language-specs/javascript-expressions.lang
@@ -480,7 +480,7 @@
 
     <!-- ## Without comma -->
 
-    <context id="_ternary-operator-without-comma-false-clause" once-only="true">
+    <context id="_ternary-operator-without-comma-false-expression" once-only="true">
       <start>:</start>
       <end>\%{js:before-next-token}</end>
       <include>
@@ -488,14 +488,14 @@
         <context ref="js:embedded-lang-hooks"/>
         <context ref="js:comments"/>
 
-        <context id="_ternary-operator-without-comma-false-clause-content">
+        <context id="_ternary-operator-without-comma-false-expression-content">
           <include>
             <context ref="expression-without-comma"/>
           </include>
-        </context> <!-- /_ternary-operator-without-comma-false-clause-content -->
+        </context> <!-- /_ternary-operator-without-comma-false-expression-content -->
 
       </include>
-    </context> <!-- /_ternary-operator-without-comma-false-clause -->
+    </context> <!-- /_ternary-operator-without-comma-false-expression -->
 
     <context id="_choice-ternary-operator-without-comma-true-expression" end-parent="true">
       <start>\%{js:before-next-token}</start>
@@ -507,7 +507,7 @@
         <context id="_ternary-operator-without-comma-true-expression-content">
           <include>
             <context ref="expression-without-comma"/>
-            <context ref="_ternary-operator-without-comma-false-clause"/>
+            <context ref="_ternary-operator-without-comma-false-expression"/>
           </include>
         </context> <!-- /_ternary-operator-without-comma-true-expression-content -->
 
@@ -534,7 +534,7 @@
 
     <!-- ## With comma -->
 
-    <context id="_ternary-operator-with-comma-false-clause" once-only="true">
+    <context id="_ternary-operator-with-comma-false-expression" once-only="true">
       <start>:</start>
       <end>\%{js:before-next-token}</end>
       <include>
@@ -542,14 +542,14 @@
         <context ref="js:embedded-lang-hooks"/>
         <context ref="js:comments"/>
 
-        <context id="_ternary-operator-with-comma-false-clause-content">
+        <context id="_ternary-operator-with-comma-false-expression-content">
           <include>
             <context ref="expression-with-comma"/>
           </include>
-        </context> <!-- /_ternary-operator-with-comma-false-clause-content -->
+        </context> <!-- /_ternary-operator-with-comma-false-expression-content -->
 
       </include>
-    </context> <!-- /_ternary-operator-with-comma-false-clause -->
+    </context> <!-- /_ternary-operator-with-comma-false-expression -->
 
     <context id="_choice-ternary-operator-with-comma-true-expression" end-parent="true">
       <start>\%{js:before-next-token}</start>
@@ -561,7 +561,7 @@
         <context id="_ternary-operator-with-comma-true-expression-content">
           <include>
             <context ref="expression-with-comma"/>
-            <context ref="_ternary-operator-with-comma-false-clause"/>
+            <context ref="_ternary-operator-with-comma-false-expression"/>
           </include>
         </context> <!-- /_ternary-operator-with-comma-true-expression-content -->
 
diff --git a/data/language-specs/typescript-type-expressions.lang 
b/data/language-specs/typescript-type-expressions.lang
index 0d901ff5..fc42ee35 100644
--- a/data/language-specs/typescript-type-expressions.lang
+++ b/data/language-specs/typescript-type-expressions.lang
@@ -330,21 +330,21 @@
       <end>\%{def:always-match}</end>
     </context> <!-- /_choice-conditional-type-operator-missing-true-type -->
 
-    <context id="_conditional-type-operator-false-clause" once-only="true">
+    <context id="_conditional-type-operator-false-type" once-only="true">
       <start>:</start>
       <end>\%{js:before-next-token}</end>
       <include>
         <context sub-pattern="0" where="start" style-ref="typescript:conditional-type-operator"/>
         <context ref="js:comments"/>
 
-        <context id="_conditional-type-operator-false-clause-content">
+        <context id="_conditional-type-operator-false-type-content">
           <include>
             <context ref="type-expression"/>
           </include>
-        </context> <!-- /_conditional-type-operator-false-clause-content -->
+        </context> <!-- /_conditional-type-operator-false-type-content -->
 
       </include>
-    </context> <!-- /_conditional-type-operator-false-clause -->
+    </context> <!-- /_conditional-type-operator-false-type -->
 
     <context id="_choice-conditional-type-operator-true-type" end-parent="true">
       <start>\%{js:before-next-token}</start>
@@ -355,7 +355,7 @@
         <context id="_conditional-type-operator-true-type-content">
           <include>
             <context ref="type-expression"/>
-            <context ref="_conditional-type-operator-false-clause"/>
+            <context ref="_conditional-type-operator-false-type"/>
           </include>
         </context> <!-- /_conditional-type-operator-true-type-content -->
 


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