diff --git a/grammar.js b/grammar.js
index a22f3d7..d63d58e 100644
--- a/grammar.js
+++ b/grammar.js
@@ -11,8 +11,7 @@ module.exports = grammar({
 
   extras: ($) => [
     /\s+/,
-    $.line_comment,
-    $.block_comment,
+    $.comment,
   ],
 
   rules: {
@@ -23,9 +22,10 @@ module.exports = grammar({
       $.module,
     ),
 
-    line_comment: (_) => seq("//", /[^\n]*/),
-
-    block_comment: (_) => seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, '/'),
+    comment: (_) => choice(
+      seq("//", /[^\n]*/),
+      seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, '/'),
+    ),
 
     // Definitions {{{
 
diff --git a/queries/highlights.scm b/queries/highlights.scm
index 17c5692..e548e18 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -1,7 +1,4 @@
-[
- (line_comment)
- (block_comment)
-] @comment
+(comment) @comment
 
 ; Operators {{{
 (operator) @operator
diff --git a/src/grammar.json b/src/grammar.json
index 84c6bce..3dc19bc 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -21,33 +21,38 @@
         }
       ]
     },
-    "line_comment": {
-      "type": "SEQ",
+    "comment": {
+      "type": "CHOICE",
       "members": [
         {
-          "type": "STRING",
-          "value": "//"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "//"
+            },
+            {
+              "type": "PATTERN",
+              "value": "[^\\n]*"
+            }
+          ]
         },
         {
-          "type": "PATTERN",
-          "value": "[^\\n]*"
-        }
-      ]
-    },
-    "block_comment": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "/*"
-        },
-        {
-          "type": "PATTERN",
-          "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
-        },
-        {
-          "type": "STRING",
-          "value": "/"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "/*"
+            },
+            {
+              "type": "PATTERN",
+              "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
+            },
+            {
+              "type": "STRING",
+              "value": "/"
+            }
+          ]
         }
       ]
     },
@@ -956,11 +961,7 @@
     },
     {
       "type": "SYMBOL",
-      "name": "line_comment"
-    },
-    {
-      "type": "SYMBOL",
-      "name": "block_comment"
+      "name": "comment"
     }
   ],
   "conflicts": [],
diff --git a/src/node-types.json b/src/node-types.json
index 0a7db28..1db28a2 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -168,12 +168,12 @@
     }
   },
   {
-    "type": "block_comment",
+    "type": "boolean_literal",
     "named": true,
     "fields": {}
   },
   {
-    "type": "boolean_literal",
+    "type": "comment",
     "named": true,
     "fields": {}
   },
@@ -259,11 +259,6 @@
       ]
     }
   },
-  {
-    "type": "line_comment",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "list_expression",
     "named": true,
diff --git a/src/parser.c b/src/parser.c
index 5171d84..63ff83c 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -8,7 +8,7 @@
 #define LANGUAGE_VERSION 14
 #define STATE_COUNT 123
 #define LARGE_STATE_COUNT 2
-#define SYMBOL_COUNT 65
+#define SYMBOL_COUNT 64
 #define ALIAS_COUNT 0
 #define TOKEN_COUNT 34
 #define EXTERNAL_TOKEN_COUNT 0
@@ -18,9 +18,9 @@
 
 enum ts_symbol_identifiers {
   anon_sym_SLASH_SLASH = 1,
-  aux_sym_line_comment_token1 = 2,
+  aux_sym_comment_token1 = 2,
   anon_sym_SLASH_STAR = 3,
-  aux_sym_block_comment_token1 = 4,
+  aux_sym_comment_token2 = 4,
   anon_sym_SLASH = 5,
   anon_sym_EQ = 6,
   anon_sym_PLUS_EQ = 7,
@@ -52,43 +52,42 @@ enum ts_symbol_identifiers {
   anon_sym_PLUS = 33,
   sym_source_file = 34,
   sym__definition = 35,
-  sym_line_comment = 36,
-  sym_block_comment = 37,
-  sym_assignment = 38,
-  sym_module = 39,
-  sym__old_module = 40,
-  sym__new_module = 41,
-  sym__expr = 42,
-  sym_boolean_literal = 43,
-  sym_integer_literal = 44,
-  sym__string_literal = 45,
-  sym_interpreted_string_literal = 46,
-  sym_select_expression = 47,
-  sym_select_value = 48,
-  sym_soong_config_variable = 49,
-  sym_select_cases = 50,
-  sym_select_case = 51,
-  sym_default_case = 52,
-  sym__case_value = 53,
-  sym_list_expression = 54,
-  sym_map_expression = 55,
-  sym_binary_expression = 56,
-  sym__colon_property = 57,
-  sym__equal_property = 58,
-  aux_sym_source_file_repeat1 = 59,
-  aux_sym__old_module_repeat1 = 60,
-  aux_sym__new_module_repeat1 = 61,
-  aux_sym_interpreted_string_literal_repeat1 = 62,
-  aux_sym_select_cases_repeat1 = 63,
-  aux_sym_list_expression_repeat1 = 64,
+  sym_comment = 36,
+  sym_assignment = 37,
+  sym_module = 38,
+  sym__old_module = 39,
+  sym__new_module = 40,
+  sym__expr = 41,
+  sym_boolean_literal = 42,
+  sym_integer_literal = 43,
+  sym__string_literal = 44,
+  sym_interpreted_string_literal = 45,
+  sym_select_expression = 46,
+  sym_select_value = 47,
+  sym_soong_config_variable = 48,
+  sym_select_cases = 49,
+  sym_select_case = 50,
+  sym_default_case = 51,
+  sym__case_value = 52,
+  sym_list_expression = 53,
+  sym_map_expression = 54,
+  sym_binary_expression = 55,
+  sym__colon_property = 56,
+  sym__equal_property = 57,
+  aux_sym_source_file_repeat1 = 58,
+  aux_sym__old_module_repeat1 = 59,
+  aux_sym__new_module_repeat1 = 60,
+  aux_sym_interpreted_string_literal_repeat1 = 61,
+  aux_sym_select_cases_repeat1 = 62,
+  aux_sym_list_expression_repeat1 = 63,
 };
 
 static const char * const ts_symbol_names[] = {
   [ts_builtin_sym_end] = "end",
   [anon_sym_SLASH_SLASH] = "//",
-  [aux_sym_line_comment_token1] = "line_comment_token1",
+  [aux_sym_comment_token1] = "comment_token1",
   [anon_sym_SLASH_STAR] = "/*",
-  [aux_sym_block_comment_token1] = "block_comment_token1",
+  [aux_sym_comment_token2] = "comment_token2",
   [anon_sym_SLASH] = "/",
   [anon_sym_EQ] = "=",
   [anon_sym_PLUS_EQ] = "operator",
@@ -120,8 +119,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_PLUS] = "operator",
   [sym_source_file] = "source_file",
   [sym__definition] = "_definition",
-  [sym_line_comment] = "line_comment",
-  [sym_block_comment] = "block_comment",
+  [sym_comment] = "comment",
   [sym_assignment] = "assignment",
   [sym_module] = "module",
   [sym__old_module] = "_old_module",
@@ -154,9 +152,9 @@ static const char * const ts_symbol_names[] = {
 static const TSSymbol ts_symbol_map[] = {
   [ts_builtin_sym_end] = ts_builtin_sym_end,
   [anon_sym_SLASH_SLASH] = anon_sym_SLASH_SLASH,
-  [aux_sym_line_comment_token1] = aux_sym_line_comment_token1,
+  [aux_sym_comment_token1] = aux_sym_comment_token1,
   [anon_sym_SLASH_STAR] = anon_sym_SLASH_STAR,
-  [aux_sym_block_comment_token1] = aux_sym_block_comment_token1,
+  [aux_sym_comment_token2] = aux_sym_comment_token2,
   [anon_sym_SLASH] = anon_sym_SLASH,
   [anon_sym_EQ] = anon_sym_EQ,
   [anon_sym_PLUS_EQ] = anon_sym_PLUS_EQ,
@@ -188,8 +186,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_PLUS] = anon_sym_PLUS_EQ,
   [sym_source_file] = sym_source_file,
   [sym__definition] = sym__definition,
-  [sym_line_comment] = sym_line_comment,
-  [sym_block_comment] = sym_block_comment,
+  [sym_comment] = sym_comment,
   [sym_assignment] = sym_assignment,
   [sym_module] = sym_module,
   [sym__old_module] = sym__old_module,
@@ -228,7 +225,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [aux_sym_line_comment_token1] = {
+  [aux_sym_comment_token1] = {
     .visible = false,
     .named = false,
   },
@@ -236,7 +233,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [aux_sym_block_comment_token1] = {
+  [aux_sym_comment_token2] = {
     .visible = false,
     .named = false,
   },
@@ -364,11 +361,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [sym_line_comment] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_block_comment] = {
+  [sym_comment] = {
     .visible = true,
     .named = true,
   },
@@ -5012,14 +5005,14 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '\n') ADVANCE(93);
       END_STATE();
     case 91:
-      ACCEPT_TOKEN(aux_sym_line_comment_token1);
+      ACCEPT_TOKEN(aux_sym_comment_token1);
       if (lookahead == '*') ADVANCE(97);
       if (lookahead == '/') ADVANCE(90);
       if (lookahead != 0 &&
           lookahead != '\n') ADVANCE(93);
       END_STATE();
     case 92:
-      ACCEPT_TOKEN(aux_sym_line_comment_token1);
+      ACCEPT_TOKEN(aux_sym_comment_token1);
       if (lookahead == '/') ADVANCE(91);
       if (lookahead == '\t' ||
           (11 <= lookahead && lookahead <= '\r') ||
@@ -5028,7 +5021,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '\n') ADVANCE(93);
       END_STATE();
     case 93:
-      ACCEPT_TOKEN(aux_sym_line_comment_token1);
+      ACCEPT_TOKEN(aux_sym_comment_token1);
       if (lookahead != 0 &&
           lookahead != '\n') ADVANCE(93);
       END_STATE();
@@ -5054,7 +5047,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '\n') ADVANCE(93);
       END_STATE();
     case 98:
-      ACCEPT_TOKEN(aux_sym_block_comment_token1);
+      ACCEPT_TOKEN(aux_sym_comment_token2);
       if (lookahead == '*') ADVANCE(98);
       if (lookahead != 0 &&
           lookahead != '/') ADVANCE(8);
@@ -5734,8 +5727,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [0] = {
-    [sym_line_comment] = STATE(0),
-    [sym_block_comment] = STATE(0),
+    [sym_comment] = STATE(0),
     [ts_builtin_sym_end] = ACTIONS(1),
     [anon_sym_SLASH_SLASH] = ACTIONS(3),
     [anon_sym_SLASH_STAR] = ACTIONS(5),
@@ -5771,8 +5763,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [1] = {
     [sym_source_file] = STATE(110),
     [sym__definition] = STATE(77),
-    [sym_line_comment] = STATE(1),
-    [sym_block_comment] = STATE(1),
+    [sym_comment] = STATE(1),
     [sym_assignment] = STATE(79),
     [sym_module] = STATE(79),
     [sym__old_module] = STATE(80),
@@ -5809,6 +5800,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_unset,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(2), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(75), 1,
@@ -5818,9 +5811,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(2), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -5829,7 +5819,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [60] = 17,
+  [59] = 17,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -5852,6 +5842,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_unset,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(3), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(75), 1,
@@ -5861,9 +5853,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(3), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -5872,7 +5861,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [120] = 16,
+  [118] = 16,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -5895,6 +5884,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(31), 1,
       anon_sym_RBRACK,
+    STATE(4), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(56), 1,
@@ -5902,9 +5893,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(4), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -5913,7 +5901,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [177] = 16,
+  [174] = 16,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -5936,6 +5924,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(33), 1,
       anon_sym_RBRACK,
+    STATE(5), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(42), 1,
@@ -5943,9 +5933,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(5), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -5954,7 +5941,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [234] = 16,
+  [230] = 16,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -5977,6 +5964,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
     ACTIONS(35), 1,
       anon_sym_RBRACK,
+    STATE(6), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(56), 1,
@@ -5984,9 +5973,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(6), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -5995,7 +5981,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [291] = 15,
+  [286] = 15,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6016,6 +6002,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(7), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(65), 1,
@@ -6023,9 +6011,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(7), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -6034,7 +6019,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [345] = 15,
+  [339] = 15,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6055,6 +6040,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(8), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(62), 1,
@@ -6062,9 +6049,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(8), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -6073,7 +6057,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [399] = 15,
+  [392] = 15,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6094,6 +6078,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(9), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(28), 1,
@@ -6101,9 +6087,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(9), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -6112,7 +6095,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [453] = 15,
+  [445] = 15,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6133,6 +6116,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(10), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(56), 1,
@@ -6140,9 +6125,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(10), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -6151,7 +6133,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [507] = 15,
+  [498] = 15,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6172,6 +6154,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_select,
     ACTIONS(29), 1,
       anon_sym_LBRACK,
+    STATE(11), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(58), 1,
@@ -6179,9 +6163,6 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(15), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(11), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(26), 7,
       sym_boolean_literal,
       sym_integer_literal,
@@ -6190,7 +6171,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_list_expression,
       sym_map_expression,
       sym_binary_expression,
-  [561] = 12,
+  [551] = 12,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6203,6 +6184,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
     ACTIONS(39), 1,
       anon_sym_default,
+    STATE(12), 1,
+      sym_comment,
     STATE(14), 1,
       aux_sym_select_cases_repeat1,
     STATE(19), 1,
@@ -6213,10 +6196,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_select_case,
     STATE(113), 1,
       sym_default_case,
-    STATE(12), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [599] = 12,
+  [588] = 12,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6231,6 +6211,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
     STATE(12), 1,
       aux_sym_select_cases_repeat1,
+    STATE(13), 1,
+      sym_comment,
     STATE(19), 1,
       sym_interpreted_string_literal,
     STATE(102), 1,
@@ -6239,10 +6221,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_select_case,
     STATE(104), 1,
       sym_default_case,
-    STATE(13), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [637] = 9,
+  [625] = 9,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6260,18 +6239,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(43), 2,
       anon_sym_RBRACE,
       anon_sym_default,
-    STATE(14), 3,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(14), 2,
+      sym_comment,
       aux_sym_select_cases_repeat1,
-  [668] = 4,
+  [655] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(15), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(15), 1,
+      sym_comment,
     ACTIONS(51), 8,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6281,14 +6258,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [689] = 4,
+  [675] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(16), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(16), 1,
+      sym_comment,
     ACTIONS(53), 8,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6298,7 +6274,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [710] = 10,
+  [695] = 10,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6307,6 +6283,8 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(55), 1,
       ts_builtin_sym_end,
+    STATE(17), 1,
+      sym_comment,
     STATE(18), 1,
       aux_sym_source_file_repeat1,
     STATE(77), 1,
@@ -6315,13 +6293,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym__old_module,
     STATE(84), 1,
       sym__new_module,
-    STATE(17), 2,
-      sym_line_comment,
-      sym_block_comment,
     STATE(79), 2,
       sym_assignment,
       sym_module,
-  [743] = 9,
+  [727] = 9,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6336,21 +6311,19 @@ static const uint16_t ts_small_parse_table[] = {
       sym__old_module,
     STATE(84), 1,
       sym__new_module,
+    STATE(18), 2,
+      sym_comment,
+      aux_sym_source_file_repeat1,
     STATE(79), 2,
       sym_assignment,
       sym_module,
-    STATE(18), 3,
-      sym_line_comment,
-      sym_block_comment,
-      aux_sym_source_file_repeat1,
-  [774] = 4,
+  [757] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(19), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(19), 1,
+      sym_comment,
     ACTIONS(62), 8,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6360,14 +6333,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [795] = 4,
+  [777] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(20), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(20), 1,
+      sym_comment,
     ACTIONS(64), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6376,30 +6348,28 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
+  [796] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SLASH_SLASH,
+    ACTIONS(5), 1,
+      anon_sym_SLASH_STAR,
+    STATE(21), 1,
+      sym_comment,
+    ACTIONS(66), 7,
+      ts_builtin_sym_end,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_RPAREN,
+      sym_identifier,
+      anon_sym_RBRACK,
+      anon_sym_PLUS,
   [815] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(21), 2,
-      sym_line_comment,
-      sym_block_comment,
-    ACTIONS(66), 7,
-      ts_builtin_sym_end,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-      anon_sym_RPAREN,
-      sym_identifier,
-      anon_sym_RBRACK,
-      anon_sym_PLUS,
-  [835] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SLASH_SLASH,
-    ACTIONS(5), 1,
-      anon_sym_SLASH_STAR,
-    STATE(22), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(22), 1,
+      sym_comment,
     ACTIONS(68), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6408,14 +6378,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [855] = 4,
+  [834] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(23), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(23), 1,
+      sym_comment,
     ACTIONS(70), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6424,14 +6393,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [875] = 4,
+  [853] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(24), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(24), 1,
+      sym_comment,
     ACTIONS(72), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6440,14 +6408,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [895] = 4,
+  [872] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(25), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(25), 1,
+      sym_comment,
     ACTIONS(74), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6456,14 +6423,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [915] = 4,
+  [891] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(26), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(26), 1,
+      sym_comment,
     ACTIONS(76), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6472,14 +6438,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [935] = 4,
+  [910] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(27), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(27), 1,
+      sym_comment,
     ACTIONS(78), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6488,14 +6453,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [955] = 4,
+  [929] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(28), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(28), 1,
+      sym_comment,
     ACTIONS(80), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6504,14 +6468,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [975] = 4,
+  [948] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(29), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(29), 1,
+      sym_comment,
     ACTIONS(82), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6520,14 +6483,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [995] = 4,
+  [967] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(30), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(30), 1,
+      sym_comment,
     ACTIONS(84), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6536,14 +6498,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [1015] = 4,
+  [986] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(31), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(31), 1,
+      sym_comment,
     ACTIONS(86), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6552,14 +6513,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [1035] = 4,
+  [1005] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(32), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(32), 1,
+      sym_comment,
     ACTIONS(88), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6568,14 +6528,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [1055] = 4,
+  [1024] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(33), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(33), 1,
+      sym_comment,
     ACTIONS(90), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6584,14 +6543,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [1075] = 4,
+  [1043] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(34), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(34), 1,
+      sym_comment,
     ACTIONS(92), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6600,14 +6558,13 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [1095] = 4,
+  [1062] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(35), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(35), 1,
+      sym_comment,
     ACTIONS(94), 7,
       ts_builtin_sym_end,
       anon_sym_COMMA,
@@ -6616,16 +6573,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
       anon_sym_RBRACK,
       anon_sym_PLUS,
-  [1115] = 6,
+  [1081] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(98), 1,
       anon_sym_soong_config_variable,
-    STATE(36), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(36), 1,
+      sym_comment,
     STATE(98), 2,
       sym_select_value,
       sym_soong_config_variable,
@@ -6633,7 +6589,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_product_variable,
       anon_sym_release_variable,
       anon_sym_variant,
-  [1138] = 7,
+  [1103] = 7,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6644,12 +6600,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     STATE(19), 1,
       sym_interpreted_string_literal,
+    STATE(37), 1,
+      sym_comment,
     STATE(92), 1,
       sym__string_literal,
-    STATE(37), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1161] = 7,
+  [1125] = 7,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6660,12 +6615,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     STATE(19), 1,
       sym_interpreted_string_literal,
+    STATE(38), 1,
+      sym_comment,
     STATE(107), 1,
       sym__string_literal,
-    STATE(38), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1184] = 7,
+  [1147] = 7,
     ACTIONS(100), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(102), 1,
@@ -6676,12 +6630,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE2,
     ACTIONS(108), 1,
       sym_escape_sequence,
+    STATE(39), 1,
+      sym_comment,
     STATE(43), 1,
       aux_sym_interpreted_string_literal_repeat1,
-    STATE(39), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1207] = 7,
+  [1169] = 7,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6692,12 +6645,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     STATE(19), 1,
       sym_interpreted_string_literal,
+    STATE(40), 1,
+      sym_comment,
     STATE(93), 1,
       sym__string_literal,
-    STATE(40), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1230] = 7,
+  [1191] = 7,
     ACTIONS(100), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(102), 1,
@@ -6710,10 +6662,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE2,
     STATE(39), 1,
       aux_sym_interpreted_string_literal_repeat1,
-    STATE(41), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1253] = 7,
+    STATE(41), 1,
+      sym_comment,
+  [1213] = 7,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6724,12 +6675,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACK,
     ACTIONS(116), 1,
       anon_sym_PLUS,
+    STATE(42), 1,
+      sym_comment,
     STATE(60), 1,
       aux_sym_list_expression_repeat1,
-    STATE(42), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1276] = 6,
+  [1235] = 6,
     ACTIONS(100), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(102), 1,
@@ -6740,11 +6690,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE2,
     ACTIONS(123), 1,
       sym_escape_sequence,
-    STATE(43), 3,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(43), 2,
+      sym_comment,
       aux_sym_interpreted_string_literal_repeat1,
-  [1297] = 6,
+  [1255] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6753,26 +6702,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACE,
     ACTIONS(130), 1,
       anon_sym_LPAREN,
+    STATE(44), 1,
+      sym_comment,
     ACTIONS(126), 2,
       anon_sym_EQ,
       anon_sym_PLUS_EQ,
-    STATE(44), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1318] = 4,
+  [1275] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
-    STATE(45), 2,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(45), 1,
+      sym_comment,
     ACTIONS(43), 4,
       anon_sym_RBRACE,
       sym_raw_string_literal,
       anon_sym_DQUOTE,
       anon_sym_default,
-  [1335] = 6,
+  [1291] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6781,12 +6728,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(134), 1,
       anon_sym_RPAREN,
+    STATE(46), 1,
+      sym_comment,
     STATE(51), 1,
       aux_sym__new_module_repeat1,
-    STATE(46), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1355] = 6,
+  [1310] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6795,12 +6741,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(138), 1,
       anon_sym_RBRACE,
+    STATE(47), 1,
+      sym_comment,
     STATE(64), 1,
       aux_sym__old_module_repeat1,
