fix: syntax for custom themes (#260)

openfga · Jun 21, 2024 · 5ac2182 · 5ac2182
1 parent a3c1727
commit 5ac2182
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/syntaxes/openfga.tmLanguage.json b/syntaxes/openfga.tmLanguage.json
@@ -30,15 +30,15 @@
           "name": "keyword.condition.openfga"
         },
         "2": {
-          "name": "entity.name.function.condition.openfga"
+          "name": "support.class.entity.name.function.condition.openfga"
         },
         "3": {
           "patterns": [
             {
               "match": "([_a-zA-Z][_a-zA-Z0-9]+)\\:\\s*([_a-zA-Z][_a-zA-Z0-9]+),?",
               "captures": {
                 "1": {
-                  "name": "variable.parameter.name.condition.openfga"
+                  "name": "entity.name.function.variable.parameter.name.condition.openfga"
                 },
                 "2": {
                   "name": "variable.parameter.type.condition.openfga"
@@ -88,15 +88,15 @@
           "match": "\\bself\\b"
         },
         {
-          "name": "keyword.operator.word.intersection.openfga",
+          "name": "keyword.intersection.openfga",
           "match": "\\band\\b"
         },
         {
-          "name": "keyword.operator.word.union.openfga",
+          "name": "keyword.union.openfga",
           "match": "\\bor\\b"
         },
         {
-          "name": "keyword.operator.word.exclusion.openfga",
+          "name": "keyword.exclusion.openfga",
           "match": "\\bbut\\snot\\b"
         }
       ]
@@ -143,10 +143,10 @@
               "name": "variable.parameter.type-restrictions.openfga"
             },
             "3": {
-              "name": "keyword.operator.word.with.openfga"
+              "name": "keyword.with.openfga"
             },
             "4": {
-              "name": "variable.parameter.type-restrictions.openfga"
+              "name": "support.class.type.reference.value.openfga"
             }
           }
         }
@@ -207,7 +207,7 @@
     "types": {
       "patterns": [
         {
-          "name": "computed.relation.value.openfga",
+          "name": "variable.parameter.computed.relation.value.openfga",
           "match": "\\b([a-zA-Z0-9-_]+)\\b"
         }
       ]

diff --git a/themes/openfga-dark.json b/themes/openfga-dark.json
@@ -24,16 +24,17 @@
         "keyword.as.openfga",
         "keyword.define.openfga",
         "keyword.from.openfga",
+        "keyword.with.openfga",
         "keyword.model.openfga",
         "keyword.module.openfga",
         "keyword.extend.openfga",
         "keyword.relations.openfga",
         "keyword.schema.openfga",
         "keyword.self.openfga",
         "keyword.type.openfga",
-        "keyword.operator.word.intersection.openfga",
-        "keyword.operator.word.exclusion.openfga",
-        "keyword.operator.word.union.openfga",
+        "keyword.intersection.openfga",
+        "keyword.exclusion.openfga",
+        "keyword.union.openfga",
         "keyword.condition.openfga",
       ],
       "settings": {
@@ -43,7 +44,7 @@
     {
       "name": "Definition",
       "scope": [
-        "computed.relation.value.openfga"
+        "variable.parameter.computed.relation.value.openfga"
       ],
       "settings": {
         "foreground": "#FFFFFF",
@@ -65,6 +66,7 @@
     {
       "name": "Type Restrictions",
       "scope": [
+        "support.class.type.reference.value.openfga",
         "variable.parameter.type-restrictions.openfga",
         "relation.type-restrictions.value.openfga",
         "type.type-restrictions.value.openfga",
@@ -80,14 +82,14 @@
     },
     {
       "name": "Type",
-      "scope": ["support.class.module.name.value.openfga", "support.class.type.name.value.openfga", "entity.name.function.condition.openfga"],
+      "scope": ["support.class.module.name.value.openfga", "support.class.type.name.value.openfga", "support.class.entity.name.function.condition.openfga"],
       "settings": {
         "foreground": "#79ED83"
       }
     },
     {
       "name": "Relation",
-      "scope": ["entity.name.function.member.relation.name.openfga", "variable.parameter.name.condition.openfga"],
+      "scope": ["entity.name.function.member.relation.name.openfga", "entity.name.function.variable.parameter.name.condition.openfga"],
       "settings": {
         "foreground": "#20F1F5"
       }