updated grammars

Author: Prince781

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.4
+- Updated grammars
+
 ## 1.0.3
 - Add option to start server in debug mode
 - Add option for server to fail on critical messages

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vala",
   "displayName": "Vala",
   "description": "Syntax highlighting and language support for the Vala / Genie languages",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publisher": "prince781",
   "author": {
     "name": "Princeton Ferro",

package.json

@@ -83,7 +83,7 @@ repository:
       - name: keyword.vala
         match: '(?<=^|[^@\w\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\b'
       - name: keyword.vala
-        match: '(#if|#else|#endif)'
+        match: '(#if|#elif|#else|#endif)'
 
   types:
     patterns:

syntaxes/genie.YAML-tmLanguage

@@ -243,7 +243,7 @@
             <key>name</key>
             <string>keyword.vala</string>
             <key>match</key>
-            <string>(#if|#else|#endif)</string>
+            <string>(#if|#elif|#else|#endif)</string>
           </dict>
         </array>
       </dict>
@@ -291,4 +291,4 @@
       </dict>
     </dict>
   </dict>
-</plist>
+</plist>

syntaxes/genie.tmLanguage

@@ -81,16 +81,16 @@ repository:
   keywords:
     patterns:
       - name: keyword.vala
-        match: '(?<=^|[^@\w\.])(as|do|if|in|is|for|get|new|out|ref|set|try|var|base|case|else|enum|lock|null|this|true|void|weak|async|break|catch|class|const|false|owned|throw|using|while|yield|delete|extern|inline|params|public|return|sealed|signal|sizeof|static|struct|switch|throws|typeof|unlock|default|dynamic|ensures|finally|foreach|private|unowned|virtual|abstract|continue|delegate|internal|override|requires|volatile|construct|interface|namespace|protected|errordomain)\b'
+        match: '(?<=^|[^@\w\.])(as|do|if|in|is|not|or|and|for|get|new|out|ref|set|try|var|base|case|else|enum|lock|null|this|true|void|weak|async|break|catch|class|const|false|owned|throw|using|while|with|yield|delete|extern|inline|params|public|return|sealed|signal|sizeof|static|struct|switch|throws|typeof|unlock|default|dynamic|ensures|finally|foreach|private|unowned|virtual|abstract|continue|delegate|internal|override|requires|volatile|construct|interface|namespace|protected|errordomain)\b'
       - name: keyword.vala
-        match: '(?<=^|[^@\w\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\b'
+        match: '(?<=^|[^@\w\.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\b'
       - name: keyword.vala
-        match: '(#if|#else|#endif)'
+        match: '(#if|#elif|#else|#endif)'
 
   types:
     patterns:
     - name: storage.type.primitive.vala
-      match: '(?<=^|[^@\w\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\b'
+      match: '(?<=^|[^@\w\.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\b'
     - name: entity.name.type.vala
       match: '\b([A-Z]+\w*)\b'
 

syntaxes/vala.YAML-tmLanguage

@@ -233,19 +233,19 @@
             <key>name</key>
             <string>keyword.vala</string>
             <key>match</key>
-            <string>(?&lt;=^|[^@\w\.])(as|do|if|in|is|for|get|new|out|ref|set|try|var|base|case|else|enum|lock|null|this|true|void|weak|async|break|catch|class|const|false|owned|throw|using|while|yield|delete|extern|inline|params|public|return|sealed|signal|sizeof|static|struct|switch|throws|typeof|unlock|default|dynamic|ensures|finally|foreach|private|unowned|virtual|abstract|continue|delegate|internal|override|requires|volatile|construct|interface|namespace|protected|errordomain)\b</string>
+            <string>(?&lt;=^|[^@\w\.])(as|do|if|in|is|not|or|and|for|get|new|out|ref|set|try|var|base|case|else|enum|lock|null|this|true|void|weak|async|break|catch|class|const|false|owned|throw|using|while|with|yield|delete|extern|inline|params|public|return|sealed|signal|sizeof|static|struct|switch|throws|typeof|unlock|default|dynamic|ensures|finally|foreach|private|unowned|virtual|abstract|continue|delegate|internal|override|requires|volatile|construct|interface|namespace|protected|errordomain)\b</string>
           </dict>
           <dict>
             <key>name</key>
             <string>keyword.vala</string>
             <key>match</key>
-            <string>(?&lt;=^|[^@\w\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\b</string>
+            <string>(?&lt;=^|[^@\w\.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\b</string>
           </dict>
           <dict>
             <key>name</key>
             <string>keyword.vala</string>
             <key>match</key>
-            <string>(#if|#else|#endif)</string>
+            <string>(#if|#elif|#else|#endif)</string>
           </dict>
         </array>
       </dict>
@@ -257,7 +257,7 @@
             <key>name</key>
             <string>storage.type.primitive.vala</string>
             <key>match</key>
-            <string>(?&lt;=^|[^@\w\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\b</string>
+            <string>(?&lt;=^|[^@\w\.])(bool|double|float|unichar|unichar2|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|string16|string32|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64|va_list|time_t)\b</string>
           </dict>
           <dict>
             <key>name</key>
@@ -293,4 +293,4 @@
       </dict>
     </dict>
   </dict>
-</plist>
+</plist>