-    STATE(47), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1375] = 6,
+  [1329] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6809,12 +6754,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
     ACTIONS(142), 1,
       sym_identifier,
+    STATE(48), 1,
+      sym_comment,
     STATE(73), 1,
       sym__colon_property,
-    STATE(48), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1395] = 6,
+  [1348] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6823,12 +6767,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
     ACTIONS(146), 1,
       sym_identifier,
+    STATE(49), 1,
+      sym_comment,
     STATE(72), 1,
       sym__equal_property,
-    STATE(49), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1415] = 6,
+  [1367] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6837,12 +6780,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(148), 1,
       anon_sym_RBRACE,
+    STATE(50), 1,
+      sym_comment,
     STATE(57), 1,
       sym__colon_property,
-    STATE(50), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1435] = 6,
+  [1386] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6851,12 +6793,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(152), 1,
       anon_sym_RPAREN,
+    STATE(51), 1,
+      sym_comment,
     STATE(67), 1,
       aux_sym__new_module_repeat1,
-    STATE(51), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1455] = 6,
+  [1405] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6865,25 +6806,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(154), 1,
       anon_sym_RBRACE,
+    STATE(52), 1,
+      sym_comment,
     STATE(73), 1,
       sym__colon_property,
-    STATE(52), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1475] = 5,
+  [1424] = 5,
     ACTIONS(100), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(102), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(156), 1,
       aux_sym_interpreted_string_literal_token1,
+    STATE(53), 1,
+      sym_comment,
     ACTIONS(158), 2,
       anon_sym_DQUOTE2,
       sym_escape_sequence,
-    STATE(53), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1493] = 6,
+  [1441] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6892,12 +6831,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(162), 1,
       anon_sym_RBRACE,
+    STATE(54), 1,
+      sym_comment,
     STATE(64), 1,
       aux_sym__old_module_repeat1,
-    STATE(54), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1513] = 6,
+  [1460] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6908,23 +6846,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
     STATE(54), 1,
       aux_sym__old_module_repeat1,
-    STATE(55), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1533] = 5,
+    STATE(55), 1,
+      sym_comment,
+  [1479] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(116), 1,
       anon_sym_PLUS,
+    STATE(56), 1,
+      sym_comment,
     ACTIONS(168), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-    STATE(56), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1551] = 6,
+  [1496] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6935,23 +6871,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
     STATE(47), 1,
       aux_sym__old_module_repeat1,
-    STATE(57), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1571] = 5,
+    STATE(57), 1,
+      sym_comment,
+  [1515] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(116), 1,
       anon_sym_PLUS,
+    STATE(58), 1,
+      sym_comment,
     ACTIONS(174), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(58), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1589] = 5,
+  [1532] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6960,11 +6894,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(179), 1,
       anon_sym_RBRACK,
