C++20 modules support

grammar.js

@@ -3,6 +3,7 @@
  * @author Max Brunsfeld <[email protected]>
  * @author Amaan Qureshi <[email protected]>
  * @author John Drouhard <[email protected]>
+ * @author Pablo Hugen <[email protected]>
  * @license MIT
  */
 
@@ -116,11 +117,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,
@@ -319,6 +324,49 @@ module.exports = grammar(C, {
 
     // Declarations
 
+    module_name: $ => seq(
+      $.identifier,
+      repeat(seq('.', $.identifier),
+      ),
+    ),
+
+    module_partition: $ => seq(
+      ':',
+      $.module_name,
+    ),
+
+    module_declaration: $ => seq(
+      optional('export'),
+      'module',
+      field('name', $.module_name),
+      field('partition', optional($.module_partition)),
+      optional($.attribute_declaration),
+      ';',
+    ),
+
+    export_declaration: $ => seq(
+      'export',
+      choice($._block_item, seq('{', repeat($._block_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,10 @@
 (this) @variable.builtin
 (null "nullptr" @constant)
 
+; Modules
+(module_name
+  (identifier) @module)
+
 ; Keywords
 
 [
@@ -63,6 +67,9 @@
  "concept"
  "requires"
  "virtual"
+ "import"
+ "export"
+ "module"
 ] @keyword
 
 ; Strings