fix: ensure overwritten native tags get correct types

Author: DylanPiercey

.changeset/big-jeans-itch.md

@@ -0,0 +1,8 @@
+---
+"@marko/language-server": patch
+"@marko/language-tools": patch
+"@marko/type-check": patch
+"marko-vscode": patch
+---
+
+Fix issue where overwritten native tags were not getting the correct types.

package-lock.json

@@ -9,7 +9,6 @@
   "dependencies": {
     "@luxass/strip-json-comments": "^1.4.0",
     "@marko/language-tools": "^2.5.26",
-    "@marko/babel-utils": "^6.6.3",
     "@marko/compiler": "^5.39.29",
     "htmljs-parser": "^5.6.1",
     "marko": "^5.37.41",

packages/language-server/package.json

@@ -1,4 +1,4 @@
-import type { TagDefinition } from "@marko/babel-utils";
+import type { TagDefinition } from "@marko/compiler/babel-utils";
 import {
   getLines,
   getLocation,

packages/language-server/src/service/marko/definition/OpenTagName.ts

@@ -3,6 +3,7 @@ import { SymbolInformation, SymbolKind } from "vscode-languageserver";
 
 import { MarkoFile, processDoc } from "../../utils/file";
 import type { Plugin } from "../types";
+import { isHTML } from "./util/is-html";
 
 export const findDocumentSymbols: Plugin["findDocumentSymbols"] = async (doc) =>
   processDoc(doc, extractDocumentSymbols);
@@ -33,7 +34,7 @@ function extractDocumentSymbols({
               : node.nameText) || "<${...}>",
           kind:
             (node.nameText &&
-              lookup.getTag(node.nameText)?.html &&
+              isHTML(lookup.getTag(node.nameText)) &&
               SymbolKind.Property) ||
             SymbolKind.Class,
           location: {

packages/language-server/src/service/marko/document-symbols.ts

@@ -1,4 +1,4 @@
-import type { TagDefinition } from "@marko/babel-utils";
+import type { TagDefinition } from "@marko/compiler/babel-utils";
 import path from "path";
 import {
   type CompletionItem,
@@ -11,6 +11,8 @@ import {
 } from "vscode-languageserver";
 import { URI } from "vscode-uri";
 
+import { isHTML } from "./is-html";
+
 const deprecated = [CompletionItemTag.Deprecated] as CompletionItemTag[];
 
 export default function getTagNameCompletion({
@@ -35,9 +37,10 @@ export default function getTagNameCompletion({
   const isCoreTag =
     /^@?marko[/-]/.test(tag.taglibId || tag.filePath) ||
     nodeModuleName === "marko";
+  const html = isHTML(tag);
   const documentation = {
     kind: MarkupKind.Markdown,
-    value: tag.html
+    value: html
       ? `Built in [<${tag.name}>](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/${tag.name}) HTML tag.`
       : isCoreTag
         ? `Core Marko <${tag.name}> tag.`
@@ -73,7 +76,7 @@ export default function getTagNameCompletion({
     documentation,
     tags: tag.deprecated ? deprecated : undefined,
     insertTextFormat: autocomplete ? InsertTextFormat.Snippet : undefined,
-    kind: tag.html ? CompletionItemKind.Property : CompletionItemKind.Class,
+    kind: html ? CompletionItemKind.Property : CompletionItemKind.Class,
     textEdit: range && TextEdit.replace(range, autocomplete?.snippet || label),
   };
 }

packages/language-server/src/service/marko/util/get-tag-name-completion.ts

@@ -0,0 +1,5 @@
+import { TagDefinition } from "@marko/compiler/babel-utils";
+
+export function isHTML(tag: TagDefinition | undefined) {
+  return tag ? !(tag.types || tag.template || tag.renderer) && tag.html : false;
+}

packages/language-server/src/service/marko/util/is-html.ts

@@ -1,5 +1,5 @@
-import { DiagnosticType } from "@marko/babel-utils";
 import type { Config } from "@marko/compiler";
+import { DiagnosticType } from "@marko/compiler/babel-utils";
 import { Project } from "@marko/language-tools";
 import path from "path";
 import { Diagnostic, DiagnosticSeverity } from "vscode-languageserver";

packages/language-server/src/service/marko/validate.ts

@@ -1,4 +1,4 @@
-import type { TaglibLookup } from "@marko/babel-utils";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import { parse, type Parsed, Project } from "@marko/language-tools";
 import path from "path";
 import type { TextDocument } from "vscode-languageserver-textdocument";

packages/language-server/src/utils/file.ts

@@ -1,5 +1,5 @@
 import type * as t from "@babel/types";
-import type { TagDefinition, TaglibLookup } from "@marko/babel-utils";
+import type { TagDefinition, TaglibLookup } from "@marko/compiler/babel-utils";
 import { relativeImportPath } from "relative-import-path";
 import type TS from "typescript/lib/tsserverlibrary";
 
@@ -737,14 +737,12 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : undefined;
-    const isHTML = def?.html;
-    const importPath = !isHTML
-      ? resolveTagImport(this.#filename, def)
-      : undefined;
+    const importPath = resolveTagImport(this.#filename, def);
+    const isHTML = !importPath && def?.html;
     let tagIdentifier: undefined | string;
     let isTemplate = false;
 
-    if (!isHTML && (!def || importPath)) {
+    if (!def || importPath) {
       const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
       const isMarkoFile = importPath?.endsWith(".marko");