-    STATE(59), 3,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(59), 2,
+      sym_comment,
       aux_sym_list_expression_repeat1,
-  [1607] = 6,
+  [1549] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6975,10 +6908,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACK,
     STATE(59), 1,
       aux_sym_list_expression_repeat1,
-    STATE(60), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1627] = 6,
+    STATE(60), 1,
+      sym_comment,
+  [1568] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -6989,23 +6921,21 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RBRACE,
     STATE(55), 1,
       sym__colon_property,
-    STATE(61), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1647] = 5,
+    STATE(61), 1,
+      sym_comment,
+  [1587] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(116), 1,
       anon_sym_PLUS,
+    STATE(62), 1,
+      sym_comment,
     ACTIONS(187), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(62), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1665] = 6,
+  [1604] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7014,12 +6944,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(189), 1,
       anon_sym_RBRACE,
+    STATE(63), 1,
+      sym_comment,
     STATE(73), 1,
       sym__colon_property,
-    STATE(63), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1685] = 5,
+  [1623] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7028,24 +6957,22 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(194), 1,
       anon_sym_RBRACE,
-    STATE(64), 3,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(64), 2,
+      sym_comment,
       aux_sym__old_module_repeat1,
-  [1703] = 5,
+  [1640] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(116), 1,
       anon_sym_PLUS,
+    STATE(65), 1,
+      sym_comment,
     ACTIONS(196), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-    STATE(65), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1721] = 6,
+  [1657] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7054,12 +6981,11 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(198), 1,
       anon_sym_RPAREN,
+    STATE(66), 1,
+      sym_comment,
     STATE(72), 1,
       sym__equal_property,
-    STATE(66), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1741] = 5,
+  [1676] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7068,11 +6994,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
     ACTIONS(203), 1,
       anon_sym_RPAREN,
-    STATE(67), 3,
-      sym_line_comment,
-      sym_block_comment,
+    STATE(67), 2,
+      sym_comment,
       aux_sym__new_module_repeat1,
-  [1759] = 6,
+  [1693] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7083,10 +7008,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
     STATE(46), 1,
       sym__equal_property,
-    STATE(68), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1779] = 6,
+    STATE(68), 1,
+      sym_comment,
+  [1712] = 6,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7095,68 +7019,62 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     ACTIONS(207), 1,
       anon_sym_RBRACE,
+    STATE(69), 1,
+      sym_comment,
     STATE(73), 1,
       sym__colon_property,
-    STATE(69), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1799] = 4,
+  [1731] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(70), 1,
+      sym_comment,
     ACTIONS(209), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(70), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1814] = 5,
+  [1745] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(146), 1,
       sym_identifier,
+    STATE(71), 1,
+      sym_comment,
     STATE(72), 1,
       sym__equal_property,
-    STATE(71), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1831] = 4,
+  [1761] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(72), 1,
+      sym_comment,
     ACTIONS(211), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-    STATE(72), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1846] = 4,
+  [1775] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(73), 1,
+      sym_comment,
     ACTIONS(213), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-    STATE(73), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1861] = 4,
+  [1789] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(74), 1,
+      sym_comment,
     ACTIONS(215), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(74), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1876] = 5,
+  [1803] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7165,143 +7083,130 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PLUS,
     ACTIONS(217), 1,
       anon_sym_COMMA,
-    STATE(75), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1893] = 4,
+    STATE(75), 1,
+      sym_comment,
+  [1819] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(76), 1,
+      sym_comment,
     ACTIONS(219), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(76), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1908] = 4,
+  [1833] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(77), 1,
+      sym_comment,
     ACTIONS(221), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(77), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1923] = 4,
+  [1847] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(78), 1,
+      sym_comment,
     ACTIONS(223), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(78), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1938] = 4,
+  [1861] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(79), 1,
+      sym_comment,
     ACTIONS(225), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(79), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1953] = 4,
+  [1875] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(80), 1,
+      sym_comment,
     ACTIONS(227), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(80), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1968] = 5,
+  [1889] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(229), 1,
       anon_sym_LBRACE,
+    STATE(81), 1,
+      sym_comment,
     STATE(95), 1,
       sym_select_cases,
-    STATE(81), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [1985] = 4,
+  [1905] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(82), 1,
+      sym_comment,
     ACTIONS(231), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(82), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2000] = 4,
+  [1919] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(83), 1,
+      sym_comment,
     ACTIONS(233), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(83), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2015] = 4,
+  [1933] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(84), 1,
+      sym_comment,
     ACTIONS(227), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(84), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2030] = 4,
+  [1947] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(85), 1,
+      sym_comment,
     ACTIONS(235), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(85), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2045] = 4,
+  [1961] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(86), 1,
+      sym_comment,
     ACTIONS(237), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(86), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2060] = 4,
+  [1975] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(87), 1,
+      sym_comment,
     ACTIONS(239), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(87), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2075] = 5,
+  [1989] = 5,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
@@ -7310,460 +7215,427 @@ static const uint16_t ts_small_parse_table[] = {
       sym_identifier,
     STATE(73), 1,
       sym__colon_property,
-    STATE(88), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2092] = 4,
+    STATE(88), 1,
+      sym_comment,
+  [2005] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
+    STATE(89), 1,
+      sym_comment,
     ACTIONS(241), 2,
       ts_builtin_sym_end,
       sym_identifier,
-    STATE(89), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2107] = 4,
+  [2019] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(243), 1,
       anon_sym_COMMA,
-    STATE(90), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2121] = 4,
+    STATE(90), 1,
+      sym_comment,
+  [2032] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(245), 1,
       anon_sym_COMMA,
-    STATE(91), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2135] = 4,
+    STATE(91), 1,
+      sym_comment,
+  [2045] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(247), 1,
       anon_sym_RPAREN,
-    STATE(92), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2149] = 4,
+    STATE(92), 1,
+      sym_comment,
+  [2058] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(249), 1,
       anon_sym_COMMA,
-    STATE(93), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2163] = 4,
+    STATE(93), 1,
+      sym_comment,
+  [2071] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(251), 1,
       aux_sym_integer_literal_token1,
-    STATE(94), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2177] = 4,
+    STATE(94), 1,
+      sym_comment,
+  [2084] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(253), 1,
       anon_sym_RPAREN,
-    STATE(95), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2191] = 4,
+    STATE(95), 1,
+      sym_comment,
+  [2097] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(255), 1,
       anon_sym_RPAREN,
