Merge pull request #145 from fwcd/object-fun-literals

Handle object and function literals in grammar
fwcd · Jan 15, 2024 · 8815dfe · 8815dfe
2 parents c07a2b0 + bb71d91
commit 8815dfe
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/syntaxes/kotlin.tmLanguage.json b/syntaxes/kotlin.tmLanguage.json
@@ -78,13 +78,13 @@
                     "include": "#class-declaration"
                 },
                 {
-                    "include": "#object-declaration"
+                    "include": "#object"
                 },
                 {
                     "include": "#type-alias"
                 },
                 {
-                    "include": "#function-declaration"
+                    "include": "#function"
                 },
                 {
                     "include": "#variable-declaration"
@@ -320,8 +320,8 @@
                 }
             }
         },
-        "object-declaration": {
-            "match": "\\b(object)\\s+(\\b\\w+\\b|`[^`]+`)",
+        "object": {
+            "match": "\\b(object)(?:\\s+(\\b\\w+\\b|`[^`]+`))?",
             "captures": {
                 "1": {
                     "name": "storage.type.object.kotlin"
@@ -349,8 +349,8 @@
                 }
             }
         },
-        "function-declaration": {
-            "match": "\\b(fun)\\b\\s*(?<GROUP><([^<>]|\\g<GROUP>)+>)?\\s*(?:(\\w+)\\.)?(\\b\\w+\\b|`[^`]+`)",
+        "function": {
+            "match": "\\b(fun)\\b\\s*(?<GROUP><([^<>]|\\g<GROUP>)+>)?\\s*(?:(?:(\\w+)\\.)?(\\b\\w+\\b|`[^`]+`))?",
             "captures": {
                 "1": {
                     "name": "storage.type.function.kotlin"