prettier-java-next-line 2.10.3 → 2.10.4

package/README.md

@@ -1,99 +1,84 @@
 # Prettier Java Next Line
 
-Prettier Java Next Line is a fork of
-[prettier-plugin-java](https://github.com/jhipster/prettier-java) with
-configurable opening-brace placement. It defaults to Allman-style, next-line
-braces.
+Prettier Java Next Line forks [prettier-plugin-java](https://github.com/jhipster/prettier-java) to make brace placement configurable, with next-line braces as the default.
 
-The option was proposed upstream in
-[jhipster/prettier-java#840](https://github.com/jhipster/prettier-java/pull/840)
-and declined because upstream intentionally preserves one brace style.
+[Upstream declined the option](https://github.com/jhipster/prettier-java/pull/840) because Prettier Java intentionally supports one brace style.
 
-## Installation
+## Why next line is the default
 
-Use it with Prettier:
+Same-line formatting made sense on small, low-resolution CRT displays where every row counted.
 
-```bash
-npm install --save-dev prettier prettier-java-next-line
-```
+On a modern display, we would rather spend one extra line and see the shape of the block.
 
-Or use the matching Prettier Next Line fork through an npm alias:
+## Install
+
+Follow the [upstream instructions](https://github.com/jhipster/prettier-java#readme), replacing `prettier-plugin-java` with `prettier-java-next-line`:
 
 ```bash
-npm install --save-dev \
-  prettier@npm:prettier-next-line \
-  prettier-java-next-line
+npm install --save-dev prettier prettier-java-next-line
 ```
 
-## Configuration
-
 Load the plugin explicitly:
 
 ```json
 {
-  "plugins": ["prettier-java-next-line"]
+	"plugins": ["prettier-java-next-line"]
 }
 ```
 
-Next-line braces are the default. Use the inherited K&R placement when needed:
+Set `braceStyle` only when a project needs the inherited same-line style:
 
 ```json
 {
-  "plugins": ["prettier-java-next-line"],
-  "braceStyle": "same-line"
+	"plugins": ["prettier-java-next-line"],
+	"braceStyle": "same-line"
 }
 ```
 
+To use the matching Prettier runtime fork too, install it under the name `prettier` with an npm alias:
+
+```bash
+npm install --save-dev \
+	prettier@npm:prettier-next-line \
+	prettier-java-next-line
+```
+
 ## Spotless Maven
 
-Spotless loads a package named `prettier`, so install Prettier Next Line under
-that name with an npm alias:
+Spotless loads a package named `prettier`, so install Prettier Next Line under that name with an npm alias:
 
 ```xml
 <prettier>
-    <devDependencies>
-        <prettier>npm:prettier-next-line@3.10.0-dev</prettier>
-        <prettier-java-next-line>2.10.3-beta.1</prettier-java-next-line>
-    </devDependencies>
-    <configFile>.prettierrc.json5</configFile>
-    <config>
-        <parser>java</parser>
-        <plugins>prettier-java-next-line</plugins>
-    </config>
+	<devDependencies>
+		<prettier>npm:prettier-next-line@3.10.0</prettier>
+		<prettier-java-next-line>2.10.3</prettier-java-next-line>
+	</devDependencies>
+	<configFile>.prettierrc.json5</configFile>
+	<config>
+		<parser>java</parser>
+		<plugins>prettier-java-next-line</plugins>
+	</config>
 </prettier>
 ```
 
-## CLI
-
-With upstream Prettier:
-
-```bash
-npx prettier --check --plugin=prettier-java-next-line "**/*.java"
-npx prettier --write --plugin=prettier-java-next-line "**/*.java"
-```
-
-With the aliased Prettier Next Line fork, use `npx prettier-next-line` instead.
-
 ## Example
 
 ```java
 public class Example
 {
-    public void method()
-    {
-        if (condition)
-        {
-            doSomething();
-        }
-    }
+	public void method()
+	{
+		if (condition)
+		{
+			doSomething();
+		}
+	}
 }
 ```
 
 ## Upstream
 
-Prettier Java Next Line tracks
-[jhipster/prettier-java](https://github.com/jhipster/prettier-java) and keeps
-fork-specific behavior focused on brace placement.
+Except for brace placement, behavior comes from [Prettier Java](https://github.com/jhipster/prettier-java#readme).
 
 ## License
 

package/dist/index.cjs

@@ -125,6 +125,9 @@ function printComment(comment) {
 function hasLeadingComments(node) {
 	return node.comments?.some(({ leading }) => leading) ?? false;
 }
+function hasDanglingComments(node) {
+	return node.comments?.some(({ leading, trailing }) => !leading && !trailing) ?? false;
+}
 function indentInParentheses(contents) {
 	return contents && !Array.isArray(contents) || contents.length ? [
 		"(",
@@ -292,7 +295,7 @@ function printVariableDeclaration(path, print) {
 }
 function printAssignment(leftDoc, operator, rightDoc, rightNode) {
 	if (!rightDoc || !rightNode) return leftDoc;
-	if (rightNode.type === "binary_expression" || rightNode.type === "instanceof_expression" || rightNode.type === "ternary_expression" && (rightNode.conditionNode.type === "binary_expression" || rightNode.conditionNode.type === "instanceof_expression") || hasLeadingComments(rightNode)) return group$7([
+	if (rightNode.type === "binary_expression" || rightNode.type === "instanceof_expression" || rightNode.type === "ternary_expression" && (rightNode.conditionNode.type === "binary_expression" || rightNode.conditionNode.type === "instanceof_expression") || isMember(rightNode) && hasDanglingComments(rightNode) || !isMember(rightNode) && hasLeadingComments(rightNode)) return group$7([
 		leftDoc,
 		operator,
 		group$7(indent$7([line$7, rightDoc]))
@@ -463,9 +466,7 @@ function parentNeedsParentheses(path) {
 	const { parent } = path;
 	switch (parent?.type) {
 		case "return_statement":
-		case "throw_statement":
-			if (willReturnOrThrowStatementBreak(path)) return false;
-			break;
+		case "throw_statement": if (willReturnOrThrowStatementBreak(path)) return false;
 	}
 }
 function willReturnOrThrowStatementBreak(path) {
@@ -491,7 +492,7 @@ function findBaseIndent(lines) {
 	return Math.min(...lines.map((line) => line.search(/\S/)).filter((indent) => indent >= 0));
 }
 function findEmbeddedLanguage(path) {
-	return path.ancestors.find(({ type, comments }) => type === "block" || comments?.some(({ leading }) => leading))?.comments?.filter(({ leading }) => leading).map(({ value }) => value.match(/^(?:\/\/|\/\*)\s*language\s*=\s*(\S+)/)?.[1]).findLast((language) => language)?.toLowerCase();
+	return [path.node, ...path.ancestors].find(({ type, comments }) => type === "block" || comments?.some(({ leading }) => leading))?.comments?.filter(({ leading }) => leading).map(({ value }) => value.match(/^(?:\/\/|\/\*)\s*language\s*=\s*(\S+)/)?.[1]).findLast((language) => language)?.toLowerCase();
 }
 function escapeDocForTextBlock(doc) {
 	return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? currentDoc.replace(/\\|"""/g, (match) => match === "\\" ? "\\\\" : "\"\"\\\"") : currentDoc);
@@ -1453,7 +1454,7 @@ function shouldPrintParamsWithoutParens(path, options) {
 	return false;
 }
 function canPrintParamsWithoutParens(node) {
-	return node.parametersNode.type === "identifier" && !node.comments?.some(({ leading, trailing }) => !leading && !trailing) && !node.parametersNode.comments;
+	return node.parametersNode.type === "identifier" && !hasDanglingComments(node) && !node.parametersNode.comments;
 }
 function printMemberChain(path, print, options) {
 	const isExpressionStatement = path.parent?.type === "expression_statement";
@@ -1948,9 +1949,7 @@ var packages_and_modules_default = {
 					annotations.push(print(child));
 					break;
 				case "identifier":
-				case "scoped_identifier":
-					identifier.push(print(child));
-					break;
+				case "scoped_identifier": identifier.push(print(child));
 			}
 		}, "namedChildren");
 		return join$1(hardline$1, [...annotations, [
@@ -2281,9 +2280,10 @@ function handleLabeledStatementComments(commentNode) {
 function handleLambdaExpressionComments(commentNode) {
 	const { enclosingNode, precedingNode, followingNode } = commentNode;
 	if (enclosingNode?.type === "lambda_expression" && precedingNode && followingNode && enclosingNode.children.find(({ type }) => type === "->").end.index < commentNode.start.index) {
-		if (followingNode.type === "block") if (followingNode.namedChildren.length) prettier.util.addLeadingComment(followingNode.namedChildren[0], commentNode);
-		else prettier.util.addDanglingComment(followingNode, commentNode, void 0);
-		else prettier.util.addLeadingComment(followingNode, commentNode);
+		if (followingNode.type === "block") {
+			if (followingNode.namedChildren.length) prettier.util.addLeadingComment(followingNode.namedChildren[0], commentNode);
+			else prettier.util.addDanglingComment(followingNode, commentNode, void 0);
+		} else prettier.util.addLeadingComment(followingNode, commentNode);
 		return true;
 	}
 }
@@ -2366,8 +2366,10 @@ function printLeadingComment(path) {
 	const originalText = path.root.value;
 	if (comment.type === "block_comment") {
 		let lineBreak = " ";
-		if (hasNewline(originalText, parser_default.locEnd(comment))) if (hasNewline(originalText, parser_default.locStart(comment), { backwards: true })) lineBreak = hardline;
-		else lineBreak = line;
+		if (hasNewline(originalText, parser_default.locEnd(comment))) {
+			if (hasNewline(originalText, parser_default.locStart(comment), { backwards: true })) lineBreak = hardline;
+			else lineBreak = line;
+		}
 		parts.push(lineBreak);
 	} else parts.push(hardline);
 	const index = skipNewline(originalText, skipSpaces(originalText, parser_default.locEnd(comment)));
@@ -2527,8 +2529,10 @@ function processTree(node, fieldName = null, comments) {
 				const javaChild = processTree(child, fieldName, comments);
 				javaNode.children.push(javaChild);
 				if (javaChild.isNamed) javaNode.namedChildren.push(javaChild);
-				if (fieldName) if (multiFields?.[fieldName]) javaNode[`${fieldName}Nodes`].push(javaChild);
-				else javaNode[`${fieldName}Node`] = javaChild;
+				if (fieldName) {
+					if (multiFields?.[fieldName]) javaNode[`${fieldName}Nodes`].push(javaChild);
+					else javaNode[`${fieldName}Node`] = javaChild;
+				}
 			}
 		});
 	});

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { AstPath, ParserOptions } from "prettier";
-import { builders } from "prettier/doc";
+import { builders as builders$1 } from "prettier/doc";
 //#region src/node-types.d.ts
 interface Point {
   index: number;

package/dist/index.mjs

@@ -125,6 +125,9 @@ function printComment(comment) {
 function hasLeadingComments(node) {
 	return node.comments?.some(({ leading }) => leading) ?? false;
 }
+function hasDanglingComments(node) {
+	return node.comments?.some(({ leading, trailing }) => !leading && !trailing) ?? false;
+}
 function indentInParentheses(contents) {
 	return contents && !Array.isArray(contents) || contents.length ? [
 		"(",
@@ -292,7 +295,7 @@ function printVariableDeclaration(path, print) {
 }
 function printAssignment(leftDoc, operator, rightDoc, rightNode) {
 	if (!rightDoc || !rightNode) return leftDoc;
-	if (rightNode.type === "binary_expression" || rightNode.type === "instanceof_expression" || rightNode.type === "ternary_expression" && (rightNode.conditionNode.type === "binary_expression" || rightNode.conditionNode.type === "instanceof_expression") || hasLeadingComments(rightNode)) return group$7([
+	if (rightNode.type === "binary_expression" || rightNode.type === "instanceof_expression" || rightNode.type === "ternary_expression" && (rightNode.conditionNode.type === "binary_expression" || rightNode.conditionNode.type === "instanceof_expression") || isMember(rightNode) && hasDanglingComments(rightNode) || !isMember(rightNode) && hasLeadingComments(rightNode)) return group$7([
 		leftDoc,
 		operator,
 		group$7(indent$7([line$7, rightDoc]))
@@ -463,9 +466,7 @@ function parentNeedsParentheses(path) {
 	const { parent } = path;
 	switch (parent?.type) {
 		case "return_statement":
-		case "throw_statement":
-			if (willReturnOrThrowStatementBreak(path)) return false;
-			break;
+		case "throw_statement": if (willReturnOrThrowStatementBreak(path)) return false;
 	}
 }
 function willReturnOrThrowStatementBreak(path) {
@@ -491,7 +492,7 @@ function findBaseIndent(lines) {
 	return Math.min(...lines.map((line) => line.search(/\S/)).filter((indent) => indent >= 0));
 }
 function findEmbeddedLanguage(path) {
-	return path.ancestors.find(({ type, comments }) => type === "block" || comments?.some(({ leading }) => leading))?.comments?.filter(({ leading }) => leading).map(({ value }) => value.match(/^(?:\/\/|\/\*)\s*language\s*=\s*(\S+)/)?.[1]).findLast((language) => language)?.toLowerCase();
+	return [path.node, ...path.ancestors].find(({ type, comments }) => type === "block" || comments?.some(({ leading }) => leading))?.comments?.filter(({ leading }) => leading).map(({ value }) => value.match(/^(?:\/\/|\/\*)\s*language\s*=\s*(\S+)/)?.[1]).findLast((language) => language)?.toLowerCase();
 }
 function escapeDocForTextBlock(doc) {
 	return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? currentDoc.replace(/\\|"""/g, (match) => match === "\\" ? "\\\\" : "\"\"\\\"") : currentDoc);
@@ -1453,7 +1454,7 @@ function shouldPrintParamsWithoutParens(path, options) {
 	return false;
 }
 function canPrintParamsWithoutParens(node) {
-	return node.parametersNode.type === "identifier" && !node.comments?.some(({ leading, trailing }) => !leading && !trailing) && !node.parametersNode.comments;
+	return node.parametersNode.type === "identifier" && !hasDanglingComments(node) && !node.parametersNode.comments;
 }
 function printMemberChain(path, print, options) {
 	const isExpressionStatement = path.parent?.type === "expression_statement";
@@ -1948,9 +1949,7 @@ var packages_and_modules_default = {
 					annotations.push(print(child));
 					break;
 				case "identifier":
-				case "scoped_identifier":
-					identifier.push(print(child));
-					break;
+				case "scoped_identifier": identifier.push(print(child));
 			}
 		}, "namedChildren");
 		return join$1(hardline$1, [...annotations, [
@@ -2281,9 +2280,10 @@ function handleLabeledStatementComments(commentNode) {
 function handleLambdaExpressionComments(commentNode) {
 	const { enclosingNode, precedingNode, followingNode } = commentNode;
 	if (enclosingNode?.type === "lambda_expression" && precedingNode && followingNode && enclosingNode.children.find(({ type }) => type === "->").end.index < commentNode.start.index) {
-		if (followingNode.type === "block") if (followingNode.namedChildren.length) util.addLeadingComment(followingNode.namedChildren[0], commentNode);
-		else util.addDanglingComment(followingNode, commentNode, void 0);
-		else util.addLeadingComment(followingNode, commentNode);
+		if (followingNode.type === "block") {
+			if (followingNode.namedChildren.length) util.addLeadingComment(followingNode.namedChildren[0], commentNode);
+			else util.addDanglingComment(followingNode, commentNode, void 0);
+		} else util.addLeadingComment(followingNode, commentNode);
 		return true;
 	}
 }
@@ -2366,8 +2366,10 @@ function printLeadingComment(path) {
 	const originalText = path.root.value;
 	if (comment.type === "block_comment") {
 		let lineBreak = " ";
-		if (hasNewline(originalText, parser_default.locEnd(comment))) if (hasNewline(originalText, parser_default.locStart(comment), { backwards: true })) lineBreak = hardline;
-		else lineBreak = line;
+		if (hasNewline(originalText, parser_default.locEnd(comment))) {
+			if (hasNewline(originalText, parser_default.locStart(comment), { backwards: true })) lineBreak = hardline;
+			else lineBreak = line;
+		}
 		parts.push(lineBreak);
 	} else parts.push(hardline);
 	const index = skipNewline(originalText, skipSpaces(originalText, parser_default.locEnd(comment)));
@@ -2527,8 +2529,10 @@ function processTree(node, fieldName = null, comments) {
 				const javaChild = processTree(child, fieldName, comments);
 				javaNode.children.push(javaChild);
 				if (javaChild.isNamed) javaNode.namedChildren.push(javaChild);
-				if (fieldName) if (multiFields?.[fieldName]) javaNode[`${fieldName}Nodes`].push(javaChild);
-				else javaNode[`${fieldName}Node`] = javaChild;
+				if (fieldName) {
+					if (multiFields?.[fieldName]) javaNode[`${fieldName}Nodes`].push(javaChild);
+					else javaNode[`${fieldName}Node`] = javaChild;
+				}
 			}
 		});
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-java-next-line",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "Prettier Java plugin with configurable same-line and next-line braces",
   "homepage": "https://github.com/motlin/prettier-java-next-line",
   "repository": {
@@ -58,7 +58,7 @@
     ]
   },
   "dependencies": {
-    "web-tree-sitter": "0.26.11"
+    "web-tree-sitter": "0.27.0"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
@@ -73,12 +73,12 @@
     "lerna": "^10.0.0",
     "lint-staged": "^17.0.2",
     "mitata": "^1.0.34",
-    "mocha": "^11.7.5",
+    "mocha": "^12.0.0",
     "postcss": "^8.5.15",
     "prettier": "^3.8.1",
     "prettier-plugin-css-order": "^2.2.0",
-    "tree-sitter-java-orchard": "0.5.10",
-    "tsdown": "^0.22.0",
+    "tree-sitter-java-orchard": "0.5.18",
+    "tsdown": "^0.23.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.57.1"
   },