Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions packages/eslint-plugin/lib/rules/require-closing-tags.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @import {Tag} from "@html-eslint/types";
* @import {ScriptTag, StyleTag, Tag} from "@html-eslint/types";
* @import {RuleModule} from "../types";
*
* @typedef {Object} Option
Expand All @@ -10,6 +10,7 @@
const { RULE_CATEGORY, VOID_ELEMENTS } = require("../constants");
const { createVisitors } = require("./utils/visitors");
const { getRuleUrl } = require("./utils/rule");
const { getNameOf } = require("./utils/node");

const VOID_ELEMENTS_SET = new Set(VOID_ELEMENTS);

Expand Down Expand Up @@ -76,14 +77,15 @@ module.exports = {
);

/**
* @param {Tag} node
* @param {Tag | ScriptTag | StyleTag} node
*/
function checkClosingTag(node) {
function checkClosing(node) {
const name = getNameOf(node);
if (!node.close) {
context.report({
node: node,
data: {
tag: node.name,
tag: name,
},
messageId: MESSAGE_IDS.MISSING,
});
Expand Down Expand Up @@ -151,7 +153,7 @@ module.exports = {
if (node.selfClosing || canSelfClose) {
checkVoidElement(node, shouldSelfClose, canSelfClose);
} else if (node.openEnd.value !== "/>") {
checkClosingTag(node);
checkClosing(node);
}
if (["svg", "math"].includes(node.name)) foreignContext.push(node.name);
},
Expand All @@ -163,6 +165,16 @@ module.exports = {
foreignContext.pop();
}
},
ScriptTag(node) {
if (!node.close) {
checkClosing(node);
}
},
StyleTag(node) {
if (!node.close) {
checkClosing(node);
}
},
});
},
};
15 changes: 15 additions & 0 deletions packages/eslint-plugin/lib/rules/utils/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,20 @@ function getTemplateTokens(tokens) {
);
}

/**
* @param {Tag | ScriptTag | StyleTag} node
* @returns {string}
*/
function getNameOf(node) {
if (isScript(node)) {
return "script";
}
if (isStyle(node)) {
return "style";
}
return node.name;
}

module.exports = {
findAttr,
isAttributesEmpty,
Expand All @@ -266,4 +280,5 @@ module.exports = {
getTemplateTokens,
hasTemplate,
hasAttr,
getNameOf,
};
14 changes: 14 additions & 0 deletions packages/eslint-plugin/tests/rules/require-closing-tags.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ ruleTester.run("require-closing-tags", rule, {
{
code: `<img>`,
},
{
code: `<script></script>`,
},
{
code: `<style></style>`,
},
{
code: `<img/>`,
options: [
Expand Down Expand Up @@ -215,6 +221,14 @@ ruleTester.run("require-closing-tags", rule, {
},
],
},
{
code: `<script>`,
errors: [{ messageId: "missing" }],
},
{
code: `<style>`,
errors: [{ messageId: "missing" }],
},
],
});

Expand Down