Add support for attributes (with no parameters) (#15)

* Add test for attribute syntax * Update grammar files * Add baseline for new test
JohnnyMorganz · Jun 22, 2024 · 5febad5 · 5febad5
1 parent d1a7398
commit 5febad5
Show file tree

Hide file tree

Showing 5 changed files with 388 additions and 0 deletions.
diff --git a/Luau.YAML-tmLanguage b/Luau.YAML-tmLanguage
@@ -33,6 +33,7 @@ patterns:
   - include: "#table"
   - include: "#type_cast"
   - include: "#type_annotation"
+  - include: "#attribute"
 
 repository:
   function-definition:
@@ -78,6 +79,7 @@ repository:
       "1": { name: storage.modifier.local.luau }
     patterns:
       - include: "#comment"
+      - include: "#attribute"
       - begin: "(:)"
         beginCaptures:
           "1": { name: keyword.operator.type.luau }
@@ -398,3 +400,12 @@ repository:
               "1": { name: variable.parameter.luau }
               "2": { name: keyword.operator.type.luau }
           - include: "#type_literal"
+
+  attribute:
+    patterns:
+      # TODO: support parameters for attributes as defined in the RFC
+      - name: meta.attribute.luau
+        match: "(@)({{identifier}})"
+        captures:
+          "1": { name: keyword.operator.attribute.luau }
+          "2": { name: storage.type.attribute.luau}
diff --git a/Luau.tmLanguage b/Luau.tmLanguage
@@ -86,6 +86,10 @@
         <key>include</key>
         <string>#type_annotation</string>
       </dict>
+      <dict>
+        <key>include</key>
+        <string>#attribute</string>
+      </dict>
     </array>
     <key>repository</key>
     <dict>
@@ -224,6 +228,10 @@
             <key>include</key>
             <string>#comment</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#attribute</string>
+          </dict>
           <dict>
             <key>begin</key>
             <string>(:)</string>
@@ -1138,6 +1146,31 @@
           </dict>
         </array>
       </dict>
+      <key>attribute</key>
+      <dict>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>name</key>
+            <string>meta.attribute.luau</string>
+            <key>match</key>
+            <string>(@)([a-zA-Z_][a-zA-Z0-9_]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.attribute.luau</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>storage.type.attribute.luau</string>
+              </dict>
+            </dict>
+          </dict>
+        </array>
+      </dict>
     </dict>
   </dict>
 </plist>
diff --git a/Luau.tmLanguage.json b/Luau.tmLanguage.json
@@ -60,6 +60,9 @@
     },
     {
       "include": "#type_annotation"
+    },
+    {
+      "include": "#attribute"
     }
   ],
   "repository": {
@@ -150,6 +153,9 @@
         {
           "include": "#comment"
         },
+        {
+          "include": "#attribute"
+        },
         {
           "begin": "(:)",
           "beginCaptures": {
@@ -749,6 +755,22 @@
           ]
         }
       ]
+    },
+    "attribute": {
+      "patterns": [
+        {
+          "name": "meta.attribute.luau",
+          "match": "(@)([a-zA-Z_][a-zA-Z0-9_]*)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.attribute.luau"
+            },
+            "2": {
+              "name": "storage.type.attribute.luau"
+            }
+          }
+        }
+      ]
     }
   }
 }