prettier-plugin-wolfram 0.7.3 → 0.7.4

package/README.md

@@ -210,6 +210,8 @@ The package also exposes a small rule runner:
 npx prettier-wolfram lint "src/**/*.wl"
 ```
 
+Matched directories and non-Wolfram file extensions are skipped.
+
 It prints diagnostics as:
 
 ```text
@@ -263,12 +265,12 @@ npm run publish:vscode:pre-release
 The extension README with editor setup, settings, diagnostics, and file
 association behavior lives at `vscode-extension/README.md`.
 
-## Publishing To Verdaccio
+## Publishing To npm
 
 Log in:
 
 ```bash
-npm login --registry http://localhost:4873
+npm login
 ```
 
 Preview package contents:
@@ -280,11 +282,11 @@ npm pack --dry-run
 Publish:
 
 ```bash
-npm publish --registry http://localhost:4873
+npm publish
 ```
 
 Verify:
 
 ```bash
-npm view prettier-plugin-wolfram --registry http://localhost:4873
+npm view prettier-plugin-wolfram
 ```

package/bin/prettier-wolfram-lsp.js

@@ -0,0 +1,128 @@
+#!/usr/bin/env node
+// bin/prettier-wolfram-lsp.js
+// Minimal LSP server that publishes prettier-wolfram lint diagnostics over stdio.
+
+import { WolframParser } from "../src/parser/index.js";
+import { runRules } from "../src/rules/index.js";
+import { buildOffsetTable, addOffsets } from "../src/utils/offsets.js";
+
+const parser = new WolframParser();
+
+// ── LSP framing ──────────────────────────────────────────────────────────────
+
+let inputBuf = "";
+
+process.stdin.setEncoding("utf8");
+process.stdin.on("data", (chunk) => {
+	inputBuf += chunk;
+	drainBuffer();
+});
+
+function drainBuffer() {
+	while (true) {
+		const sep = inputBuf.indexOf("\r\n\r\n");
+		if (sep === -1) break;
+		const header = inputBuf.slice(0, sep);
+		const m = header.match(/Content-Length:\s*(\d+)/i);
+		if (!m) { inputBuf = inputBuf.slice(sep + 4); continue; }
+		const len = parseInt(m[1], 10);
+		const bodyStart = sep + 4;
+		if (inputBuf.length < bodyStart + len) break;
+		const body = inputBuf.slice(bodyStart, bodyStart + len);
+		inputBuf = inputBuf.slice(bodyStart + len);
+		try { dispatch(JSON.parse(body)); } catch {}
+	}
+}
+
+function send(obj) {
+	const body = JSON.stringify(obj);
+	process.stdout.write(`Content-Length: ${Buffer.byteLength(body, "utf8")}\r\n\r\n${body}`);
+}
+
+const reply  = (id, result) => send({ jsonrpc: "2.0", id, result });
+const notify = (method, params) => send({ jsonrpc: "2.0", method, params });
+
+// ── Lint ─────────────────────────────────────────────────────────────────────
+
+const docs   = new Map(); // uri → text
+const timers = new Map(); // uri → debounce timer
+
+function scheduleLint(uri) {
+	if (timers.has(uri)) clearTimeout(timers.get(uri));
+	timers.set(uri, setTimeout(async () => {
+		timers.delete(uri);
+		const source = docs.get(uri);
+		if (source == null) return;
+		try {
+			const cst  = await parser.getCST(source);
+			const table = buildOffsetTable(source);
+			addOffsets(cst, table);
+			const issues = await runRules(cst, {});
+
+			const diagnostics = issues.map((d) => {
+				const [start, end] = d.node?.source ?? [[1, 1], [1, 1]];
+				return {
+					range: {
+						start: { line: start[0] - 1, character: start[1] - 1 },
+						end:   { line: end[0]   - 1, character: end[1]   - 1 },
+					},
+					severity: d.level === "error" ? 1 : 2,
+					source:   "prettier-wolfram",
+					code:     d.rule,
+					message:  d.message,
+				};
+			});
+
+			notify("textDocument/publishDiagnostics", { uri, diagnostics });
+		} catch {
+			notify("textDocument/publishDiagnostics", { uri, diagnostics: [] });
+		}
+	}, 200));
+}
+
+// ── Dispatch ─────────────────────────────────────────────────────────────────
+
+function dispatch(msg) {
+	const { method, id, params } = msg;
+
+	switch (method) {
+		case "initialize":
+			reply(id, {
+				capabilities: {
+					textDocumentSync: { openClose: true, change: 1 },
+				},
+				serverInfo: { name: "prettier-wolfram-ls", version: "0.1.0" },
+			});
+			break;
+
+		case "initialized":
+			break;
+
+		case "textDocument/didOpen":
+			docs.set(params.textDocument.uri, params.textDocument.text);
+			scheduleLint(params.textDocument.uri);
+			break;
+
+		case "textDocument/didChange":
+			docs.set(params.textDocument.uri, params.contentChanges[0].text);
+			scheduleLint(params.textDocument.uri);
+			break;
+
+		case "textDocument/didClose":
+			docs.delete(params.textDocument.uri);
+			notify("textDocument/publishDiagnostics", { uri: params.textDocument.uri, diagnostics: [] });
+			break;
+
+		case "shutdown":
+			reply(id, null);
+			break;
+
+		case "exit":
+			process.exit(0);
+			break;
+
+		default:
+			if (id != null)
+				send({ jsonrpc: "2.0", id, error: { code: -32601, message: "Method not found" } });
+	}
+}

