fix: update core tag names to include Marko 6 tags (#307)

* fix: update core tag names to include Marko 6 tags
marko-js · Dec 4, 2024 · 38b62ec · 38b62ec
1 parent a31807c
commit 38b62ec
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.changeset/bright-hotels-boil.md b/.changeset/bright-hotels-boil.md
@@ -0,0 +1,8 @@
+---
+"@marko/language-tools": patch
+"marko-vscode": patch
+"@marko/language-server": patch
+"@marko/type-check": patch
+---
+
+Update core tag names to align with Marko 6.
diff --git a/packages/language-server/src/service/marko/util/is-document-link-attr.ts b/packages/language-server/src/service/marko/util/is-document-link-attr.ts
@@ -10,6 +10,7 @@ const linkedAttrs: Map<string, Set<string>> = new Map([
       "img",
       "input",
       "script",
+      "html-script",
       "source",
       "track",
       "video",

diff --git a/packages/language-tools/src/parser.ts b/packages/language-tools/src/parser.ts
@@ -536,9 +536,18 @@ class Builder {
         case "source":
         case "track":
         case "wbr":
+        case "const":
+        case "debug":
+        case "id":
+        case "let":
+        case "lifecycle":
+        case "log":
+        case "return":
           bodyType = TagType.void;
           break;
         case "html-comment":
+        case "html-script":
+        case "html-style":
         case "script":
         case "textarea":
           bodyType = TagType.text;

diff --git a/packages/vscode/syntaxes/marko.tmLanguage.json b/packages/vscode/syntaxes/marko.tmLanguage.json
@@ -811,7 +811,7 @@
       "patterns": [
         {
           "comment": "HTML void elements",
-          "begin": "\\s*(<)(?=(area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)\\b)",
+          "begin": "\\s*(<)(?=(area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr|const|debug|id|let|lifecycle|log|return)\\b)",
           "end": "/?>",
           "patterns": [{ "include": "#open-tag-content" }],
           "beginCaptures": {
@@ -1083,15 +1083,15 @@
               "patterns": [
                 {
                   "name": "support.type.builtin.marko",
-                  "match": "(attrs|style|effect|lifecycle)(?=\\b)(?![-:@])"
+                  "match": "(script|style|html-script|html-style|html-comment)(?=\\b)(?![-:@])"
                 },
                 {
                   "name": "keyword.control.flow.marko",
                   "match": "(for|if|while|else-if|else|try|await|return)(?=\\b)(?![-:@])"
                 },
                 {
                   "name": "support.function.marko",
-                  "match": "(macro|tag|async|let|const|context|id|html-comment)(?=\\b)(?![-:@])"
+                  "match": "(const|context|debug|define|id|let|log|lifecycle)(?=\\b)(?![-:@])"
                 },
                 {
                   "comment": "Attribute tag.",