Merge branch 'feature/line_block_comments' into develop

jpt13653903 · Jun 29, 2024 · a88a017 · a88a017
2 parents 767d696 + 9731625
commit a88a017
Show file tree

Hide file tree

Showing 14 changed files with 38,941 additions and 31,184 deletions.
diff --git a/grammar.js b/grammar.js
@@ -156,7 +156,8 @@ module.exports = grammar({
         $.string_literal_std_logic,
         $.bit_string_literal,
         $.operator_symbol,
-        $.comment,
+        $.line_comment,
+        $.block_comment,
 
         $.token_end_marker, // Scanner internal use only
 
@@ -189,7 +190,8 @@ module.exports = grammar({
     ],
 
     extras: $ => [
-        $.comment,
+        $.line_comment,
+        $.block_comment,
         $._tool_directive,
         /\s+/
     ],

diff --git a/queries/Helix/highlights.scm b/queries/Helix/highlights.scm
@@ -110,7 +110,8 @@
 ;             gutter - gutter indicator
 ; ------------------------------------------------------------------------------
 
-(comment) @comment
+(line_comment)  @comment.line
+(block_comment) @comment.block
 (identifier) @variable
 
 [

diff --git a/queries/Neovim/highlights.scm b/queries/Neovim/highlights.scm
@@ -120,7 +120,9 @@
 ; @tag.delimiter               XML-style tag delimiters
 ; ------------------------------------------------------------------------------
 
-(comment) @comment @spell
+(line_comment)  @comment @spell
+(block_comment) @comment @spell
+
 (identifier) @variable
 
 [

diff --git a/src/TokenType.h b/src/TokenType.h
@@ -147,7 +147,8 @@ typedef enum TokenTypeTag{
     TOKEN_STRING_LITERAL_STD_LOGIC,
     TOKEN_BIT_STRING_LITERAL,
     TOKEN_OPERATOR_SYMBOL,
-    TOKEN_COMMENT,
+    TOKEN_LINE_COMMENT,
+    TOKEN_BLOCK_COMMENT,
 
     TOKEN_END_MARKER, // Internal use only
 
@@ -179,8 +180,8 @@ typedef enum TokenTypeTag{
     ERROR_SENTINEL,
 
     // For internal use only...
-    COMMENT_LINE_START,
-    COMMENT_BLOCK_START,
+    LINE_COMMENT_START,
+    BLOCK_COMMENT_START,
 
     STRING_LITERAL_STD_LOGIC_START,
 
@@ -349,7 +350,8 @@ bool is_base_specifier   (TokenType type);
             case TOKEN_STRING_LITERAL_STD_LOGIC:           return "TOKEN_STRING_LITERAL_STD_LOGIC";
             case TOKEN_BIT_STRING_LITERAL:                 return "TOKEN_BIT_STRING_LITERAL";
             case TOKEN_OPERATOR_SYMBOL:                    return "TOKEN_OPERATOR_SYMBOL";
-            case TOKEN_COMMENT:                            return "TOKEN_COMMENT";
+            case TOKEN_LINE_COMMENT:                       return "TOKEN_LINE_COMMENT";
+            case TOKEN_BLOCK_COMMENT:                      return "TOKEN_BLOCK_COMMENT";
 
             case TOKEN_END_MARKER:                         return "TOKEN_END_MARKER";
 
@@ -380,8 +382,8 @@ bool is_base_specifier   (TokenType type);
 
             case ERROR_SENTINEL:                           return "ERROR_SENTINEL";
 
-            case COMMENT_LINE_START:                       return "COMMENT_LINE_START";
-            case COMMENT_BLOCK_START:                      return "COMMENT_BLOCK_START";
+            case LINE_COMMENT_START:                       return "LINE_COMMENT_START";
+            case BLOCK_COMMENT_START:                      return "BLOCK_COMMENT_START";
 
             case STRING_LITERAL_STD_LOGIC_START:           return "STRING_LITERAL_STD_LOGIC_START";
 

diff --git a/src/core.h b/src/core.h
@@ -189,8 +189,8 @@ static void register_delimiters(TokenTree* token_tree)
     // token_tree_insert(token_tree, "<<",  DELIMITER_DOUBLE_LESS_THAN);
     // token_tree_insert(token_tree, ">>",  DELIMITER_DOUBLE_GREATER_THAN);
 
-    token_tree_insert(token_tree, "--",  COMMENT_LINE_START);
-    token_tree_insert(token_tree, "/*",  COMMENT_BLOCK_START);
+    token_tree_insert(token_tree, "--",  LINE_COMMENT_START);
+    token_tree_insert(token_tree, "/*",  BLOCK_COMMENT_START);
 }
 //------------------------------------------------------------------------------
 

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json