Support else, elseif, and enum (#1)

.gitignore

@@ -1 +1,3 @@
 node_modules
+*.swp
+build

README.md

@@ -0,0 +1,18 @@
+# PowerShell support for tree-sitter
+
+## Initial goal
+
+Parse the [big test file from EditorSyntax](https://github.com/PowerShell/EditorSyntax/blob/master/examples/TheBigTestFile.ps1) completely.
+
+## End goal
+
+90%+ compatibility with the PowerShell parser today.
+
+## Getting started
+
+1. `npm install`
+1. `npm start file.ps1`
+
+If you want to just generate the parser, run `npm run generate`.
+
+If you want to just parse a script, run `npm run parse file.ps1`

file.ps1

@@ -13,11 +13,22 @@ $sb = {
 
 if ($y)
 {
-    Write-Host "Hello" -Verbose
+    Write-Host "If" -Verbose
+} elseif($foo) {
+
+} else {
+    Write-Host "Else" -Verbose
 }
 
 # A comment
 $d = @{
     $y = 111; duck = "Hello "
     '7 nice things' = 1,@{}
 }
+
+${            } = "asdf"
+
+enum EnumName {
+    Foo;
+    Bar
+}

grammar.js

@@ -126,16 +126,18 @@ module.exports = grammar({
     enum_definition: $ => seq(
       /enum/i,
       repeat($._newline),
-      /[a-z_][a-z0-9_]+/,
+      /[a-zA-Z_][a-zA-Z0-9_]+/,
       repeat($._newline),
       '{',
+      repeat($._newline),
+      $.bareword_string,
       repeat(
         seq(
-          repeat($._newline),
-          $.bareword_string
+          $._terminator,
+          $.bareword_string,
         )
       ),
-      repeat($._newline),
+      optional($._terminator),
       '}'
     ),
 
@@ -181,40 +183,40 @@ module.exports = grammar({
         ),
       ),
       '}',
+      repeat($.elseif_statement),
+      optional($.else_statement)
+    ),
+
+    elseif_statement: $ => seq(
+      /elseif/i,
+      repeat($._newline),
+      '(',
+      repeat($._newline),
+      $.pipeline_statement,
+      repeat($._newline),
+      ')',
+      repeat($._newline),
+      '{',
       repeat(
         seq(
-          /elseif/i,
-          repeat($._newline),
-          '(',
-          repeat($._newline),
-          $.pipeline_statement,
-          repeat($._newline),
-          ')',
-          repeat($._newline),
-          '{',
-          repeat(
-            seq(
-              $._statement,
-              $._terminator
-            ),
-          ),
-          '}'
-        )
+          $._statement,
+          $._terminator
+        ),
       ),
-      optional(
+      '}'
+    ),
+
+    else_statement: $ => seq(
+      /else/i,
+      repeat($._newline),
+      '{',
+      repeat(
         seq(
-          /else/i,
-          repeat($._newline),
-          '{',
-          repeat(
-            seq(
-              $._statement,
-              $._terminator
-            ),
-          ),
-          '}'
-        )
-      )
+          $._statement,
+          $._terminator
+        ),
+      ),
+      '}'
     ),
 
     while_statement: $ => seq(

package.json

@@ -4,7 +4,11 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "generate": "tree-sitter generate",
+    "test": "tree-sitter test",
+    "parse": "tree-sitter parse",
+    "parse-debug": "tree-sitter parse -d",
+    "start": "npm run generate && npm run parse"
   },
   "author": "",
   "license": "ISC",