-    STATE(96), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2205] = 4,
+    STATE(96), 1,
+      sym_comment,
+  [2110] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(257), 1,
       anon_sym_SLASH,
-    STATE(97), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2219] = 4,
+    STATE(97), 1,
+      sym_comment,
+  [2123] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(259), 1,
       anon_sym_COMMA,
-    STATE(98), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2233] = 4,
+    STATE(98), 1,
+      sym_comment,
+  [2136] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(261), 1,
       anon_sym_RBRACE,
-    STATE(99), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2247] = 4,
+    STATE(99), 1,
+      sym_comment,
+  [2149] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(263), 1,
       anon_sym_RPAREN,
-    STATE(100), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2261] = 4,
+    STATE(100), 1,
+      sym_comment,
+  [2162] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(265), 1,
       anon_sym_COLON,
-    STATE(101), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2275] = 4,
+    STATE(101), 1,
+      sym_comment,
+  [2175] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(267), 1,
       anon_sym_COLON,
-    STATE(102), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2289] = 4,
+    STATE(102), 1,
+      sym_comment,
+  [2188] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(269), 1,
       anon_sym_COMMA,
-    STATE(103), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2303] = 4,
+    STATE(103), 1,
+      sym_comment,
+  [2201] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(271), 1,
       anon_sym_COMMA,
-    STATE(104), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2317] = 4,
+    STATE(104), 1,
+      sym_comment,
+  [2214] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(273), 1,
       anon_sym_COLON,
-    STATE(105), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2331] = 4,
+    STATE(105), 1,
+      sym_comment,
+  [2227] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(275), 1,
       anon_sym_EQ,
-    STATE(106), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2345] = 4,
+    STATE(106), 1,
+      sym_comment,
+  [2240] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(277), 1,
       anon_sym_RPAREN,
-    STATE(107), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2359] = 4,
+    STATE(107), 1,
+      sym_comment,
+  [2253] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(279), 1,
       anon_sym_LPAREN,
-    STATE(108), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2373] = 4,
+    STATE(108), 1,
+      sym_comment,
+  [2266] = 4,
     ACTIONS(100), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(102), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(281), 1,
-      aux_sym_line_comment_token1,
-    STATE(109), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2387] = 4,
+      aux_sym_comment_token1,
+    STATE(109), 1,
+      sym_comment,
+  [2279] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(283), 1,
       ts_builtin_sym_end,
-    STATE(110), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2401] = 4,
+    STATE(110), 1,
+      sym_comment,
+  [2292] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(285), 1,
       anon_sym_RBRACE,
-    STATE(111), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2415] = 4,
+    STATE(111), 1,
+      sym_comment,
+  [2305] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(287), 1,
       anon_sym_RPAREN,
-    STATE(112), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2429] = 4,
+    STATE(112), 1,
+      sym_comment,
+  [2318] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(289), 1,
       anon_sym_COMMA,
-    STATE(113), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2443] = 4,
+    STATE(113), 1,
+      sym_comment,
+  [2331] = 4,
     ACTIONS(100), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(102), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(291), 1,
-      aux_sym_block_comment_token1,
-    STATE(114), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2457] = 4,
+      aux_sym_comment_token2,
+    STATE(114), 1,
+      sym_comment,
+  [2344] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(293), 1,
       anon_sym_LPAREN,
-    STATE(115), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2471] = 4,
+    STATE(115), 1,
+      sym_comment,
+  [2357] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(217), 1,
       anon_sym_COMMA,
-    STATE(116), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2485] = 4,
+    STATE(116), 1,
+      sym_comment,
+  [2370] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(295), 1,
       anon_sym_LPAREN,
-    STATE(117), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2499] = 4,
+    STATE(117), 1,
+      sym_comment,
+  [2383] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(297), 1,
       anon_sym_COMMA,
-    STATE(118), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2513] = 4,
+    STATE(118), 1,
+      sym_comment,
+  [2396] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(299), 1,
       anon_sym_COMMA,
-    STATE(119), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2527] = 4,
+    STATE(119), 1,
+      sym_comment,
+  [2409] = 4,
     ACTIONS(3), 1,
       anon_sym_SLASH_SLASH,
     ACTIONS(5), 1,
       anon_sym_SLASH_STAR,
     ACTIONS(301), 1,
       anon_sym_RPAREN,
-    STATE(120), 2,
-      sym_line_comment,
-      sym_block_comment,
-  [2541] = 1,
+    STATE(120), 1,
+      sym_comment,
+  [2422] = 1,
     ACTIONS(303), 1,
       ts_builtin_sym_end,
-  [2545] = 1,
+  [2426] = 1,
     ACTIONS(305), 1,
       ts_builtin_sym_end,
 };
 
 static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(2)] = 0,
