C++20 modules support

grammar.js

@@ -3,6 +3,7 @@
  * @author Max Brunsfeld <maxbrunsfeld@gmail.com>
  * @author Amaan Qureshi <amaanq12@gmail.com>
  * @author John Drouhard <john@drouhard.dev>
+ * @author Pablo Hugen <pabloashugen@protonmail.com>
  * @license MIT
  */
 
@@ -106,11 +107,15 @@ module.exports = grammar(C, {
       $.static_assert_declaration,
       $.template_declaration,
       $.template_instantiation,
+      $.module_declaration,
+      $.export_declaration,
+      $.import_declaration,
+      $.global_module_fragment_declaration,
+      $.private_module_fragment_declaration,
       alias($.constructor_or_destructor_definition, $.function_definition),
       alias($.operator_cast_definition, $.function_definition),
       alias($.operator_cast_declaration, $.declaration),
     ),
-
     _block_item: ($, original) => choice(
       ...original.members.filter((member) => member.content?.name != '_old_style_function_definition'),
       $.namespace_definition,
@@ -121,6 +126,11 @@ module.exports = grammar(C, {
       $.static_assert_declaration,
       $.template_declaration,
       $.template_instantiation,
+      $.module_declaration,
+      $.export_declaration,
+      $.import_declaration,
+      $.global_module_fragment_declaration,
+      $.private_module_fragment_declaration,
       alias($.constructor_or_destructor_definition, $.function_definition),
       alias($.operator_cast_definition, $.function_definition),
       alias($.operator_cast_declaration, $.declaration),
@@ -319,6 +329,62 @@ module.exports = grammar(C, {
 
     // Declarations
 
+    module_name: $ => seq(
+      $.identifier,
+      repeat(seq('.', $.identifier)
+      ),
+    ),
+    module_partition: $ => seq(
+      ':',
+      $.module_name,
+    ),
+    _exportable_item: $ => choice(
+      $.declaration,
+      $.function_definition,
+      $.template_declaration,
+      $.template_instantiation,
+      $.namespace_definition,
+      $.linkage_specification,
+      $.attributed_statement,
+      ';',
+      $.gnu_asm_expression,
+      $.using_declaration,
+      $.namespace_alias_definition,
+      $.static_assert_declaration,
+      $.alias_declaration,
+      seq($._type_specifier, ';'),
+    ),
+
+    module_declaration: $ => seq(
+      optional('export'),
+      'module',
+      field('name', $.module_name),
+      field('partition', optional($.module_partition)),
+      optional($.attribute_declaration),
+      ';'
+    ),
+    export_declaration: $ => seq(
+      'export',
+      choice($._exportable_item, seq('{', repeat($._exportable_item), '}'))
+    ),
+    import_declaration: $ => seq(
+      optional('export'),
+      'import',
+      choice(
+        field("name", $.module_name),
+        field("partition", $.module_partition),
+        field('header', choice(
+          $.string_literal,
+          $.system_lib_string,
+        )),
+      ),
+      optional($.attribute_declaration),
+      ';',
+    ),
+    global_module_fragment_declaration: _ => seq('module', ';'),
+    private_module_fragment_declaration: _ => seq('module', ':', 'private', ';'),
+
+
     template_declaration: $ => seq(
       'template',
       field('parameters', $.template_parameter_list),

queries/highlights.scm

@@ -32,6 +32,19 @@
 (this) @variable.builtin
 (null "nullptr" @constant)
 
+((identifier) @constant
+  (#set! "priority"129)
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+
+((field_identifier) @constant
+  (#set! "priority" 129)
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+
+
+; Modules
+(module_name
+  (identifier) @module)
+
 ; Keywords
 
 [
@@ -62,6 +75,9 @@
  "using"
  "concept"
  "requires"
+ "import"
+ "export"
+ "module"
  (virtual)
 ] @keyword