Parse multiline preprocessor comments

Author: inaki-amatria

grammar.js

@@ -75,6 +75,7 @@ module.exports = grammar({
     // preprocessor statements
     /\s|\\\r?\n/,
     $.comment,
+    $.multiline_preproc_comment,
     '&',
   ],
 
@@ -248,7 +249,8 @@ module.exports = grammar({
       ')',
     ),
 
-    preproc_comment: $ => choice(/\/\*.*\*\//, /\/\/.*/),
+    inline_preproc_comment: $ => /\/\/.*/,
+    multiline_preproc_comment: $ => /\/\*([^*]|\*+[^*/])*\*+\//,
 
     preproc_binary_expression: $ => {
       const table = [
@@ -2466,36 +2468,50 @@ function preprocIf(suffix, content, precedence = 0) {
     );
   }
 
+  /**
+    *
+    * @param {GrammarSymbols<string>} $
+    *
+    * @return {ChoiceRule}
+    *
+    */
+  function preprocComment($) {
+    return choice(
+      $.inline_preproc_comment,
+      $.multiline_preproc_comment,
+    );
+  }
+
   return {
     ['preproc_if' + suffix]: $ => prec(precedence, seq(
       preprocessor('if'),
       field('condition', $._preproc_expression),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       field('content', content($)),
       field('alternative', optional(alternativeBlock($))),
       preprocessor('endif'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
     )),
 
     ['preproc_ifdef' + suffix]: $ => prec(precedence, seq(
       choice(preprocessor('ifdef'), preprocessor('ifndef')),
       field('name', $.identifier),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       field('content', content($)),
       field('alternative', optional(alternativeBlock($))),
       preprocessor('endif'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
     )),
 
     ['preproc_else' + suffix]: $ => prec(precedence, seq(
       preprocessor('else'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       field('content', content($)),
     )),
 
     ['preproc_elif' + suffix]: $ => prec(precedence, seq(
       preprocessor('elif'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       field('condition', $._preproc_expression),
       field('content', content($)),
       field('alternative', optional(alternativeBlock($))),
@@ -2504,7 +2520,7 @@ function preprocIf(suffix, content, precedence = 0) {
     ['preproc_elifdef' + suffix]: $ => prec(precedence, seq(
       choice(preprocessor('elifdef'), preprocessor('elifndef')),
       field('name', $.identifier),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       field('content', content($)),
       field('alternative', optional(alternativeBlock($))),
     )),

test/corpus/preprocessor.txt

@@ -169,7 +169,7 @@ end subroutine foo4
         content: (preproc_def
           name: (identifier)
           value: (preproc_arg))))
-    (preproc_comment))
+    (multiline_preproc_comment))
   (preproc_ifdef
     name: (identifier)
     content: (subroutine
@@ -179,7 +179,7 @@ end subroutine foo4
       (end_subroutine_statement
         (name)
         (end_of_statement)))
-    (preproc_comment)))
+    (inline_preproc_comment)))
 
 ================================================================================
 Elifdefs
@@ -991,3 +991,56 @@ Preprocessor in specification part
     (end_subroutine_statement
       (name)
       (end_of_statement))))
+
+================================================================================
+Multiline preprocessor comments
+================================================================================
+
+/* Foo */
+#ifdef FOO
+#endif
+
+      PROGRAM MAIN
+        INTEGER /* FOO */ FOO
+        INTEGER BAR /* BAR */
+        INTEGER /* B
+                   A
+                   Z */ BAZ
+      END
+
+/* Foo
+// Bar
+Baz */
+#ifdef BAR
+#endif
+
+--------------------------------------------------------------------------------
+
+(translation_unit
+  (multiline_preproc_comment)
+  (preproc_ifdef
+    (identifier))
+  (program
+    (program_statement
+      (name)
+      (end_of_statement))
+    (variable_declaration
+      (intrinsic_type)
+      (multiline_preproc_comment)
+      (identifier))
+    (end_of_statement)
+    (variable_declaration
+      (intrinsic_type)
+      (identifier))
+    (multiline_preproc_comment)
+    (end_of_statement)
+    (variable_declaration
+      (intrinsic_type)
+      (multiline_preproc_comment)
+      (identifier))
+    (end_of_statement)
+    (end_program_statement
+      (end_of_statement)))
+  (multiline_preproc_comment)
+  (preproc_ifdef
+    (identifier)))