-  [SMALL_STATE(3)] = 60,
-  [SMALL_STATE(4)] = 120,
-  [SMALL_STATE(5)] = 177,
-  [SMALL_STATE(6)] = 234,
-  [SMALL_STATE(7)] = 291,
-  [SMALL_STATE(8)] = 345,
-  [SMALL_STATE(9)] = 399,
-  [SMALL_STATE(10)] = 453,
-  [SMALL_STATE(11)] = 507,
-  [SMALL_STATE(12)] = 561,
-  [SMALL_STATE(13)] = 599,
-  [SMALL_STATE(14)] = 637,
-  [SMALL_STATE(15)] = 668,
-  [SMALL_STATE(16)] = 689,
-  [SMALL_STATE(17)] = 710,
-  [SMALL_STATE(18)] = 743,
-  [SMALL_STATE(19)] = 774,
-  [SMALL_STATE(20)] = 795,
-  [SMALL_STATE(21)] = 815,
-  [SMALL_STATE(22)] = 835,
-  [SMALL_STATE(23)] = 855,
-  [SMALL_STATE(24)] = 875,
-  [SMALL_STATE(25)] = 895,
-  [SMALL_STATE(26)] = 915,
-  [SMALL_STATE(27)] = 935,
-  [SMALL_STATE(28)] = 955,
-  [SMALL_STATE(29)] = 975,
-  [SMALL_STATE(30)] = 995,
-  [SMALL_STATE(31)] = 1015,
-  [SMALL_STATE(32)] = 1035,
-  [SMALL_STATE(33)] = 1055,
-  [SMALL_STATE(34)] = 1075,
-  [SMALL_STATE(35)] = 1095,
-  [SMALL_STATE(36)] = 1115,
-  [SMALL_STATE(37)] = 1138,
-  [SMALL_STATE(38)] = 1161,
-  [SMALL_STATE(39)] = 1184,
-  [SMALL_STATE(40)] = 1207,
-  [SMALL_STATE(41)] = 1230,
-  [SMALL_STATE(42)] = 1253,
-  [SMALL_STATE(43)] = 1276,
-  [SMALL_STATE(44)] = 1297,
-  [SMALL_STATE(45)] = 1318,
-  [SMALL_STATE(46)] = 1335,
-  [SMALL_STATE(47)] = 1355,
-  [SMALL_STATE(48)] = 1375,
-  [SMALL_STATE(49)] = 1395,
-  [SMALL_STATE(50)] = 1415,
-  [SMALL_STATE(51)] = 1435,
-  [SMALL_STATE(52)] = 1455,
-  [SMALL_STATE(53)] = 1475,
-  [SMALL_STATE(54)] = 1493,
-  [SMALL_STATE(55)] = 1513,
-  [SMALL_STATE(56)] = 1533,
-  [SMALL_STATE(57)] = 1551,
-  [SMALL_STATE(58)] = 1571,
-  [SMALL_STATE(59)] = 1589,
-  [SMALL_STATE(60)] = 1607,
-  [SMALL_STATE(61)] = 1627,
-  [SMALL_STATE(62)] = 1647,
-  [SMALL_STATE(63)] = 1665,
-  [SMALL_STATE(64)] = 1685,
-  [SMALL_STATE(65)] = 1703,
-  [SMALL_STATE(66)] = 1721,
-  [SMALL_STATE(67)] = 1741,
-  [SMALL_STATE(68)] = 1759,
-  [SMALL_STATE(69)] = 1779,
-  [SMALL_STATE(70)] = 1799,
-  [SMALL_STATE(71)] = 1814,
-  [SMALL_STATE(72)] = 1831,
-  [SMALL_STATE(73)] = 1846,
-  [SMALL_STATE(74)] = 1861,
-  [SMALL_STATE(75)] = 1876,
-  [SMALL_STATE(76)] = 1893,
-  [SMALL_STATE(77)] = 1908,
-  [SMALL_STATE(78)] = 1923,
-  [SMALL_STATE(79)] = 1938,
-  [SMALL_STATE(80)] = 1953,
-  [SMALL_STATE(81)] = 1968,
-  [SMALL_STATE(82)] = 1985,
-  [SMALL_STATE(83)] = 2000,
-  [SMALL_STATE(84)] = 2015,
-  [SMALL_STATE(85)] = 2030,
-  [SMALL_STATE(86)] = 2045,
-  [SMALL_STATE(87)] = 2060,
-  [SMALL_STATE(88)] = 2075,
-  [SMALL_STATE(89)] = 2092,
-  [SMALL_STATE(90)] = 2107,
-  [SMALL_STATE(91)] = 2121,
-  [SMALL_STATE(92)] = 2135,
-  [SMALL_STATE(93)] = 2149,
-  [SMALL_STATE(94)] = 2163,
-  [SMALL_STATE(95)] = 2177,
-  [SMALL_STATE(96)] = 2191,
-  [SMALL_STATE(97)] = 2205,
-  [SMALL_STATE(98)] = 2219,
-  [SMALL_STATE(99)] = 2233,
-  [SMALL_STATE(100)] = 2247,
-  [SMALL_STATE(101)] = 2261,
-  [SMALL_STATE(102)] = 2275,
-  [SMALL_STATE(103)] = 2289,
-  [SMALL_STATE(104)] = 2303,
-  [SMALL_STATE(105)] = 2317,
-  [SMALL_STATE(106)] = 2331,
-  [SMALL_STATE(107)] = 2345,
-  [SMALL_STATE(108)] = 2359,
-  [SMALL_STATE(109)] = 2373,
-  [SMALL_STATE(110)] = 2387,
-  [SMALL_STATE(111)] = 2401,
-  [SMALL_STATE(112)] = 2415,
-  [SMALL_STATE(113)] = 2429,
-  [SMALL_STATE(114)] = 2443,
-  [SMALL_STATE(115)] = 2457,
-  [SMALL_STATE(116)] = 2471,
-  [SMALL_STATE(117)] = 2485,
-  [SMALL_STATE(118)] = 2499,
-  [SMALL_STATE(119)] = 2513,
-  [SMALL_STATE(120)] = 2527,
-  [SMALL_STATE(121)] = 2541,
-  [SMALL_STATE(122)] = 2545,
+  [SMALL_STATE(3)] = 59,
+  [SMALL_STATE(4)] = 118,
+  [SMALL_STATE(5)] = 174,
+  [SMALL_STATE(6)] = 230,
+  [SMALL_STATE(7)] = 286,
+  [SMALL_STATE(8)] = 339,
+  [SMALL_STATE(9)] = 392,
+  [SMALL_STATE(10)] = 445,
+  [SMALL_STATE(11)] = 498,
+  [SMALL_STATE(12)] = 551,
+  [SMALL_STATE(13)] = 588,
+  [SMALL_STATE(14)] = 625,
+  [SMALL_STATE(15)] = 655,
+  [SMALL_STATE(16)] = 675,
+  [SMALL_STATE(17)] = 695,
+  [SMALL_STATE(18)] = 727,
+  [SMALL_STATE(19)] = 757,
+  [SMALL_STATE(20)] = 777,
+  [SMALL_STATE(21)] = 796,
+  [SMALL_STATE(22)] = 815,
+  [SMALL_STATE(23)] = 834,
+  [SMALL_STATE(24)] = 853,
+  [SMALL_STATE(25)] = 872,
+  [SMALL_STATE(26)] = 891,
+  [SMALL_STATE(27)] = 910,
+  [SMALL_STATE(28)] = 929,
+  [SMALL_STATE(29)] = 948,
+  [SMALL_STATE(30)] = 967,
+  [SMALL_STATE(31)] = 986,
+  [SMALL_STATE(32)] = 1005,
+  [SMALL_STATE(33)] = 1024,
+  [SMALL_STATE(34)] = 1043,
+  [SMALL_STATE(35)] = 1062,
+  [SMALL_STATE(36)] = 1081,
+  [SMALL_STATE(37)] = 1103,
+  [SMALL_STATE(38)] = 1125,
+  [SMALL_STATE(39)] = 1147,
+  [SMALL_STATE(40)] = 1169,
+  [SMALL_STATE(41)] = 1191,
+  [SMALL_STATE(42)] = 1213,
+  [SMALL_STATE(43)] = 1235,
+  [SMALL_STATE(44)] = 1255,
+  [SMALL_STATE(45)] = 1275,
+  [SMALL_STATE(46)] = 1291,
+  [SMALL_STATE(47)] = 1310,
+  [SMALL_STATE(48)] = 1329,
+  [SMALL_STATE(49)] = 1348,
+  [SMALL_STATE(50)] = 1367,
+  [SMALL_STATE(51)] = 1386,
+  [SMALL_STATE(52)] = 1405,
+  [SMALL_STATE(53)] = 1424,
+  [SMALL_STATE(54)] = 1441,
+  [SMALL_STATE(55)] = 1460,
+  [SMALL_STATE(56)] = 1479,
+  [SMALL_STATE(57)] = 1496,
+  [SMALL_STATE(58)] = 1515,
+  [SMALL_STATE(59)] = 1532,
+  [SMALL_STATE(60)] = 1549,
+  [SMALL_STATE(61)] = 1568,
+  [SMALL_STATE(62)] = 1587,
+  [SMALL_STATE(63)] = 1604,
+  [SMALL_STATE(64)] = 1623,
+  [SMALL_STATE(65)] = 1640,
+  [SMALL_STATE(66)] = 1657,
+  [SMALL_STATE(67)] = 1676,
+  [SMALL_STATE(68)] = 1693,
+  [SMALL_STATE(69)] = 1712,
+  [SMALL_STATE(70)] = 1731,
+  [SMALL_STATE(71)] = 1745,
+  [SMALL_STATE(72)] = 1761,
+  [SMALL_STATE(73)] = 1775,
+  [SMALL_STATE(74)] = 1789,
+  [SMALL_STATE(75)] = 1803,
+  [SMALL_STATE(76)] = 1819,
+  [SMALL_STATE(77)] = 1833,
+  [SMALL_STATE(78)] = 1847,
+  [SMALL_STATE(79)] = 1861,
+  [SMALL_STATE(80)] = 1875,
+  [SMALL_STATE(81)] = 1889,
+  [SMALL_STATE(82)] = 1905,
+  [SMALL_STATE(83)] = 1919,
+  [SMALL_STATE(84)] = 1933,
+  [SMALL_STATE(85)] = 1947,
+  [SMALL_STATE(86)] = 1961,
+  [SMALL_STATE(87)] = 1975,
+  [SMALL_STATE(88)] = 1989,
+  [SMALL_STATE(89)] = 2005,
+  [SMALL_STATE(90)] = 2019,
+  [SMALL_STATE(91)] = 2032,
+  [SMALL_STATE(92)] = 2045,
+  [SMALL_STATE(93)] = 2058,
+  [SMALL_STATE(94)] = 2071,
+  [SMALL_STATE(95)] = 2084,
+  [SMALL_STATE(96)] = 2097,
+  [SMALL_STATE(97)] = 2110,
+  [SMALL_STATE(98)] = 2123,
+  [SMALL_STATE(99)] = 2136,
+  [SMALL_STATE(100)] = 2149,
+  [SMALL_STATE(101)] = 2162,
+  [SMALL_STATE(102)] = 2175,
+  [SMALL_STATE(103)] = 2188,
+  [SMALL_STATE(104)] = 2201,
+  [SMALL_STATE(105)] = 2214,
+  [SMALL_STATE(106)] = 2227,
+  [SMALL_STATE(107)] = 2240,
+  [SMALL_STATE(108)] = 2253,
+  [SMALL_STATE(109)] = 2266,
+  [SMALL_STATE(110)] = 2279,
+  [SMALL_STATE(111)] = 2292,
+  [SMALL_STATE(112)] = 2305,
+  [SMALL_STATE(113)] = 2318,
+  [SMALL_STATE(114)] = 2331,
+  [SMALL_STATE(115)] = 2344,
+  [SMALL_STATE(116)] = 2357,
+  [SMALL_STATE(117)] = 2370,
+  [SMALL_STATE(118)] = 2383,
+  [SMALL_STATE(119)] = 2396,
+  [SMALL_STATE(120)] = 2409,
+  [SMALL_STATE(121)] = 2422,
+  [SMALL_STATE(122)] = 2426,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -7915,8 +7787,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_default_case, 3, .production_id = 16),
   [299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_case, 3, .production_id = 16),
   [301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_cases, 4),
