rintenki-lsp-server 0.0.0 → 0.2.0

package/dist/server.js

@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_js_1 = require("vscode-languageserver/node.js");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const rintenki_1 = require("rintenki");
+let loadParser;
+try {
+    loadParser = require("@rintenki/parser-utils").loadParser;
+}
+catch {
+    loadParser = () => undefined;
+}
 const connection = (0, node_js_1.createConnection)(node_js_1.ProposedFeatures.all);
 const documents = new node_js_1.TextDocuments(vscode_languageserver_textdocument_1.TextDocument);
 let config;
@@ -60,12 +67,34 @@ function toLspDiagnostic(d) {
         data: { fixable: d.fixable },
     };
 }
+const SUPPORTED_LANGUAGES = ["html", "vue", "erb", "javascriptreact", "typescriptreact"];
 function validateDocument(document) {
-    if (document.languageId !== "html") {
+    if (!SUPPORTED_LANGUAGES.includes(document.languageId)) {
         return;
     }
-    const text = document.getText();
+    let text = document.getText();
+    let lineOffset = 0;
+    // Preprocess non-HTML files
+    const uri = document.uri;
+    const filePath = uri.startsWith("file://") ? decodeURIComponent(uri.slice(7)) : uri;
+    const parser = loadParser(filePath);
+    if (parser) {
+        const preprocessed = parser.preprocess(text);
+        text = preprocessed.html;
+        lineOffset = preprocessed.lineOffset;
+        if (!text) {
+            connection.sendDiagnostics({ uri: document.uri, diagnostics: [] });
+            return;
+        }
+    }
     const result = (0, rintenki_1.lint)(text, config);
+    // Remap line numbers
+    if (lineOffset > 0) {
+        for (const d of result.diagnostics) {
+            if (d.line != null)
+                d.line += lineOffset;
+        }
+    }
     const diagnostics = result.diagnostics.map(toLspDiagnostic);
     connection.sendDiagnostics({ uri: document.uri, diagnostics });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rintenki-lsp-server",
-  "version": "0.0.0",
+  "version": "0.2.0",
   "description": "LSP server for rintenki HTML linter",
   "author": "Kazuhiro Kobayashi <https://github.com/kzhrk>",
   "license": "MIT",
@@ -20,10 +20,13 @@
     "language-server"
   ],
   "main": "dist/server.js",
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-textdocument": "1.0.12",
-    "rintenki": "0.0.0"
+    "rintenki": "0.2.0"
   },
   "devDependencies": {
     "typescript": "6.0.2"

package/src/server.ts

@@ -1,138 +0,0 @@
-import {
-  createConnection,
-  TextDocuments,
-  ProposedFeatures,
-  InitializeParams,
-  InitializeResult,
-  TextDocumentSyncKind,
-  Diagnostic,
-  DiagnosticSeverity,
-  CodeAction,
-  CodeActionKind,
-  TextEdit,
-  CodeActionParams,
-} from "vscode-languageserver/node.js";
-import { TextDocument } from "vscode-languageserver-textdocument";
-import { lint, fix, type LintConfig, type LintDiagnostic } from "rintenki";
-
-const connection = createConnection(ProposedFeatures.all);
-const documents = new TextDocuments(TextDocument);
-
-let config: LintConfig | undefined;
-
-connection.onInitialize((_params: InitializeParams): InitializeResult => {
-  return {
-    capabilities: {
-      textDocumentSync: TextDocumentSyncKind.Full,
-      codeActionProvider: {
-        codeActionKinds: [CodeActionKind.QuickFix],
-      },
-    },
-  };
-});
-
-connection.onInitialized(() => {
-  connection.workspace.getConfiguration("rintenki").then(
-    (settings) => {
-      if (settings?.rules) {
-        config = { rules: settings.rules };
-      }
-    },
-    () => {
-      // Configuration not available, use defaults
-    }
-  );
-});
-
-connection.onDidChangeConfiguration((_change) => {
-  connection.workspace.getConfiguration("rintenki").then(
-    (settings) => {
-      if (settings?.rules) {
-        config = { rules: settings.rules };
-      } else {
-        config = undefined;
-      }
-      documents.all().forEach(validateDocument);
-    },
-    () => {
-      // Configuration not available, use defaults
-    }
-  );
-});
-
-documents.onDidChangeContent((change) => {
-  validateDocument(change.document);
-});
-
-function toDiagnosticSeverity(severity: string): DiagnosticSeverity {
-  return severity === "error"
-    ? DiagnosticSeverity.Error
-    : DiagnosticSeverity.Warning;
-}
-
-function toLspDiagnostic(d: LintDiagnostic): Diagnostic {
-  const line = Math.max((d.line ?? 1) - 1, 0);
-  return {
-    range: {
-      start: { line, character: 0 },
-      end: { line, character: Number.MAX_SAFE_INTEGER },
-    },
-    severity: toDiagnosticSeverity(d.severity),
-    source: "rintenki",
-    code: d.rule,
-    message: d.message,
-    data: { fixable: d.fixable },
-  };
-}
-
-function validateDocument(document: TextDocument): void {
-  if (document.languageId !== "html") {
-    return;
-  }
-
-  const text = document.getText();
-  const result = lint(text, config);
-  const diagnostics = result.diagnostics.map(toLspDiagnostic);
-  connection.sendDiagnostics({ uri: document.uri, diagnostics });
-}
-
-connection.onCodeAction((params: CodeActionParams): CodeAction[] => {
-  const document = documents.get(params.textDocument.uri);
-  if (!document) return [];
-
-  const fixableDiagnostics = params.context.diagnostics.filter(
-    (d) => d.source === "rintenki" && (d.data as any)?.fixable
-  );
-
-  if (fixableDiagnostics.length === 0) return [];
-
-  const text = document.getText();
-  const fixResult = 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: CodeActionKind.QuickFix,
-      diagnostics: fixableDiagnostics,
-      edit: {
-        changes: {
-          [params.textDocument.uri]: [
-            TextEdit.replace(
-              {
-                start: { line: 0, character: 0 },
-                end: { line: lastLine, character: Number.MAX_SAFE_INTEGER },
-              },
-              fixResult.output
-            ),
-          ],
-        },
-      },
-    },
-  ];
-});
-
-documents.listen(connection);
-connection.listen();

package/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "outDir": "dist",
-    "rootDir": "src",
-    "strict": true,
-    "esModuleInterop": true,
-    "declaration": true,
-    "skipLibCheck": true
-  },
-  "include": ["src"],
-  "exclude": ["node_modules", "dist"]
-}