update syntax highlighting

.gitignore

@@ -1,2 +1,3 @@
 *.vsix
-node_modules
+node_modules
+out

.vscodeignore

@@ -2,4 +2,7 @@
 images
 examples
 node_modules
-*.vsix
+*.vsix
+out
+syntaxes/compare.ts
+syntaxes/sample.rules

CHANGELOG.md

@@ -1,2 +1,5 @@
+# 1.0.1
+- Add highlighting for additional syntax defined in the [Security Rules Reference](https://cloud.google.com/firestore/docs/reference/security/)
+
 # 1.0.0
 Initial release with basic syntax highlighting.

README.md

@@ -1,4 +1,10 @@
 # Firestore Rules
-Basic highlighting for new [Firestore security rules](https://cloud.google.com/firestore/docs/reference/security/) with plans for snippets and tips.
+Basic highlighting for new [Firestore security rules](https://cloud.google.com/firestore/docs/reference/security/). Priority for [additional language features](https://code.visualstudio.com/docs/extensionAPI/language-support), in decreasing order of likelihood that I'll get to it.
+
+- Completions (underway in a branch) then update syntax highlighting
+- Hovers
+- Snippets
+- Signature Helpers
+- Incremental Formatting
 
 ![Basic example](./screenshots/basic.png)

package.json

@@ -1,14 +1,17 @@
 {
     "name": "vsfire",
     "displayName": "Firebase",
-    "description": "Firestore Rules syntax highlight",
-    "version": "1.0.0",
+    "description": "Firestore Security Rules syntax highlighting",
+    "version": "1.0.1",
     "publisher": "toba",
     "keywords": ["firebase","firestore","rules"],
     "icon": "images/logo.png",
     "repository": {
         "type": "git",
-        "url": "https://github.com/toba/firestore-rules.git"
+        "url": "https://github.com/toba/vsfire.git"
+    },
+    "bugs": {
+      "url": "https://github.com/toba/vsfire/issues"
     },
     "engines": {
         "vscode": "^1.10.0"

syntaxes/compare.ts

@@ -0,0 +1,10 @@
+const o = {
+   field1: "string"
+}
+
+function something(p1:string, p2:number):void {
+   let x = 1 + Math.round(2);   
+   if (x == 3) { return; }
+   if (o.field1 == "x") { return; }
+   return;
+}

syntaxes/firerules.json

@@ -18,7 +18,7 @@
          "match": "\\/\\/.*",
          "name": "comment"
       }, {
-         "match": "\\b(service|match)\\b",
+         "match": "\\b(service|match|exists|get)\\b",
          "name": "support.function"
       }, {
          "match": "\\b(allow|if)\\b",
@@ -28,16 +28,49 @@
          "name": "storage.modifier"
       }, {
          "match": "(=|!|>|<|\\||&)",
-         "name": "keyword.control"
+         "name": "keyword.operator"
       }, {
-         "match": "\\b(true|false)\\b",
+         "match": "\\b(true|false|null)\\b",
          "name": "constant.language"
       }, {
          "comment": "Match variable",
          "match": "\\/({[^}]+})[\\s\\/]",
          "captures": {
             "1": { "name": "variable.parameter" }
          }
+      },{
+         "comment": "request time object",
+         "match": "\\b(request)\\.(time)\\.(date|year|month|day|time|hours|minutes|seconds|nanos|dayOfWeek|dayOfYear|toMillis)\\(",
+         "captures": {
+            "1": { "name": "support.type" },
+            "2": { "name": "support.variable" },
+            "3": { "name": "support.function.builtin" }
+         }
+      }, {
+         "comment": "request object",
+         "match": "\\b(request)\\.(auth|path|resource|time)\\b",
+         "captures": {
+            "1": { "name": "support.type" },
+            "2": { "name": "support.type" }
+         }
+      }, {
+         "comment": "math object",
+         "match": "\\b(math)\\.(ceil|floor|round|abs|isInfinite|isNaN)\\(",
+         "captures": {
+            "1": { "name": "support.type" },
+            "2": { "name": "support.function.builtin" }
+         }
+      }, {
+         "comment": "document object",
+         "match": "\\b(document)\\.(size|matches)\\(",
+         "captures": {
+            "1": { "name": "support.type" },
+            "2": { "name": "entity.name.function" }
+         }
+      }, {
+         "comment": "bare objects",
+         "match": "\\b(request|math|document|user|duration)\\b",
+         "name": "support.type"
       }
    ]
  }

syntaxes/sample.rules

@@ -0,0 +1,9 @@
+// Syntax defined in
+// https://cloud.google.com/firestore/docs/reference/security/
+service cloud.firestore {
+   match /databases/{database}/documents {
+      match /{document=**} {
+         allow read, write: if request.auth != null && math.floor(request.time.day()) == 2;
+      }
+   }
+}