wikilint 2.16.4 → 2.16.6

package/dist/lib/lsp.js

@@ -170,18 +170,24 @@ const getSectionEnd = (section, lines, line) => {
 /** VSCode-style language service */
 class LanguageService {
     #text;
+    #text2;
     #running;
+    #running2;
     #done;
+    #done2;
     #config;
+    #config2;
     #completionConfig;
-    #signature;
     /** @private */
     data;
     /** @param uri 任务标识 */
     constructor(uri) {
         exports.tasks.set(uri, this);
         /* NOT FOR BROWSER ONLY */
-        this.data = require(path.join('..', '..', 'data', 'signatures'));
+        Object.defineProperty(this, 'data', {
+            value: require(path.join('..', '..', 'data', 'signatures')),
+            enumerable: false,
+        });
     }
     /** @implements */
     destroy() {
@@ -191,7 +197,7 @@ class LanguageService {
      * 提交解析任务
      * @param text 源代码
      * @description
-     * - 总是更新`text`以便`parse`完成时可以判断是否需要重新解析
+     * - 总是更新`#text`以便`#parse`完成时可以判断是否需要重新解析
      * - 如果已有进行中或已完成的解析，则返回该解析的结果
      * - 否则开始新的解析
      */
@@ -207,48 +213,71 @@ class LanguageService {
     /**
      * 执行解析
      * @description
-     * - 完成后会检查`text`是否已更新，如果是则重新解析
+     * - 完成后会检查`#text`是否已更新，如果是则重新解析
      * - 总是返回最新的解析结果
      */
     async #parse() {
-        return new Promise(resolve => {
-            (typeof setImmediate === 'function' ? setImmediate : /* istanbul ignore next */ setTimeout)(() => {
-                const config = index_1.default.getConfig();
-                this.#config = index_1.default.config;
-                const text = this.#text, root = index_1.default.parse(text, true, undefined, config);
-                if (this.#text === text && this.#config === index_1.default.config) {
-                    this.#done = root;
-                    this.#running = undefined;
-                    resolve(root);
-                    return;
-                }
-                /* istanbul ignore next */
-                this.#running = this.#parse();
-                /* istanbul ignore next */
-                resolve(this.#running);
-            }, 0);
-        });
+        const config = index_1.default.getConfig();
+        this.#config = index_1.default.config;
+        const text = this.#text, root = await index_1.default.partialParse(text, () => this.#text, true, config);
+        if (this.#text === text && this.#config === index_1.default.config) {
+            this.#done = root;
+            this.#running = undefined;
+            return root;
+        }
+        /* istanbul ignore next */
+        this.#running = this.#parse();
+        /* istanbul ignore next */
+        return this.#running;
+    }
+    /**
+     * 提交签名解析任务
+     * @param text 源代码
+     * @description
+     * - 总是更新`#text2`以便`#parseSignature`完成时可以判断是否需要重新解析
+     * - 如果已有进行中或已完成的解析，则返回该解析的结果
+     * - 否则开始新的解析
+     */
+    async #queueSignature(text) {
+        text = (0, string_1.tidy)(text);
+        if (this.#text2 === text && this.#config2 === index_1.default.config && !this.#running2) {
+            return this.#done2;
+        }
+        this.#text2 = text;
+        this.#running2 ??= this.#parseSignature(); // 不要提交多个解析任务
+        return this.#running2;
     }
     /**
-     * 检查是否为签名语言服务器
-     * @throws `Error` 是签名语言服务器
+     * 执行签名解析
+     * @description
+     * - 完成后会检查`#text2`是否已更新，如果是则重新解析
+     * - 总是返回最新的解析结果
      */
-    #checkSignature() {
-        /* istanbul ignore if */
-        if (this.#signature) {
-            throw new Error('This is a signature language server!');
+    async #parseSignature() {
+        const config = index_1.default.getConfig();
+        this.#config2 = index_1.default.config;
+        const text = this.#text2, root = await index_1.default.partialParse(text, () => this.#text2, true, config);
+        if (this.#text2 === text && this.#config2 === index_1.default.config) {
+            this.#done2 = root;
+            this.#running2 = undefined;
+            return root;
         }
+        /* istanbul ignore next */
+        this.#running2 = this.#parseSignature();
+        /* istanbul ignore next */
+        return this.#running2;
     }
     /**
+     * Provide color decorators
+     *
      * 提供颜色指示
-     * @param rgba 颜色解析函数
-     * @param text 源代码
-     * @param hsl 是否允许HSL颜色
+     * @param rgba color parser / 颜色解析函数
+     * @param text source Wikitext / 源代码
+     * @param hsl whether HSL colors are treated / 是否允许HSL颜色
      */
     async provideDocumentColors(rgba, text, hsl = true) {
-        this.#checkSignature();
         const root = await this.#queue(text);
-        return root.querySelectorAll('attr-value,parameter-value,arg-default')
+        return root.querySelectorAll('attr-value,parameter-value,arg-default').reverse()
             .flatMap(({ type, childNodes }) => {
             if (type !== 'attr-value' && !isPlain(childNodes)) {
                 return [];
@@ -275,10 +304,15 @@ class LanguageService {
             });
         });
     }
-    /** @implements */
-    provideColorPresentations(// eslint-disable-line @typescript-eslint/class-methods-use-this
-    { color: { red, green, blue, alpha }, range }) {
-        const newText = `#${(0, common_1.numToHex)(red)}${(0, common_1.numToHex)(green)}${(0, common_1.numToHex)(blue)}${alpha < 1 ? (0, common_1.numToHex)(alpha) : ''}`;
+    /**
+     * Provide color pickers
+     *
+     * 颜色选择器
+     * @param color color information / 颜色信息
+     */
+    // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+    provideColorPresentations(color) {
+        const { color: { red, green, blue, alpha }, range } = color, newText = `#${(0, common_1.numToHex)(red)}${(0, common_1.numToHex)(green)}${(0, common_1.numToHex)(blue)}${alpha < 1 ? (0, common_1.numToHex)(alpha) : ''}`;
         return [
             {
                 label: newText,
@@ -323,12 +357,13 @@ class LanguageService {
         return this.#completionConfig;
     }
     /**
+     * Provide auto-completion
+     *
      * 提供自动补全
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      * @param position 位置
      */
     async provideCompletionItems(text, position) {
-        this.#checkSignature();
         const { re, allTags, functions, switches, protocols, params, tags, ext } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? '');
         if (mt?.[1] !== undefined) { // tag
             const closing = mt[1].startsWith('/');
@@ -382,7 +417,8 @@ class LanguageService {
             return [
                 ...getCompletion(params, 'Property', match, position)
                     .filter(({ label }) => !equal || !/[= ]$/u.test(label)),
-                ...getCompletion(root.querySelectorAll('image-parameter#width').filter(token => token !== cur)
+                ...getCompletion(root.querySelectorAll('image-parameter#width')
+                    .filter(token => token !== cur)
                     .map(width => width.text()), 'Unit', match, position),
             ];
         }
@@ -408,20 +444,20 @@ class LanguageService {
         }
         else if (type === 'parameter-key' || type === 'parameter-value' && parentNode.anon) {
             // parameter key
-            const transclusion = parentNode.parentNode;
-            if (transclusion.type === 'magic-word' && transclusion.name !== 'invoke') {
+            const transclusion = parentNode.parentNode, { type: t, name: n } = transclusion;
+            if (t === 'magic-word' && n !== 'invoke') {
                 return undefined;
             }
-            const key = cur.toString().trimStart(), [module, func] = transclusion.type === 'magic-word' ? transclusion.getModule() : [];
+            const key = cur.toString().trimStart(), [module, func] = t === 'magic-word' ? transclusion.getModule() : [];
             return key
                 ? getCompletion(root.querySelectorAll('parameter').filter(token => {
                     if (token === parentNode
                         || token.anon
-                        || token.parentNode.type !== transclusion.type
-                        || token.parentNode.name !== transclusion.name) {
+                        || token.parentNode.type !== t
+                        || token.parentNode.name !== n) {
                         return false;
                     }
-                    else if (transclusion.type === 'template') {
+                    else if (t === 'template') {
                         return true;
                     }
                     const [m, f] = token.parentNode.getModule();
@@ -432,13 +468,14 @@ class LanguageService {
         return undefined;
     }
     /**
-     * 提供语法诊断
-     * @param wikitext 源代码
-     * @param warning 是否提供警告
+     * Provide grammar check
+     *
+     * 提供语法检查
+     * @param text source Wikitext / 源代码
+     * @param warning whether to include warnings / 是否包含警告
      */
-    async provideDiagnostics(wikitext, warning = true) {
-        this.#checkSignature();
-        const root = await this.#queue(wikitext), errors = root.lint();
+    async provideDiagnostics(text, warning = true) {
+        const root = await this.#queue(text), errors = root.lint();
         return (warning ? errors : errors.filter(({ severity }) => severity === 'error'))
             .map(({ startLine, startCol, endLine, endCol, severity, rule, message, fix, suggestions }) => ({
             range: {
@@ -457,38 +494,42 @@ class LanguageService {
         }));
     }
     /**
+     * Provide folding ranges
+     *
      * 提供折叠范围
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      */
     async provideFoldingRanges(text) {
-        this.#checkSignature();
         const root = await this.#queue(text), { length } = root.getLines(), ranges = [], levels = new Array(6), tokens = root.querySelectorAll('heading-title,table,template,magic-word');
         for (const token of [...tokens].reverse()) { // 提高 getBoundingClientRect 的性能
             token.getRelativeIndex();
         }
         for (const token of tokens) {
-            const { top, height } = token.getBoundingClientRect();
-            if (token.type === 'heading-title') {
-                const { level } = token.parentNode;
-                for (let i = level - 1; i < 6; i++) {
-                    const startLine = levels[i];
-                    if (startLine !== undefined && startLine < top - 1) {
-                        ranges.push({
-                            startLine,
-                            endLine: top - 1,
-                            kind: 'region',
-                        });
+            const { offsetHeight } = token;
+            if (token.type === 'heading-title' || offsetHeight > 2) {
+                const { top } = token.getBoundingClientRect();
+                if (token.type === 'heading-title') {
+                    const { level } = token.parentNode;
+                    for (let i = level - 1; i < 6; i++) {
+                        const startLine = levels[i];
+                        if (startLine !== undefined && startLine < top - 1) {
+                            ranges.push({
+                                startLine,
+                                endLine: top - 1,
+                                kind: 'region',
+                            });
+                        }
+                        levels[i] = undefined;
                     }
-                    levels[i] = undefined;
+                    levels[level - 1] = top + offsetHeight - 1; // 从标题的最后一行开始折叠
+                }
+                else {
+                    ranges.push({
+                        startLine: top, // 从表格或模板的第一行开始折叠
+                        endLine: top + offsetHeight - 2,
+                        kind: 'region',
+                    });
                 }
-                levels[level - 1] = top + height - 1; // 从标题的最后一行开始折叠
-            }
-            else if (height > 2) {
-                ranges.push({
-                    startLine: top, // 从表格或模板的第一行开始折叠
-                    endLine: top + height - 2,
-                    kind: 'region',
-                });
             }
         }
         for (const startLine of levels) {
@@ -503,16 +544,18 @@ class LanguageService {
         return ranges;
     }
     /**
+     * Provide links
+     *
      * 提供链接
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      */
     async provideLinks(text) {
-        this.#checkSignature();
         const { articlePath, protocol } = index_1.default.getConfig(), absolute = articlePath?.includes('//'), protocolRegex = new RegExp(`^(?:${protocol}|//)`, 'iu');
         return (await this.#queue(text))
-            .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module' : ''}`).reverse()
+            .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module' : ''}`)
+            .reverse()
             .map((token) => {
-            const { type, parentNode, firstChild, lastChild, childNodes } = token, { name, tag } = parentNode;
+            const { type, parentNode, firstChild, lastChild, childNodes, length } = token, { name, tag } = parentNode;
             if (!(type !== 'attr-value'
                 || name === 'src' && ['templatestyles', 'img'].includes(tag)
                 || name === 'cite' && ['blockquote', 'del', 'ins', 'q'].includes(tag))
@@ -520,7 +563,9 @@ class LanguageService {
                 return false;
             }
             let target = childNodes.filter((node) => node.type === 'text')
-                .map(({ data }) => data).join('').trim();
+                .map(({ data }) => data)
+                .join('')
+                .trim();
             if (!target) {
                 return false;
             }
@@ -554,7 +599,8 @@ class LanguageService {
                     else if (type === 'invoke-module') {
                         ns = 828;
                     }
-                    const title = index_1.default.normalizeTitle(target, ns);
+                    const title = index_1.default
+                        .normalizeTitle(target, ns, false, undefined, true);
                     /* istanbul ignore if */
                     if (!title.valid) {
                         return false;
@@ -566,7 +612,7 @@ class LanguageService {
                 }
                 target = new URL(target).href;
                 if (type === 'image-parameter') {
-                    const { top, left, height, width } = lastChild.getBoundingClientRect(), rect = firstChild.getBoundingClientRect();
+                    const rect = firstChild.getBoundingClientRect(), { top, left, height, width } = length === 1 ? rect : lastChild.getBoundingClientRect();
                     return {
                         range: {
                             start: { line: rect.top, character: rect.left },
@@ -580,15 +626,17 @@ class LanguageService {
             catch {
                 return false;
             }
-        }).filter(Boolean);
+        })
+            .filter(Boolean);
     }
     /**
+     * Provide references
+     *
      * 提供引用
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      * @param position 位置
      */
     async provideReferences(text, position) {
-        this.#checkSignature();
         const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0 && (element.type === 'ext-attr-dirty' || element.type === 'html-attr-dirty')
             ? element.parentNode.parentNode
             : element, { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
@@ -597,41 +645,41 @@ class LanguageService {
         }
         const name = getName(node), refs = root.querySelectorAll(type === 'heading-title' ? 'heading' : type).filter(token => type === 'attr-value'
             ? getRefName(token) === refName || getRefGroup(token) === refGroup
-            : getName(token) === name).map((token) => ({
+            : getName(token) === name).reverse().map((token) => ({
             range: createNodeRange(token.type === 'parameter-key' ? token.parentNode : token),
         }));
         return refs.length === 0 ? undefined : refs;
     }
     /**
+     * Provide definitions
+     *
      * 提供定义
-     * @param text 源代码
-     * @param pos 位置
-     * @param pos.line 行号
-     * @param pos.character 列号
+     * @param text source Wikitext / 源代码
+     * @param position 位置
      */
-    async provideDefinition(text, { line, character }) {
-        this.#checkSignature();
-        const root = await this.#queue(text), node = root.elementFromPoint(character, line), ext = node.is('ext') && node.name === 'ref' ? node : node.closest('ext#ref'), refName = getRefTagAttr(ext, 'name');
+    async provideDefinition(text, position) {
+        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), ext = node.is('ext') && node.name === 'ref'
+            ? node
+            : node.closest('ext#ref'), refName = getRefTagAttr(ext, 'name');
         if (!refName) {
             return undefined;
         }
         const refGroup = getRefTagAttr(ext, 'group'), refs = root.querySelectorAll('ext#ref').filter(token => token.innerText
             && getRefTagAttr(token, 'name') === refName
-            && getRefTagAttr(token, 'group') === refGroup).map(({ lastChild }) => ({
+            && getRefTagAttr(token, 'group') === refGroup).reverse().map(({ lastChild }) => ({
             range: createNodeRange(lastChild),
         }));
         return refs.length === 0 ? undefined : refs;
     }
     /**
+     * Provide locations for renaming
+     *
      * 提供变量更名准备
-     * @param text 源代码
-     * @param pos 位置
-     * @param pos.line 行号
-     * @param pos.character 列号
+     * @param text source Wikitext / 源代码
+     * @param position 位置
      */
-    async resolveRenameLocation(text, { line, character }) {
-        this.#checkSignature();
-        const root = await this.#queue(text), node = root.elementFromPoint(character, line), { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
+    async resolveRenameLocation(text, position) {
+        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
         return !refName && !refGroup && (!renameTypes.has(type)
             || type === 'parameter-key' && /^[1-9]\d*$/u.test(node.parentNode.name)
             || type === 'link-target' && !['link', 'redirect-target'].includes(node.parentNode.type))
@@ -639,16 +687,15 @@ class LanguageService {
             : createNodeRange(node);
     }
     /**
+     * Provide rename edits
+     *
      * 变量更名
-     * @param text 源代码
-     * @param pos 位置
-     * @param pos.line 行号
-     * @param pos.character 列号
-     * @param newName 新名称
+     * @param text source Wikitext / 源代码
+     * @param position 位置
+     * @param newName new name / 新名称
      */
-    async provideRenameEdits(text, { line, character }, newName) {
-        this.#checkSignature();
-        const root = await this.#queue(text), node = root.elementFromPoint(character, line), { type } = node, refName = getRefName(node), refNameGroup = refName && getRefTagAttr(node.parentNode.parentNode, 'group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
+    async provideRenameEdits(text, position, newName) {
+        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), { type } = node, refName = getRefName(node), refNameGroup = refName && getRefTagAttr(node.parentNode.parentNode, 'group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
             const { type: t } = token.parentNode;
             if (type === 'link-target' && t !== 'link' && t !== 'redirect-target') {
                 return false;
@@ -663,7 +710,7 @@ class LanguageService {
             ? undefined
             : {
                 changes: {
-                    '': refs.map((ref) => ({
+                    '': refs.reverse().map((ref) => ({
                         range: createNodeRange(ref),
                         newText: newName,
                     })),
@@ -675,11 +722,14 @@ class LanguageService {
      * @param name 函数名
      */
     #getParserFunction(name) {
-        return this.data.parserFunctions.find(({ aliases }) => aliases.some(alias => alias.replace(/^#/u, '') === name));
+        return this.data.parserFunctions
+            .find(({ aliases }) => aliases.some(alias => alias.replace(/^#/u, '') === name));
     }
     /**
+     * Provide hover information
+     *
      * 提供悬停信息
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      * @param position 位置
      */
     async provideHover(text, position) {
@@ -687,20 +737,17 @@ class LanguageService {
         if (!this.data) {
             return undefined;
         }
-        this.#checkSignature();
         const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, position), token = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, { type, parentNode, length, name } = token;
         let info, f, range;
-        if (token.is('double-underscore')) {
-            if (offset === 0 && token.getBoundingClientRect().left > position.character) {
-                return undefined;
-            }
+        if (token.is('double-underscore') && offset > 0) {
             info = this.data.behaviorSwitches.find(({ aliases }) => aliases.includes(token.innerText.toLowerCase()));
         }
         else if (type === 'magic-word-name') {
             info = this.#getParserFunction(parentNode.name);
             f = token.toString(true).trim();
         }
-        else if (token.is('magic-word') && length === 1 && !token.modifier) {
+        else if (token.is('magic-word') && !token.modifier && length === 1
+            && (offset > 0 || token.getBoundingClientRect().left === position.character)) {
             info = this.#getParserFunction(name);
             f = token.firstChild.toString(true).trim();
         }
@@ -728,21 +775,18 @@ class LanguageService {
         };
     }
     /**
+     * Provide signature help for magic words
+     *
      * 提供魔术字帮助
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      * @param position 位置
      */
     async provideSignatureHelp(text, position) {
         /* istanbul ignore next */
         if (!this.data) {
             return undefined;
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         }
-        else if (this.#text !== undefined && !this.#signature) {
-            throw new Error('This is a regular language server!');
-        }
-        this.#signature = true;
-        const { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], { lastChild } = await this.#queue(`${curLine.slice(0, character + /^[^{}<]*/u.exec(curLine.slice(character))[0].length)}}}`);
+        const { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], { lastChild } = await this.#queueSignature(`${curLine.slice(0, character + /^[^{}<]*/u.exec(curLine.slice(character))[0].length)}}}`);
         if (!lastChild.is('magic-word') || lastChild.length === 1) {
             return undefined;
         }
@@ -779,16 +823,18 @@ class LanguageService {
         };
     }
     /**
+     * Provide CodeLens
+     *
      * 提供 CodeLens
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      */
     async provideInlayHints(text) {
-        this.#checkSignature();
         const hints = [], root = await this.#queue(text);
-        for (const template of root.querySelectorAll('template,magic-word#invoke')) {
-            const { type, childNodes } = template;
+        for (const token of root.querySelectorAll('template,magic-word#invoke').reverse()) {
+            const { type, childNodes } = token;
             hints.push(...childNodes.slice(type === 'template' ? 1 : 3).filter(({ anon }) => anon)
-                .reverse().map((parameter) => ({
+                .reverse()
+                .map((parameter) => ({
                 position: positionAt(root, parameter.getAbsoluteIndex()),
                 label: `${parameter.name}=`,
                 kind: 2,
@@ -797,7 +843,12 @@ class LanguageService {
         return hints;
     }
     /* NOT FOR BROWSER ONLY */
-    /** @implements */
+    /**
+     * Provide quick fixes
+     *
+     * 提供快速修复建议
+     * @param diagnostics grammar diagnostics / 语法诊断信息
+     */
     // eslint-disable-next-line @typescript-eslint/class-methods-use-this
     provideCodeAction(diagnostics) {
         return diagnostics.flatMap(diagnostic => diagnostic.data.map((data) => ({
@@ -811,44 +862,42 @@ class LanguageService {
         })));
     }
     /**
+     * Provide document sections
+     *
      * 提供章节
-     * @param text 源代码
+     * @param text source Wikitext / 源代码
      */
     async provideDocumentSymbols(text) {
-        this.#checkSignature();
         const root = await this.#queue(text), lines = root.getLines(), { length } = lines, symbols = [], names = new Set(), sections = new Array(6), tokens = root.querySelectorAll('heading-title');
         for (const token of [...tokens].reverse()) { // 提高 getBoundingClientRect 的性能
             token.getRelativeIndex();
         }
         for (const token of tokens) {
-            const { top, height, left, width } = token.getBoundingClientRect();
-            if (token.type === 'heading-title') {
-                const { level } = token.parentNode;
-                for (let i = level - 1; i < 6; i++) {
-                    getSectionEnd(sections[i], lines, top - 1);
-                    sections[i] = undefined;
-                }
-                const section = token.text().trim() || ' ', name = names.has(section)
-                    ? new Array(names.size).fill('').map((_, i) => `${section.trim()}_${i + 2}`)
-                        .find(s => !names.has(s))
-                    : section, container = sections.slice(0, level - 1).reverse().find(Boolean), selectionRange = {
-                    start: { line: top, character: left - level },
-                    end: (0, lint_1.getEndPos)(top, left, height, width + level),
-                }, info = {
-                    name,
-                    kind: 15,
-                    range: { start: selectionRange.start },
-                    selectionRange,
-                };
-                names.add(name);
-                sections[level - 1] = info;
-                if (container) {
-                    container.children ??= [];
-                    container.children.push(info);
-                }
-                else {
-                    symbols.push(info);
-                }
+            const { top, height, left, width } = token.getBoundingClientRect(), { level } = token.parentNode;
+            for (let i = level - 1; i < 6; i++) {
+                getSectionEnd(sections[i], lines, top - 1);
+                sections[i] = undefined;
+            }
+            const section = token.text().trim() || ' ', name = names.has(section)
+                ? new Array(names.size).fill('').map((_, i) => `${section.trim()}_${i + 2}`)
+                    .find(s => !names.has(s))
+                : section, container = sections.slice(0, level - 1).reverse().find(Boolean), selectionRange = {
+                start: { line: top, character: left - level },
+                end: (0, lint_1.getEndPos)(top, left, height, width + level),
+            }, info = {
+                name,
+                kind: 15,
+                range: { start: selectionRange.start },
+                selectionRange,
+            };
+            names.add(name);
+            sections[level - 1] = info;
+            if (container) {
+                container.children ??= [];
+                container.children.push(info);
+            }
+            else {
+                symbols.push(info);
             }
         }
         for (const section of sections) {