wikilint 2.44.0 → 2.46.0

package/dist/src/paramLine.js

@@ -1,4 +1,38 @@
 "use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,51 +40,115 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParamLineToken = void 0;
 const lint_1 = require("../util/lint");
 const sharable_1 = require("../util/sharable");
+const gapped_1 = require("../mixin/gapped");
 const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
+const atom_1 = require("./atom");
+const skipTypes = new Set(['comment', 'include', 'noinclude']);
 /**
  * parameter of certain extension tags
  *
  * 某些扩展标签的参数
+ * @classdesc `{childNodes: [AtomToken] | [AtomToken, AtomToken]}`
  */
-class ParamLineToken extends index_2.Token {
-    get type() {
-        return 'param-line';
-    }
-    /** @param name 扩展标签名 */
-    constructor(name, wikitext, config, accum, acceptable) {
-        super(wikitext, config, accum, acceptable);
-        this.setAttribute('name', name);
-    }
-    /** @private */
-    lint(start = this.getAbsoluteIndex()) {
-        LINT: {
-            const rule = 'no-ignored', { lintConfig } = index_1.default, { name, childNodes } = this, s = lintConfig.getSeverity(rule, name);
-            if (!s) {
-                return [];
+let ParamLineToken = (() => {
+    let _classDecorators = [(0, gapped_1.gapped)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = index_2.Token;
+    var ParamLineToken = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            ParamLineToken = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        get type() {
+            return 'param-line';
+        }
+        /**
+         * A reasonable parameter name
+         *
+         * 合理的参数名
+         * @since v1.45.0
+         */
+        get key() {
+            LINT: return this.getKey();
+        }
+        /** @param name 扩展标签名 */
+        constructor(name, wikitext, config, accum, acceptable = {}) {
+            super(undefined, config, accum, {});
+            this.setAttribute('name', name);
+            const equal = wikitext.indexOf('=');
+            if (equal === -1) {
+                this.insertAt(new atom_1.AtomToken(wikitext, 'param-line-key', config, accum, acceptable));
             }
-            const msg = index_1.default.msg('invalid-parameter', name);
-            if (childNodes.some(({ type }) => type === 'ext')) {
-                return [(0, lint_1.generateForSelf)(this, { start }, rule, msg, s)];
+            else {
+                this.append(new atom_1.AtomToken(wikitext.slice(0, equal), 'param-line-key', config, accum, acceptable), new atom_1.AtomToken(wikitext.slice(equal + 1), 'param-line-value', config, accum, acceptable));
             }
-            const children = childNodes
-                .filter(({ type }) => type !== 'comment' && type !== 'include' && type !== 'noinclude'), isInputbox = name === 'inputbox', i = isInputbox ? children.findIndex(({ type }) => type !== 'text') : -1;
-            let str = children.slice(0, i === -1 ? undefined : i).map(String).join('').trim();
-            if (str) {
-                if (isInputbox) {
-                    str = str.toLowerCase();
+        }
+        /** @private */
+        toString(skip) {
+            return super.toString(skip, '=');
+        }
+        /** @private */
+        text() {
+            return this.childNodes.map(child => child.text().trim()).join('=');
+        }
+        /** @private */
+        lint(start = this.getAbsoluteIndex()) {
+            LINT: {
+                const rule = 'no-ignored', { lintConfig } = index_1.default, { name, length, firstChild: { childNodes }, previousSibling } = this, s = lintConfig.getSeverity(rule, name);
+                if (!s) {
+                    return [];
+                }
+                const children = childNodes.filter(({ type }) => !skipTypes.has(type)), i = children.findIndex(({ type }) => type !== 'text');
+                let key = children.slice(0, i === -1 ? undefined : i).map(String).join('').trim(), wrong = false;
+                if (childNodes.some(({ type }) => type === 'ext') || length === 1 && i === -1 && key) {
+                    wrong = true;
+                }
+                else if (key || length === 2) {
+                    if (name === 'inputbox') {
+                        key = key.toLowerCase();
+                    }
+                    const params = sharable_1.extParams[name];
+                    if (i === -1
+                        ? !params.some(p => p === key
+                            || p.endsWith('$1') && key.startsWith(p.slice(0, -2)))
+                        : !params.some(p => p.startsWith(key))) {
+                        wrong = true;
+                    }
                 }
-                const j = str.indexOf('='), key = str.slice(0, j === -1 ? undefined : j).trim(), params = sharable_1.extParams[name];
-                if (j === -1 ? i === -1 || !params.some(p => p.startsWith(key)) : !params.includes(key)) {
-                    const e = (0, lint_1.generateForSelf)(this, { start }, rule, msg, s);
+                if (wrong) {
+                    const e = (0, lint_1.generateForSelf)(this, { start }, rule, index_1.default.msg('invalid-parameter', name), s);
                     if (lintConfig.computeEditInfo) {
-                        e.suggestions = [(0, lint_1.fixByRemove)(e)];
+                        e.suggestions = [(0, lint_1.fixByRemove)(e, previousSibling ? -1 : 0)];
                     }
                     return [e];
                 }
+                return super.lint(start, false);
             }
-            return super.lint(start, false);
         }
-    }
-}
+        /**
+         * Get a reasonable parameter name
+         *
+         * 获取合理的参数名
+         * @since v1.45.0
+         */
+        getKey() {
+            LINT: {
+                const { length, firstChild: { childNodes }, name } = this, isInputbox = name === 'inputbox';
+                return length === 1 || childNodes.some(({ type }) => type === 'ext')
+                    ? undefined
+                    : childNodes.map(child => isInputbox && child.type === 'text' ? child.data.toLowerCase() : child.text())
+                        .join('')
+                        .trim();
+            }
+        }
+    };
+    return ParamLineToken = _classThis;
+})();
 exports.ParamLineToken = ParamLineToken;

package/dist/src/parameter.d.ts

@@ -23,4 +23,10 @@ export declare abstract class ParameterToken extends Token {
      * @param value 参数值
      */
     constructor(key?: string | number, value?: string, config?: Config, accum?: Token[]);
+    /**
+     * Get the parameter value
+     *
+     * 获取参数值
+     */
+    getValue(): string;
 }

package/dist/src/parameter.js

@@ -61,7 +61,9 @@ class ParameterToken extends index_2.Token {
     }
     /** @private */
     text() {
-        return this.anon ? this.lastChild.text() : super.text('=');
+        return this.anon
+            ? this.getValue()
+            : this.childNodes.map(child => child.text().trim()).join('=');
     }
     /** @private */
     getGaps() {
@@ -92,5 +94,17 @@ class ParameterToken extends index_2.Token {
             return errors;
         }
     }
+    /**
+     * Get the parameter value
+     *
+     * 获取参数值
+     */
+    getValue() {
+        const { parentNode, lastChild, anon, name } = this, value = (0, string_1.removeCommentLine)(lastChild.text());
+        return anon && (parentNode?.isTemplate() !== false
+            || name === '2' && parentNode.type === 'magic-word' && parentNode.name === 'tag')
+            ? value
+            : value.trim();
+    }
 }
 exports.ParameterToken = ParameterToken;

package/dist/src/singleLine/charinsertLine.d.ts

@@ -0,0 +1,21 @@
+import { SingleLineToken } from './index';
+import { ExtToken } from '../tagPair/ext';
+import type { Config, LintError } from '../../base';
+import type { Token, CharinsertToken, AstText } from '../../internal';
+/**
+ * lines in `<charinsert>`
+ *
+ * `<charinsert>` 的行
+ * @classdesc `{childNodes: (AstText | ExtToken)[]}`
+ */
+export declare abstract class CharinsertLineToken extends SingleLineToken {
+    readonly childNodes: readonly (AstText | ExtToken)[];
+    abstract get firstChild(): AstText | ExtToken | undefined;
+    abstract get lastChild(): AstText | ExtToken | undefined;
+    abstract get parentNode(): CharinsertToken | undefined;
+    abstract get previousSibling(): CharinsertLineToken | undefined;
+    abstract get nextSibling(): CharinsertLineToken | undefined;
+    get type(): 'charinsert-line';
+    /** @class */
+    constructor(wikitext: string | undefined, config: Config, accum: Token[]);
+}

package/dist/src/singleLine/charinsertLine.js

@@ -0,0 +1,69 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CharinsertLineToken = void 0;
+const lint_1 = require("../../util/lint");
+const rect_1 = require("../../lib/rect");
+const index_1 = __importDefault(require("../../index"));
+const index_2 = require("./index");
+const ext_1 = require("../tagPair/ext");
+/**
+ * lines in `<charinsert>`
+ *
+ * `<charinsert>` 的行
+ * @classdesc `{childNodes: (AstText | ExtToken)[]}`
+ */
+class CharinsertLineToken extends index_2.SingleLineToken {
+    get type() {
+        return 'charinsert-line';
+    }
+    /** @class */
+    constructor(wikitext, config, accum) {
+        super(wikitext?.replace(/<(nowiki)>(.*?)<\/(nowiki)>/giu, (_, opening, content, closing) => {
+            // @ts-expect-error abstract class
+            new ext_1.ExtToken(opening, undefined, content, closing, config, false, accum);
+            return `\0${accum.length - 2}e\x7F`;
+        }), config, accum);
+    }
+    /** @private */
+    lint(start = this.getAbsoluteIndex()) {
+        LINT: {
+            const rule = 'no-ignored', s = index_1.default.lintConfig.getSeverity(rule, 'charinsert');
+            if (!s) {
+                return [];
+            }
+            const errors = [], str = this.childNodes.map(child => child.type === 'text'
+                ? child.data
+                : `<nowiki>${child.innerText.replace(/[^+]/gu, '_')}</nowiki>`).join(''), re = /(?:^|\s)\S+/gu, rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid-content', 'charinsert');
+            let mt = re.exec(str);
+            while (mt) {
+                const [item] = mt;
+                let i = item.indexOf('+');
+                if (i !== -1 && item.slice(0, i).trim()) {
+                    i = item.indexOf('+', i + 1);
+                }
+                if (i !== -1) {
+                    const e = (0, lint_1.generateForSelf)(this, rect, rule, msg, s), startOffset = mt.index + i, endOffset = mt.index + item.length;
+                    e.endIndex = start + endOffset;
+                    e.endCol = e.startCol + endOffset;
+                    e.startIndex += startOffset;
+                    e.startCol += startOffset;
+                    errors.push(e);
+                }
+                mt = re.exec(str);
+            }
+            return errors;
+        }
+    }
+    /* NOT FOR BROWSER ONLY */
+    /** @private */
+    text() {
+        const entities = { '\t': '&#9;', '\r': '&#12;', ' ': '&#32;' };
+        return this.childNodes.map(child => child.type === 'text'
+            ? child.data
+            : child.innerText.replace(/[\t\r ]/gu, c => entities[c])).join('').trim().replace(/\n+/gu, ' ');
+    }
+}
+exports.CharinsertLineToken = CharinsertLineToken;

package/dist/src/{imagemapLink.d.ts → singleLine/imagemapLink.d.ts}

@@ -1,16 +1,17 @@
-import { Token } from './index';
-import { NoincludeToken } from './nowiki/noinclude';
-import { LinkToken } from './link/index';
-import { ExtLinkToken } from './extLink';
-import type { Config } from '../base';
-import type { AstText, ImagemapToken, GalleryImageToken } from '../internal';
+import { SingleLineToken } from './index';
+import { NoincludeToken } from '../nowiki/noinclude';
+import { LinkToken } from '../link/index';
+import { ExtLinkToken } from '../extLink';
+import type { Config, LintError } from '../../base';
+import type { AstText, ImagemapToken, GalleryImageToken, Token } from '../../internal';
 /**
  * link inside the `<imagemap>`
  *
  * `<imagemap>`内的链接
  * @classdesc `{childNodes: [AstText, LinkToken|ExtLinkToken, NoincludeToken]}`
  */
-export declare abstract class ImagemapLinkToken extends Token {
+export declare abstract class ImagemapLinkToken extends SingleLineToken {
+    #private;
     readonly childNodes: readonly [AstText, LinkToken | ExtLinkToken, NoincludeToken];
     abstract get firstChild(): AstText;
     abstract get lastChild(): NoincludeToken;

package/dist/src/singleLine/imagemapLink.js

@@ -0,0 +1,95 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImagemapLinkToken = void 0;
+const lint_1 = require("../../util/lint");
+const index_1 = __importDefault(require("../../index"));
+const index_2 = require("./index");
+const noinclude_1 = require("../nowiki/noinclude");
+const index_3 = require("../link/index");
+const extLink_1 = require("../extLink");
+const shapes = new Set(['default', 'rect', 'circle', 'poly']);
+/** @ignore */
+const notNumeric = (s, allowNegative) => {
+    const n = Number(s);
+    return Number.isNaN(n) || n > 1e9 || !allowNegative && n < 0;
+};
+/**
+ * link inside the `<imagemap>`
+ *
+ * `<imagemap>`内的链接
+ * @classdesc `{childNodes: [AstText, LinkToken|ExtLinkToken, NoincludeToken]}`
+ */
+class ImagemapLinkToken extends index_2.SingleLineToken {
+    get type() {
+        return 'imagemap-link';
+    }
+    /**
+     * @param pre 链接前的文本
+     * @param linkStuff 内外链接
+     * @param post 链接后的文本
+     */
+    constructor(pre, linkStuff, post, config, accum = []) {
+        super(undefined, config, accum);
+        this.append(pre, linkStuff.length === 2
+            // @ts-expect-error abstract class
+            ? new index_3.LinkToken(...linkStuff, config, accum)
+            // @ts-expect-error abstract class
+            : new extLink_1.ExtLinkToken(...linkStuff, config, accum), 
+        // @ts-expect-error abstract class
+        new noinclude_1.NoincludeToken(post, config, accum));
+    }
+    /**
+     * 检查链接区域是否合法
+     * @param errors 错误列表
+     * @param coords 坐标字符串
+     * @param start 节点起始位置
+     * @param minCount 最少需要的坐标数量
+     * @param isPoly 是否为多边形
+     */
+    #lintCoords(errors, coords, start, minCount, isPoly) {
+        LINT: {
+            const parts = coords.split(/[ \t]+/u).map(s => s.trim()).filter(Boolean), { length } = parts, rule = 'invalid-imagemap', s = index_1.default.lintConfig.getSeverity(rule, 'coord');
+            if (s && (length < minCount || isPoly && length % 2 || parts.some(part => notNumeric(part, isPoly)))) {
+                errors.push((0, lint_1.generateForChild)(this.firstChild, { start }, rule, 'invalid-coord', s));
+            }
+        }
+    }
+    /** 获取链接区域图形和坐标 */
+    #getShape() {
+        const area = this.firstChild.data.trim(), i = area.search(/[ \t]/u), shape = i === -1 ? area : area.slice(0, i);
+        return shapes.has(shape) && [shape, area.slice(i).trim()];
+    }
+    /** @private */
+    lint(start = this.getAbsoluteIndex(), re) {
+        LINT: {
+            const errors = super.lint(start, re), { firstChild } = this, shapeAndCoords = this.#getShape();
+            if (shapeAndCoords) {
+                const [shape, coords] = shapeAndCoords;
+                switch (shape) {
+                    case 'default':
+                        break;
+                    case 'rect':
+                        this.#lintCoords(errors, coords, start, 4);
+                        break;
+                    case 'circle':
+                        this.#lintCoords(errors, coords, start, 3);
+                        break;
+                    case 'poly':
+                        this.#lintCoords(errors, coords, start, 1, true);
+                    // no default
+                }
+            }
+            else {
+                const rule = 'invalid-imagemap', s = index_1.default.lintConfig.getSeverity(rule, 'shape');
+                if (s) {
+                    errors.push((0, lint_1.generateForChild)(firstChild, { start }, rule, 'unrecognized-shape', s));
+                }
+            }
+            return errors;
+        }
+    }
+}
+exports.ImagemapLinkToken = ImagemapLinkToken;

package/dist/src/singleLine/index.d.ts

@@ -0,0 +1,10 @@
+import { Token } from '../index';
+import type { MultiLineToken } from '../multiLine/index';
+/**
+ * single-line token inside specific extension tags, such as `<charinsert>` and `<imagemap>`
+ *
+ * 特定扩展标签内的单行节点，如 `<charinsert>` 和 `<imagemap>`
+ */
+export declare abstract class SingleLineToken extends Token {
+    abstract get parentNode(): MultiLineToken | undefined;
+}

package/dist/src/singleLine/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SingleLineToken = void 0;
+const index_1 = require("../index");
+/**
+ * single-line token inside specific extension tags, such as `<charinsert>` and `<imagemap>`
+ *
+ * 特定扩展标签内的单行节点，如 `<charinsert>` 和 `<imagemap>`
+ */
+class SingleLineToken extends index_1.Token {
+    /** @private */
+    isPlain() {
+        return this.type === 'plain';
+    }
+}
+exports.SingleLineToken = SingleLineToken;

package/dist/src/table/td.js

@@ -148,8 +148,9 @@ let TdToken = (() => {
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             LINT: {
-                const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start + this.getRelativeIndex(this.length - 1)), rule = 'pipe-like', { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, severities = ['td', 'double'].map(key => lintConfig.getSeverity(rule, key));
-                for (const child of this.lastChild.childNodes) {
+                const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start + this.getRelativeIndex(this.length - 1)), rule = 'pipe-like', { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, severities = ['td', 'double'].map(key => lintConfig.getSeverity(rule, key)), { childNodes, length } = this.lastChild, pipes = [];
+                for (let i = length - 1; i >= 0; i--) {
+                    const child = childNodes[i];
                     if (child.type === 'text') {
                         const { data } = child;
                         if (data.includes('|')) {
@@ -165,12 +166,12 @@ let TdToken = (() => {
                                         e.suggestions = [(0, lint_1.fixByPipe)(e.startIndex, data)];
                                     }
                                 }
-                                errors.push(e);
+                                pipes.push(e);
                             }
                         }
                     }
                 }
-                return errors;
+                return [...errors, ...pipes.reverse()];
             }
         }
         /**

package/dist/src/tag/html.js

@@ -112,16 +112,34 @@ let HtmlToken = (() => {
         }
         /** @private */
         text() {
-            const { closing, selfClosing, name } = this, [, , voidTags] = this.getAttribute('config').html;
+            const { closing, selfClosing, name } = this, [normalTags, , voidTags] = this.getAttribute('config').html;
+            let slash;
             if (voidTags.includes(name)) {
-                return closing && name !== 'br' ? '' : super.text('/');
+                if (closing && name !== 'br') {
+                    return '';
+                }
+                slash = '/';
+            }
+            else {
+                slash = selfClosing && !closing && !normalTags.includes(name) ? '/' : '';
+            }
+            return `<${closing && !slash ? '/' : ''}${name}${closing ? '' : super.text()}${slash}>`;
+        }
+        /** 是否是无效自封闭标签 */
+        #lint() {
+            const { name, closing, selfClosing } = this, [, flexibleTags, voidTags] = this.getAttribute('config').html, isVoid = voidTags.includes(name), isFlexible = flexibleTags.includes(name), isNormal = !isVoid && !isFlexible;
+            if (!(closing && (selfClosing || isVoid) || selfClosing && isNormal)) {
+                return false;
+            }
+            else if (isVoid) {
+                return 2;
             }
-            return super.text(selfClosing && !closing ? '/' : '');
+            return isFlexible ? 1 : 0;
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             LINT: {
-                const errors = super.lint(start, re), { name, parentNode, closing, selfClosing } = this, rect = new rect_1.BoundingRect(this, start), { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, severity = this.inTableAttrs();
+                const errors = super.lint(start, re), { name, parentNode, closing } = this, rect = new rect_1.BoundingRect(this, start), { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, severity = this.inTableAttrs();
                 let rule = 'h1', s = lintConfig.getSeverity(rule, 'html');
                 if (s && name === 'h1' && !closing) {
                     const e = (0, lint_1.generateForSelf)(this, rect, rule, '<h1>', s);
@@ -153,9 +171,9 @@ let HtmlToken = (() => {
                     }
                     errors.push(e);
                 }
-                const [, flexibleTags, voidTags] = this.getAttribute('config').html, isVoid = voidTags.includes(name), isFlexible = flexibleTags.includes(name), isNormal = !isVoid && !isFlexible;
+                const tagType = this.#lint();
                 rule = 'unmatched-tag';
-                if (closing && (selfClosing || isVoid) || selfClosing && isNormal) {
+                if (tagType !== false) {
                     s = lintConfig.getSeverity(rule, closing ? 'both' : 'selfClosing');
                     if (s) {
                         const e = (0, lint_1.generateForSelf)(this, rect, rule, closing ? 'closing-and-self-closing' : 'invalid-self-closing', s);
@@ -165,13 +183,13 @@ let HtmlToken = (() => {
                                 range: [e.endIndex - 2, e.endIndex - 1],
                                 text: '',
                             };
-                            if (isFlexible) {
+                            if (tagType === 1) {
                                 if (computeEditInfo) {
                                     e.suggestions = [open, noSelfClosing];
                                 }
                             }
                             else if (closing) {
-                                e.fix = isVoid ? open : noSelfClosing;
+                                e.fix = tagType === 2 ? open : noSelfClosing;
                             }
                             else if (computeEditInfo) {
                                 e.suggestions = [

package/dist/src/tag/index.js

@@ -34,11 +34,6 @@ class TagToken extends index_1.Token {
         return `<${this.#closing ? '/' : ''}${this.#tag}${super.toString(skip)}${this.selfClosing ? '/' : ''}>`;
     }
     /** @private */
-    text(separator = '') {
-        const { closing } = this;
-        return `<${closing && !separator ? '/' : ''}${this.#tag}${closing ? '' : super.text()}${separator}>`;
-    }
-    /** @private */
     getAttribute(key) {
         return key === 'padding'
             ? this.#tag.length + (this.#closing ? 2 : 1)
@@ -51,8 +46,9 @@ class TagToken extends index_1.Token {
      */
     findMatchingTag() {
         LINT: return (0, lint_1.cache)(this.#match, () => {
-            const { type, name, parentNode, closing, selfClosing, } = this;
-            let isVoid = false, isFlexible = false;
+            const { type, name, closing, selfClosing, } = this;
+            // eslint-disable-next-line prefer-const
+            let { parentNode } = this, isVoid = false, isFlexible = false;
             if (type === 'html') {
                 const [, flexibleTags, voidTags] = this.getAttribute('config').html;
                 isVoid = voidTags.includes(name);
@@ -65,27 +61,44 @@ class TagToken extends index_1.Token {
             if (!parentNode) {
                 return undefined;
             }
-            const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing ? childNodes.slice(0, i).reverse() : childNodes.slice(i + 1), stack = [this], { rev } = debug_1.Shadow;
-            for (const token of siblings) {
-                if (!token.is(type)
-                    || type === 'html' && (token.name !== name || isFlexible && token.selfClosing)) {
-                    continue;
+            const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing ? childNodes.slice(0, i) : childNodes.slice(i + 1).reverse(), stack = [this], { rev } = debug_1.Shadow;
+            let cur = siblings.pop(), until;
+            while (cur) {
+                // eslint-disable-next-line no-empty, @typescript-eslint/no-unnecessary-condition
+                if (!cur) {
+                }
+                else if (until) {
+                    if (cur === until) {
+                        until = undefined;
+                    }
+                }
+                else if (!cur.is(type)
+                    || type === 'html' && (cur.name !== name || isFlexible && cur.selfClosing)) {
+                    //
                 }
-                else if (token.#closing === closing) {
+                else if (cur.#closing === closing) {
                     /* c8 ignore next 3 */
                     if (type === 'tvar') {
                         return undefined;
                     }
-                    stack.push(token);
+                    else if (cur.#match?.[0] === rev) {
+                        const [, matched] = cur.#match;
+                        if (!matched) {
+                            return undefined;
+                        }
+                        until = matched;
+                    }
+                    stack.push(cur);
                 }
                 else {
                     const top = stack.pop();
                     if (top === this) {
-                        return token;
+                        return cur;
                     }
-                    top.#match = [rev, token];
-                    token.#match = [rev, top];
+                    top.#match = [rev, cur];
+                    cur.#match = [rev, top];
                 }
+                cur = siblings.pop();
             }
             for (const token of stack) {
                 token.#match = [rev, undefined];