-  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_line_comment, 2),
-  [305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_comment, 3),
+  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2),
+  [305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 3),
 };
 
 #ifdef __cplusplus
diff --git a/test/corpus/comments.txt b/test/corpus/comments.txt
index 6c91a89..a816b3c 100644
--- a/test/corpus/comments.txt
+++ b/test/corpus/comments.txt
@@ -7,7 +7,7 @@ Empty comment
 --------------------------------------------------------------------------------
 
 (source_file
-  (line_comment))
+  (comment))
 
 ================================================================================
 Single comment
@@ -18,7 +18,7 @@ Single comment
 --------------------------------------------------------------------------------
 
 (source_file
-  (line_comment))
+  (comment))
 
 ================================================================================
 Multiple comments
@@ -30,8 +30,8 @@ Multiple comments
 --------------------------------------------------------------------------------
 
 (source_file
-  (line_comment)
-  (line_comment))
+  (comment)
+  (comment))
 
 ================================================================================
 Empty block comment
@@ -42,7 +42,7 @@ Empty block comment
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Whitespace block comment
@@ -53,7 +53,7 @@ Whitespace block comment
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Block comment
@@ -64,7 +64,7 @@ Block comment
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Block comment with slashes
@@ -75,7 +75,7 @@ Block comment with slashes
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Block comment with asterisks
@@ -86,7 +86,7 @@ Block comment with asterisks
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Block comment (multiline)
@@ -103,7 +103,7 @@ Block comment (multiline)
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Block comment is not recursive
@@ -114,7 +114,7 @@ Block comment is not recursive
 --------------------------------------------------------------------------------
 
 (source_file
-  (block_comment))
+  (comment))
 
 ================================================================================
 Unterminated comment