prettier formatting on examples

toba · Jan 26, 2019 · 17cf548 · 17cf548
1 parent 933a5fc
commit 17cf548
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ node_modules
 .vscode-test
 /dist
 /test/**/*.d.ts
-/test/**/*.js
+/test/**/*.js
+/src/**/*.js
diff --git a/syntaxes/firerules.json b/syntaxes/firerules.json
@@ -2,10 +2,7 @@
    "//": "https://manual.macromates.com/en/language_grammars",
    "comment": "Firestore Rules Syntax: version 1.1",
    "scopeName": "source.firerules",
-   "fileTypes": [
-      "rule",
-      "rules"
-   ],
+   "fileTypes": ["rule", "rules"],
    "firstLineMatch": "^service\\scloud\\.firestore\\s{",
    "foldingStartMarker": "^\\{\\s*$",
    "foldingStopMarker": "^\\s*\\}",
@@ -14,24 +11,29 @@
       {
          "match": "\\b(\\d+)\\b",
          "name": "constant.numeric"
-      }, {
+      },
+      {
          "match": "\\/\\/.*",
          "name": "comment"
-      }, {
+      },
+      {
          "comment": "Basic types",
          "match": "\\b(request|math|user|duration|string|int|cloud)\\b",
          "name": "support.type"
-      }, {
+      },
+      {
          "comment": "Strings",
          "match": "[\\\"\\'].*?[\\\"\\']",
          "name": "string.quoted"
-      }, {
+      },
+      {
          "comment": "Function name",
          "match": "[\\.\\s\\(]([a-zA-Z]+)(?=\\()",
          "captures": {
             "1": { "name": "support.function" }
          }
-      }, {
+      },
+      {
          "comment": "Function parameters",
          "begin": "\\(",
          "end": "\\)",
@@ -45,45 +47,53 @@
                "name": "string.quoted"
             }
          ]
-      }, {
+      },
+      {
          "comment": "Path match literal",
          "match": "\\/([a-zA-Z0-9_]+)(?=[\\s\\/])",
          "captures": {
             "1": { "name": "string.unquoted" }
          }
-      }, {
+      },
+      {
          "comment": "Path match variable",
          "match": "\\/({[^}]+})(?=[\\s\\/])",
          "captures": {
             "1": { "name": "variable.parameter" }
          }
-      }, {
+      },
+      {
          "comment": "Global functions without parentheses",
          "match": "^\\s*(service|match|allow)(?=\\s)",
          "captures": {
             "1": { "name": "support.function" }
          }
-      }, {
+      },
+      {
          "match": "\\b(if|return|is)\\b",
          "name": "keyword.control"
-      }, {
+      },
+      {
          "comment": "Access control",
          "match": "\\s(get|list|read|create|update|delete|write)[,:;]",
          "captures": {
             "1": { "name": "storage.modifier" }
          }
-      }, {
+      },
+      {
          "match": "(=|!|>|<|\\||&)",
          "name": "keyword.operator"
-      }, {
+      },
+      {
          "match": "\\b(true|false|null|in|function)\\b",
          "name": "constant.language"
-      }, {
+      },
+      {
          "comment": "Type member",
          "match": "\\.([a-zA-Z0-9_]+)",
          "captures": {
             "1": { "name": "variable.parameter" }
          }
       }
    ]
- }
+}
diff --git a/syntaxes/index.schema.json b/syntaxes/index.schema.json
@@ -13,10 +13,7 @@
                   "description": "The collection group ID to which this index applies."
                },
                "queryScope": {
-                  "enum": [
-                     "COLLECTION",
-                     "COLLECTION_GROUP"
-                  ],
+                  "enum": ["COLLECTION", "COLLECTION_GROUP"],
                   "description": "The query scope to which this index applies."
                },
                "fields": {
@@ -26,20 +23,15 @@
                      "properties": {
                         "fieldPath": {
                            "type": "string",
-                           "pattern": "^[a-zA-Z0-9_\/\.]+$",
+                           "pattern": "^[a-zA-Z0-9_/.]+$",
                            "description": "The path of the field. Special field paths __name__, __type__, and __scatter__ may be used."
                         },
                         "order": {
-                           "enum": [
-                              "ASCENDING",
-                              "DESCENDING"
-                           ],
+                           "enum": ["ASCENDING", "DESCENDING"],
                            "description": "The order determines how a field is indexed."
                         },
                         "arrayConfig": {
-                           "enum": [
-                              "CONTAINS"
-                           ],
+                           "enum": ["CONTAINS"],
                            "description": "The arrayConfig determines how an array field is indexed."
                         }
                      },
@@ -65,7 +57,7 @@
                },
                "fieldPath": {
                   "type": "string",
-                  "pattern": "^[a-zA-Z0-9_\/\.]+$",
+                  "pattern": "^[a-zA-Z0-9_/.]+$",
                   "description": "The field path to which this field override applies."
                },
                "indexes": {
@@ -74,23 +66,15 @@
                      "type": "object",
                      "properties": {
                         "queryScope": {
-                           "enum": [
-                              "COLLECTION",
-                              "COLLECTION_GROUP"
-                           ],
+                           "enum": ["COLLECTION", "COLLECTION_GROUP"],
                            "description": "The query scope to which this index applies."
                         },
                         "order": {
-                           "enum": [
-                              "ASCENDING",
-                              "DESCENDING"
-                           ],
+                           "enum": ["ASCENDING", "DESCENDING"],
                            "description": "The order determines how a field is indexed."
                         },
                         "arrayConfig": {
-                           "enum": [
-                              "CONTAINS"
-                           ],
+                           "enum": ["CONTAINS"],
                            "description": "The arrayConfig determines how an array field is indexed."
                         }
                      },

diff --git a/syntaxes/sample.indexes.json b/syntaxes/sample.indexes.json
@@ -1,4 +1,4 @@
-  {
+{
    "indexes": [
       {
          "collectionGroup": "widgets",
@@ -13,9 +13,7 @@
       {
          "collectionGroup": "widgets",
          "fieldPath": "baz",
-         "indexes": [
-            { "order": "ASCENDING", "queryScope": "COLLECTION" }
-         ]
+         "indexes": [{ "order": "ASCENDING", "queryScope": "COLLECTION" }]
       }
    ]
-}
+}