package/bin/prettier-wolfram.js

@@ -2,12 +2,23 @@
 // bin/prettier-wolfram.js
 // Usage: prettier-wolfram lint [options] <glob...>
 
-import { readFileSync } from "fs";
+import { readFileSync, statSync } from "fs";
 import { globSync } from "fs";
+import { extname } from "path";
 import { WolframParser } from "../src/parser/index.js";
 import { runRules } from "../src/rules/index.js";
 import { buildOffsetTable, addOffsets } from "../src/utils/offsets.js";
 
+const WOLFRAM_EXTENSIONS = new Set([
+	".wl",
+	".wls",
+	".wlt",
+	".mt",
+	".m",
+	".vsnb",
+	".nb",
+]);
+
 const [, , command, ...args] = process.argv;
 
 if (command !== "lint") {
@@ -31,8 +42,14 @@ let totalDiagnostics = 0;
 for (const pattern of args) {
 	const files = globSync(pattern, { absolute: true });
 	for (const file of files) {
-		const source = readFileSync(file, "utf8");
 		try {
+			if (
+				!statSync(file).isFile() ||
+				!WOLFRAM_EXTENSIONS.has(extname(file).toLowerCase())
+			) {
+				continue;
+			}
+			const source = readFileSync(file, "utf8");
 			const cst = await parser.getCST(source);
 			const table = buildOffsetTable(source);
 			addOffsets(cst, table);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "prettier-plugin-wolfram",
-	"version": "0.7.3",
+	"version": "0.7.4",
 	"description": "Prettier plugin for Wolfram Language using tree-sitter",
 	"license": "MIT",
 	"repository": {
@@ -21,7 +21,8 @@
 		".": "./src/index.js"
 	},
 	"bin": {
-		"prettier-wolfram": "bin/prettier-wolfram.js"
+		"prettier-wolfram": "bin/prettier-wolfram.js",
+		"prettier-wolfram-lsp": "bin/prettier-wolfram-lsp.js"
 	},
 	"files": [
 		"bin/",

package/src/translator/nodes/binary.js

@@ -163,7 +163,7 @@ export function printBinary(node, options, print) {
 	const rhsWillBreak =
 		isMultilineStringLeaf(rhs, rhsDoc) || isMultilineStringJoin(rhs);
 
-	if (node.op === "BinaryAt" || node.op === "BinarySlashSlash") {
+	if (node.op === "BinaryAt") {
 		return group([
 			lhsDoc,
 			`${gap}${opStr}`,
@@ -172,6 +172,14 @@ export function printBinary(node, options, print) {
 		]);
 	}
 
+	if (node.op === "BinarySlashSlash") {
+		return group([
+			lhsDoc,
+			`${gap}${opStr}`,
+			indent([space ? line : softline, rhsDoc]),
+		]);
+	}
+
 	if (!space) {
 		if (rhsWillBreak) {
 			return group([lhsDoc, opStr, indent([line, rhsDoc])]);