wikilint 2.22.0 → 2.22.1

package/config/default.json

@@ -567,6 +567,7 @@
 		"translation",
 		"chart",
 		"avatar",
+		"img",
 		"mentor"
 	],
 	"variable": [
@@ -936,6 +937,7 @@
 			"#头像": "avatar",
 			"#頭像": "avatar",
 			"#avatar": "avatar",
+			"#img": "img",
 			"wb報表名稱": "wbreponame",
 			"wb报告名": "wbreponame",
 			"wbreponame": "wbreponame"

package/config/minimum.json

@@ -172,6 +172,7 @@
 			"#useliquidthreads": "useliquidthreads",
 			"#lqtpagelimit": "lqtpagelimit",
 			"#avatar": "avatar",
+			"#img": "img",
 			"#chart": "chart"
 		},
 		{

package/config/moegirl.json

@@ -396,6 +396,7 @@
 		"vardefine",
 		"vardefineecho",
 		"invoke",
+		"img",
 		"related"
 	],
 	"variable": [
@@ -629,6 +630,7 @@
 			"样式路径": "stylepath",
 			"stylepath": "stylepath",
 			"msgnw": "msgnw",
+			"#img": "img",
 			"#related": "related"
 		},
 		{

package/dist/lib/document.js

@@ -111,7 +111,7 @@ class EmbeddedDocument {
         this.languageId = id;
         this.lineCount = root.getLines().length;
         this.#root = root;
-        this.#content = String(token);
+        this.#content = token.toString();
         this.#offset = token.getAbsoluteIndex();
         this.pre = pre;
         this.#post = post;

package/dist/lib/element.js

@@ -115,9 +115,9 @@ class AstElement extends node_1.AstNode {
     /**
      * 符合条件的所有后代节点
      * @param condition 条件
+     * @param descendants 已经找到的后代节点
      */
-    #getElementsBy(condition) {
-        let descendants = [];
+    #getElementsBy(condition, descendants = []) {
         for (const child of this.childNodes) {
             if (child.type === 'text') {
                 continue;
@@ -125,7 +125,7 @@ class AstElement extends node_1.AstNode {
             else if (condition(child)) {
                 descendants.push(child);
             }
-            descendants = [...descendants, ...child.#getElementsBy(condition)];
+            child.#getElementsBy(condition, descendants);
         }
         return descendants;
     }

package/dist/lib/lsp.js

@@ -223,14 +223,16 @@ const adjustPos = (height, width, line, column) => {
  * Get the position of a Stylelint error.
  * @param rect bounding client rect of the token
  * @param bottom bottom of the style block
- * @param line line number
- * @param column column number
+ * @param lineOrCode line number or code string
+ * @param columnOrOffset column number or offset in the code string
  */
-const getStylelintPos = (rect, bottom, line, column) => {
+const getStylelintPos = (rect, bottom, lineOrCode, columnOrOffset) => {
     const { top, left, height, width } = rect, start = bottom - height - 1;
-    line -= start;
-    [line, column] = adjustPos(height, width, line, column);
-    return (0, lint_1.getEndPos)(top, left, line, column);
+    if (typeof lineOrCode === 'number') {
+        return (0, lint_1.getEndPos)(top, left, ...adjustPos(height, width, lineOrCode - start, columnOrOffset));
+    }
+    const lines = lineOrCode.slice(0, columnOrOffset).split(/\r?\n/u);
+    return getStylelintPos(rect, bottom, lines.length, lines.at(-1).length);
 };
 /**
  * Convert LilyPond errors to VSCode diagnostics.
@@ -756,7 +758,7 @@ class LanguageService {
                 if (tokens.length === 0) {
                     return [];
                 }
-                const cssErrors = await (0, stylelint_util_1.styleLint)((await document_1.stylelint), tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssRules);
+                const code = tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssErrors = await (0, stylelint_util_1.styleLint)((await document_1.stylelint), code, cssRules);
                 if (cssErrors.length === 0) {
                     return [];
                 }
@@ -766,7 +768,7 @@ class LanguageService {
                     acc += height + 2;
                     return acc;
                 });
-                return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, }) => {
+                return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, fix, }) => {
                     const i = bottoms.findIndex(bottom => bottom >= line);
                     return {
                         range: {
@@ -777,6 +779,21 @@ class LanguageService {
                         source: 'Stylelint',
                         code: rule,
                         message: msg.slice(0, msg.lastIndexOf('(') - 1),
+                        ...fix
+                            ? {
+                                data: [
+                                    {
+                                        range: {
+                                            start: getStylelintPos(rects[i], bottoms[i], code, fix.range[0]),
+                                            end: getStylelintPos(rects[i], bottoms[i], code, fix.range[1]),
+                                        },
+                                        newText: fix.text,
+                                        title: `Fix: ${rule}`,
+                                        fix: true,
+                                    },
+                                ],
+                            }
+                            : {},
                     };
                 });
             })() :

package/dist/parser/selector.js

@@ -9,8 +9,8 @@ exports.getCondition = void 0;
  */
 const basic = (selector, type, name) => {
     if (selector.includes('#')) {
-        const [t, ...names] = selector.split('#');
-        return (!t || t === type) && names.every(n => n === name);
+        const i = selector.indexOf('#');
+        return (i === 0 || selector.slice(0, i) === type) && selector.slice(i + 1) === name;
     }
     return !selector || selector === type;
 };
@@ -20,5 +20,8 @@ const basic = (selector, type, name) => {
  * @param scope 作用对象
  * @param has `:has()`伪选择器
  */
-const getCondition = (selector, scope, has) => (({ type, name }) => selector.split(',').some(str => basic(str.trim(), type, name)));
+const getCondition = (selector, scope, has) => {
+    const parts = selector.split(',');
+    return (({ type, name }) => parts.some(str => basic(str.trim(), type, name)));
+};
 exports.getCondition = getCondition;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.22.0",
+	"version": "2.22.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -80,7 +80,7 @@
 		"entities": "^6.0.0",
 		"mathjax": "^3.2.2",
 		"minimatch": "^10.0.1",
-		"stylelint": "^16.21.1",
+		"stylelint": "^16.22.0",
 		"vscode-css-languageservice": "^6.3.7",
 		"vscode-html-languageservice": "^5.5.1",
 		"vscode-json-languageservice": "^5.6.1"