rintenki-lsp-server 0.2.0 → 0.4.0

package/dist/server.js

@@ -28,6 +28,8 @@ connection.onInitialized(() => {
         if (settings?.rules) {
             config = { rules: settings.rules };
         }
+        // Re-validate all open documents after config is loaded
+        documents.all().forEach(validateDocument);
     }, () => {
         // Configuration not available, use defaults
     });
@@ -55,19 +57,31 @@ function toDiagnosticSeverity(severity) {
 }
 function toLspDiagnostic(d) {
     const line = Math.max((d.line ?? 1) - 1, 0);
+    const startChar = d.col ?? 0;
+    const endLine = d.endLine != null ? Math.max(d.endLine - 1, 0) : line;
+    const endChar = d.endCol ?? Number.MAX_SAFE_INTEGER;
     return {
         range: {
-            start: { line, character: 0 },
-            end: { line, character: Number.MAX_SAFE_INTEGER },
+            start: { line, character: startChar },
+            end: { line: endLine, character: endChar },
         },
         severity: toDiagnosticSeverity(d.severity),
         source: "rintenki",
         code: d.rule,
-        message: d.message,
+        message: d.hint ? `${d.message}\nhint: ${d.hint}` : d.message,
         data: { fixable: d.fixable },
     };
 }
 const SUPPORTED_LANGUAGES = ["html", "vue", "erb", "javascriptreact", "typescriptreact"];
+const FIXABLE_RULES = [
+    "case-sensitive-tag-name",
+    "case-sensitive-attr-name",
+    "attr-value-quotes",
+    "no-boolean-attr-value",
+    "no-default-value",
+    "character-reference",
+    "doctype",
+];
 function validateDocument(document) {
     if (!SUPPORTED_LANGUAGES.includes(document.languageId)) {
         return;
@@ -93,6 +107,8 @@ function validateDocument(document) {
         for (const d of result.diagnostics) {
             if (d.line != null)
                 d.line += lineOffset;
+            if (d.endLine != null)
+                d.endLine += lineOffset;
         }
     }
     const diagnostics = result.diagnostics.map(toLspDiagnostic);
@@ -106,27 +122,51 @@ connection.onCodeAction((params) => {
     if (fixableDiagnostics.length === 0)
         return [];
     const text = document.getText();
-    const fixResult = (0, rintenki_1.fix)(text, config);
-    if (fixResult.fixedCount === 0)
-        return [];
     const lastLine = Math.max(document.lineCount - 1, 0);
-    return [
-        {
-            title: "Fix all auto-fixable rintenki issues",
-            kind: node_js_1.CodeActionKind.QuickFix,
-            diagnostics: fixableDiagnostics,
-            edit: {
-                changes: {
-                    [params.textDocument.uri]: [
-                        node_js_1.TextEdit.replace({
-                            start: { line: 0, character: 0 },
-                            end: { line: lastLine, character: Number.MAX_SAFE_INTEGER },
-                        }, fixResult.output),
-                    ],
+    const fullRange = {
+        start: { line: 0, character: 0 },
+        end: { line: lastLine, character: Number.MAX_SAFE_INTEGER },
+    };
+    const actions = [];
+    // Per-rule Quick Fix actions
+    const ruleNames = [...new Set(fixableDiagnostics.map((d) => d.code))];
+    for (const rule of ruleNames) {
+        const ruleDiagnostics = fixableDiagnostics.filter((d) => d.code === rule);
+        // Create a config that only enables this specific rule for fixing
+        const ruleOnlyConfig = {
+            rules: Object.fromEntries(FIXABLE_RULES.map((r) => [r, r === rule ? (config?.rules?.[r] ?? true) : "off"])),
+        };
+        const fixResult = (0, rintenki_1.fix)(text, ruleOnlyConfig);
+        if (fixResult.fixedCount > 0) {
+            actions.push({
+                title: `Fix: ${rule}`,
+                kind: node_js_1.CodeActionKind.QuickFix,
+                diagnostics: ruleDiagnostics,
+                edit: {
+                    changes: {
+                        [params.textDocument.uri]: [node_js_1.TextEdit.replace(fullRange, fixResult.output)],
+                    },
                 },
-            },
-        },
-    ];
+            });
+        }
+    }
+    // Fix all action
+    if (ruleNames.length > 1) {
+        const fixResult = (0, rintenki_1.fix)(text, config);
+        if (fixResult.fixedCount > 0) {
+            actions.push({
+                title: "Fix all auto-fixable rintenki issues",
+                kind: node_js_1.CodeActionKind.QuickFix,
+                diagnostics: fixableDiagnostics,
+                edit: {
+                    changes: {
+                        [params.textDocument.uri]: [node_js_1.TextEdit.replace(fullRange, fixResult.output)],
+                    },
+                },
+            });
+        }
+    }
+    return actions;
 });
 documents.listen(connection);
 connection.listen();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rintenki-lsp-server",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "LSP server for rintenki HTML linter",
   "author": "Kazuhiro Kobayashi <https://github.com/kzhrk>",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "dependencies": {
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-textdocument": "1.0.12",
-    "rintenki": "0.2.0"
+    "rintenki": "0.4.0"
   },
   "devDependencies": {
     "typescript": "6.0.2"