add static_assert

c/generate.rb

@@ -22,7 +22,8 @@
         :default_statement,
         :case_statement,
         :switch_statement,
-        :switch_conditional_parentheses
+        :switch_conditional_parentheses,
+        :static_assert,
     ]
     for each in import_names
         c_grammar[each] = @cpp_grammar[each]

c/tags.txt

@@ -1,4 +1,5 @@
 colon.cpp.c
+comma.cpp.c
 comment.block.c
 comment.line.banner.cpp.c
 comment.line.double-slash.cpp.c
@@ -44,6 +45,7 @@ keyword.operator.logical.c
 keyword.operator.sizeof.c
 keyword.operator.ternary.c
 keyword.other.typedef.c
+keyword.static_assert.cpp.c
 meta.block.c
 meta.block.switch.c
 meta.body.switch.cpp.c
@@ -64,6 +66,7 @@ meta.preprocessor.include.c
 meta.preprocessor.macro.c
 meta.preprocessor.pragma.c
 meta.section.c
+meta.static_assert.message.cpp.c
 meta.tail.switch.cpp.c
 meta.toc-list.banner.block.c
 meta.toc-list.banner.line.c
@@ -79,8 +82,10 @@ punctuation.definition.string.begin.c
 punctuation.definition.string.end.c
 punctuation.range-based.cpp.c
 punctuation.section.arguments.begin.bracket.round.c
+punctuation.section.arguments.begin.bracket.round.cpp.c
 punctuation.section.arguments.begin.bracket.round.function.member.c
 punctuation.section.arguments.end.bracket.round.c
+punctuation.section.arguments.end.bracket.round.cpp.c
 punctuation.section.arguments.end.bracket.round.function.member.c
 punctuation.section.block.begin.bracket.curly.c
 punctuation.section.block.begin.bracket.curly.switch.cpp.c
@@ -97,6 +102,7 @@ punctuation.section.parens.end.bracket.round.initialization.c
 punctuation.separator.case.cpp.c
 punctuation.separator.case.default.cpp.c
 punctuation.separator.delimiter.c
+punctuation.separator.delimiter.cpp.c
 punctuation.separator.dot-access.c
 punctuation.separator.parameters.c
 punctuation.separator.pointer-access.c

cpp/generate.rb

@@ -98,6 +98,7 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
             :storage_specifiers,
             :access_control_keywords,
             :exception_keywords,
+            :static_assert,
             :other_keywords,
             :memory_operators,
             :the_this_keyword,
@@ -791,6 +792,36 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
         end_pattern: lookBehindFor(/\)/),
         includes: [ :parameter_struct, :function_context_c ]
         )
+    # static assert is special as it can be outside of normal places function calls can be
+    cpp_grammar[:static_assert] = Range.new(
+        start_pattern: newPattern(
+            match: /static_assert|_Static_assert/,
+            tag_as: "keyword.static_assert",
+        ).maybe(@spaces).then(
+            match: /\(/,
+            tag_as: "punctuation.section.arguments.begin.bracket.round",
+        ),
+        end_pattern: newPattern(
+            match: /\)/,
+            tag_as: "punctuation.section.arguments.end.bracket.round",
+        ),
+        includes: [
+            # special handling for the assert message
+            Range.new(
+                start_pattern: newPattern(
+                    match: /,/,
+                    tag_as: "comma punctuation.separator.delimiter",
+                ).maybe(@spaces).lookAheadFor(maybe(/L|u8|u|U/.maybe(@spaces).then(/\"/))),
+                end_pattern: lookAheadFor(/\)/),
+                tag_as: "meta.static_assert.message",
+                includes: [
+                    :string_context,
+                    :string_context_c,
+                ]
+            ),
+            :function_call_context_c,
+        ]
+    )
     # a full match example of function call would be: aNameSpace::subClass<TemplateArg>FunctionName<5>(
     cpp_grammar[:function_call] = Range.new(
         start_pattern: avoid_invalid_function_names.then(

cpp/tags.txt

@@ -94,6 +94,7 @@ keyword.other.unit.suffix.floating-point.cpp
 keyword.other.unit.suffix.integer.cpp
 keyword.other.unit.user-defined.cpp
 keyword.other.using.directive.cpp
+keyword.static_assert.cpp
 memory.cpp
 meta.block.class.cpp
 meta.block.cpp
@@ -142,6 +143,7 @@ meta.preprocessor.macro.cpp
 meta.preprocessor.pragma.cpp
 meta.scope-resolution.cpp
 meta.section.cpp
+meta.static_assert.message.cpp
 meta.tail.class.cpp
 meta.tail.enum.cpp
 meta.tail.extern.cpp

syntaxes/c.tmLanguage.yaml

@@ -1222,6 +1222,28 @@
         name: punctuation.section.parens.end.bracket.round.conditional.switch.cpp.c
     patterns:
     - include: "#conditional_context"
+  static_assert:
+    begin: "(static_assert|_Static_assert)\\s*(\\()"
+    beginCaptures:
+      '1':
+        name: keyword.static_assert.cpp.c
+      '2':
+        name: punctuation.section.arguments.begin.bracket.round.cpp.c
+    end: "(\\))"
+    endCaptures:
+      '1':
+        name: punctuation.section.arguments.end.bracket.round.cpp.c
+    patterns:
+    - name: meta.static_assert.message.cpp.c
+      begin: (,)\s*(?=(?:L|u8|u|U\s*\")?)
+      beginCaptures:
+        '1':
+          name: comma.cpp.c punctuation.separator.delimiter.cpp.c
+      end: "(?=\\))"
+      patterns:
+      - include: "#string_context"
+      - include: "#string_context_c"
+    - include: "#function_call_context_c"
   conditional_context:
     patterns:
     - include: "$base"

syntaxes/cpp.tmLanguage.yaml

@@ -16,6 +16,7 @@
 - include: "#storage_specifiers"
 - include: "#access_control_keywords"
 - include: "#exception_keywords"
+- include: "#static_assert"
 - include: "#other_keywords"
 - include: "#memory_operators"
 - include: "#the_this_keyword"
@@ -564,6 +565,28 @@
     patterns:
     - include: "#parameter_struct"
     - include: "#function_context_c"
+  static_assert:
+    begin: "(static_assert|_Static_assert)\\s*(\\()"
+    beginCaptures:
+      '1':
+        name: keyword.static_assert.cpp
+      '2':
+        name: punctuation.section.arguments.begin.bracket.round.cpp
+    end: "(\\))"
+    endCaptures:
+      '1':
+        name: punctuation.section.arguments.end.bracket.round.cpp
+    patterns:
+    - name: meta.static_assert.message.cpp
+      begin: (,)\s*(?=(?:L|u8|u|U\s*\")?)
+      beginCaptures:
+        '1':
+          name: comma.cpp punctuation.separator.delimiter.cpp
+      end: "(?=\\))"
+      patterns:
+      - include: "#string_context"
+      - include: "#string_context_c"
+    - include: "#function_call_context_c"
   function_call:
     begin: "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*\\s*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)\\s*(?:(<(?:[\\s<>:,\\w])*>\\s*))?(\\()"
     beginCaptures: