(fix) (de)serialization issues with custom tags

dlvandenberg · Dec 9, 2023 · 16fda46 · 16fda46
1 parent bfbbef6
commit 16fda46
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 7 deletions.
diff --git a/build/Release/tree_sitter_angular_binding.node b/build/Release/tree_sitter_angular_binding.node
diff --git a/corpus/selectors.txt b/corpus/selectors.txt
@@ -0,0 +1,35 @@
+==================
+Component selector
+==================
+
+<a-button>Label</a-button>
+
+---
+
+(fragment
+  (element
+    (start_tag
+      (tag_name) 
+    )
+    (text)
+    (end_tag
+      (tag_name)
+    )
+  )
+)
+
+=====================
+Self closing selector
+=====================
+
+<a-button />
+
+---
+
+(fragment
+  (element
+    (self_closing_tag
+      (tag_name)
+    )
+  )
+)
diff --git a/corpus/structural-directives.txt b/corpus/structural-directives.txt
@@ -552,9 +552,8 @@ Template Outlet context
         )
       )
     )
-    (erroneous_end_tag
-      (erroneous_end_tag_name)
+    (end_tag
+      (tag_name)
     )
-    (MISSING _implicit_end_tag)
   )
 )
diff --git a/src/html.scanner.c b/src/html.scanner.c
diff --git a/src/html.tag.h b/src/html.tag.h
diff --git a/src/scanner.c b/src/scanner.c
@@ -131,8 +131,10 @@ static unsigned serialize(Scanner *scanner, char *buffer) {
       if (size + 2 + name_length >= TREE_SITTER_SERIALIZATION_BUFFER_SIZE) {
         break;
       }
-      buffer[size++] = (char)tag.type;
-      buffer[size++] = (char)name_length;
+      buffer[size++] =
+          (unsigned char)tag.type; // <-- This is because otherwise it is read
+                                   // as a negative value
+      buffer[size++] = (unsigned char)name_length;
       strncpy(&buffer[size], tag.custom_tag_name.data, name_length);
       size += name_length;
     } else {
@@ -165,7 +167,9 @@ static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
       unsigned iter = 0;
       for (iter = 0; iter < serialized_tag_count; iter++) {
         Tag tag = scanner->tags.data[iter];
-        tag.type = (TagType)buffer[size++];
+        tag.type =
+            (unsigned char)buffer[size++]; // <-- This is because otherwise it
+                                           // is read as a negative value
         if (tag.type == CUSTOM) {
           uint16_t name_length = (uint8_t)buffer[size++];
           tag.custom_tag_name.len = name_length;

diff --git a/src/tag.h b/src/tag.h
@@ -156,7 +156,7 @@ typedef struct {
   String custom_tag_name;
 } Tag;
 
-const TagMap TAG_TYPES_BY_TAG_NAME[128] = {
+const TagMap TAG_TYPES_BY_TAG_NAME[126] = {
     {"AREA", AREA},
     {"BASE", BASE},
     {"BASEFONT", BASEFONT},

diff --git a/src/tree_sitter/html.parser.h b/src/tree_sitter/html.parser.h