prettier-plugin-wolfram 0.7.14 → 0.7.15

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "prettier-plugin-wolfram",
-	"version": "0.7.14",
+	"version": "0.7.15",
 	"description": "Prettier plugin for Wolfram Language using tree-sitter",
 	"license": "MIT",
 	"repository": {

package/src/translator/nodes/call.js

@@ -10,6 +10,7 @@ import {
 	withMarkedTrailingCommentDocs,
 } from "../docComments.js";
 import { normalizeWolframOptions } from "../../options.js";
+import { buildDispatchSets } from "../specialForms.js";
 const { group, indent, softline, line, hardline } = builders;
 
 const BRACKET_KINDS = new Set(["Token`OpenSquare", "Token`CloseSquare"]);
@@ -40,6 +41,24 @@ function hasCommentBoundary(leftEntry, rightEntry) {
 	return isComment(leftEntry?.node) || isComment(rightEntry?.node);
 }
 
+function callHeadName(node) {
+	return node.head?.type === "LeafNode" && node.head.kind === "Symbol"
+		? node.head.value
+		: null;
+}
+
+function shouldBreakCommentedSpecialCall(node, options, entries) {
+	if (!entries.some((entry) => isComment(entry.node))) return false;
+	const name = callHeadName(node);
+	if (!name) return false;
+	const sets = buildDispatchSets(options);
+	return (
+		sets.conditionFirst.has(name) ||
+		sets.blockStructure.has(name) ||
+		sets.caseStructure.has(name)
+	);
+}
+
 function commentBoundary(leftEntry, rightEntry, options, fallback = line) {
 	if (!leftEntry || !rightEntry) return fallback;
 	return commentBoundarySeparator(
@@ -321,5 +340,8 @@ export function printCall(path, options, print, node) {
 	);
 	const contents = [head, "[", indent([softline, ...docs]), softline, "]"];
 
-	return grouped(contents, alignmentGroupId);
+	const shouldBreak = shouldBreakCommentedSpecialCall(node, options, entries);
+	return alignmentGroupId
+		? group(contents, { id: alignmentGroupId, shouldBreak })
+		: group(contents, { shouldBreak });
 }

package/src/translator/specialForms.js

@@ -95,6 +95,10 @@ function isCommaToken(node) {
 	return node?.type === "LeafNode" && node.kind === "Token`Comma";
 }
 
+function isCommentNode(node) {
+	return node?.type === "LeafNode" && node.kind === "Token`Comment";
+}
+
 function isStringJoinOperatorToken(node) {
 	return node?.type === "LeafNode" && node.kind === "Token`LessGreater";
 }
@@ -459,7 +463,7 @@ function semanticGroupEntries(callNode, groupNode) {
 	) {
 		const commaWrapperIdx = groupNode.children.indexOf(semanticChildren[0]);
 		return semanticChildren[0].children.reduce((entries, child, idx) => {
-			if (isTrivia(child)) return entries;
+			if (isTrivia(child) || isCommentNode(child)) return entries;
 			if (child.type === "LeafNode" && child.kind === "Token`Comma")
 				return entries;
 			entries.push({
@@ -477,7 +481,7 @@ function semanticGroupEntries(callNode, groupNode) {
 	}
 
 	return (groupNode.children ?? []).reduce((entries, child, idx) => {
-		if (isTrivia(child)) return entries;
+		if (isTrivia(child) || isCommentNode(child)) return entries;
 		if (
 			child.type === "LeafNode" &&
 			(child.kind === "Token`OpenCurly" ||