Designate "else"/"else if" branches inside of if statements (#91)

* designate "else_clause" inside of if statements * upgrade tree-sitter-cli tree-sitter/tree-sitter-javascript#143 (review) * regenerate files for else_clause Co-authored-by: resolritter <resolritter@users.noreply.github.com>
tree-sitter · Nov 4, 2020 · cf47ff8 · cf47ff8
1 parent 40620bf
commit cf47ff8
Show file tree

Hide file tree

Showing 7 changed files with 63,599 additions and 63,080 deletions.
diff --git a/corpus/expressions.txt b/corpus/expressions.txt
@@ -340,20 +340,21 @@ let y = if x == 5 { 10 } else { 15 };
           left: (identifier)
           right: (integer_literal))
         consequence: (block)
-        alternative: (if_expression
-          condition: (binary_expression
-            left: (identifier)
-            right: (integer_literal))
-          consequence: (block)
-          alternative: (block)))))
+        alternative: (else_clause
+          (if_expression
+            condition: (binary_expression
+              left: (identifier)
+              right: (integer_literal))
+            consequence: (block)
+            alternative: (else_clause (block)))))))
   (let_declaration
     pattern: (identifier)
     value: (if_expression
       condition: (binary_expression
         left: (identifier)
         right: (integer_literal))
       consequence: (block (integer_literal))
-      alternative: (block (integer_literal)))))
+      alternative: (else_clause (block (integer_literal))))))
 
 ============================================
 If let expressions

diff --git a/grammar.js b/grammar.js
@@ -1065,7 +1065,7 @@ module.exports = grammar({
       'if',
       field('condition', $._expression),
       field('consequence', $.block),
-      optional($._else_tail)
+      optional(field("alternative", $.else_clause))
     ),
 
     if_let_expression: $ => seq(
@@ -1075,16 +1075,16 @@ module.exports = grammar({
       '=',
       field('value', $._expression),
       field('consequence', $.block),
-      optional($._else_tail)
+      optional(field('alternative', $.else_clause))
     ),
 
-    _else_tail: $ => seq(
+    else_clause: $ => seq(
       'else',
-      field('alternative', choice(
+      choice(
         $.block,
         $.if_expression,
         $.if_let_expression
-      ))
+      )
     ),
 
     match_expression: $ => seq(

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "nan": "^2.8.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.16.7"
+    "tree-sitter-cli": "^0.17.3"
   },
   "scripts": {
     "test": "tree-sitter test && script/parse-examples",

diff --git a/src/grammar.json b/src/grammar.json
@@ -6185,8 +6185,12 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_else_tail"
+              "type": "FIELD",
+              "name": "alternative",
+              "content": {
+                "type": "SYMBOL",
+                "name": "else_clause"
+              }
             },
             {
               "type": "BLANK"
@@ -6238,8 +6242,12 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_else_tail"
+              "type": "FIELD",
+              "name": "alternative",
+              "content": {
+                "type": "SYMBOL",
+                "name": "else_clause"
+              }
             },
             {
               "type": "BLANK"
@@ -6248,33 +6256,29 @@
         }
       ]
     },
-    "_else_tail": {
+    "else_clause": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
           "value": "else"
         },
         {
-          "type": "FIELD",
-          "name": "alternative",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "block"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "if_expression"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "if_let_expression"
-              }
-            ]
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "block"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "if_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "if_let_expression"
+            }
+          ]
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -1175,6 +1175,29 @@
       }
     }
   },
+  {
+    "type": "else_clause",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "block",
+          "named": true
+        },
+        {
+          "type": "if_expression",
+          "named": true
+        },
+        {
+          "type": "if_let_expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "empty_statement",
     "named": true,
@@ -1987,15 +2010,7 @@
         "required": false,
         "types": [
           {
-            "type": "block",
-            "named": true
-          },
-          {
-            "type": "if_expression",
-            "named": true
-          },
-          {
-            "type": "if_let_expression",
+            "type": "else_clause",
             "named": true
           }
         ]
@@ -2031,15 +2046,7 @@
         "required": false,
         "types": [
           {
-            "type": "block",
-            "named": true
-          },
-          {
-            "type": "if_expression",
-            "named": true
-          },
-          {
-            "type": "if_let_expression",
+            "type": "else_clause",
             "named": true
           }
         ]