Split into lines on commas in SELECT clause

Author: BoykoAlex

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/hql/HqlQueryFormatter.java

@@ -224,6 +224,17 @@ private void walkTree(ParseTree node, StringBuilder sb, FormatState state, int b
 				return;
 			}
 
+			// Handle commas in SELECT list - newline after comma
+			if (isSelectListComma(terminal)) {
+				sb.append(text);
+				sb.append('\n');
+				appendIndent(sb, baseIndent + 1);
+				state.needsSpace = false;
+				state.atLineStart = true;
+				state.lastTokenType = tokenType;
+				return;
+			}
+
 			// Determine spacing
 			boolean spaceNeeded = state.needsSpace
 					&& !state.atLineStart
@@ -279,6 +290,19 @@ private void walkTree(ParseTree node, StringBuilder sb, FormatState state, int b
 		}
 	}
 
+	/**
+	 * Checks whether a terminal node is a comma inside the selectionList rule
+	 * (i.e., separating SELECT list items).
+	 */
+	private boolean isSelectListComma(TerminalNode terminal) {
+		if (terminal.getSymbol().getType() != HqlParser.T__0) { // ','
+			return false;
+		}
+		ParseTree parent = terminal.getParent();
+		return parent instanceof ParserRuleContext parentCtx
+				&& parentCtx.getRuleIndex() == HqlParser.RULE_selectionList;
+	}
+
 	/**
 	 * Checks whether a terminal node is an AND or OR inside the predicate rule
 	 * used as a logical combinator (not AND in BETWEEN...AND...).

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/jpql/JpqlQueryFormatter.java

@@ -213,6 +213,17 @@ private void walkTree(ParseTree node, StringBuilder sb, FormatState state, int b
 				return;
 			}
 
+			// Handle commas in SELECT list - newline after comma
+			if (isSelectListComma(terminal)) {
+				sb.append(text);
+				sb.append('\n');
+				appendIndent(sb, baseIndent + 1);
+				state.needsSpace = false;
+				state.atLineStart = true;
+				state.lastTokenType = tokenType;
+				return;
+			}
+
 			// Determine spacing
 			boolean spaceNeeded = state.needsSpace
 					&& !state.atLineStart
@@ -269,6 +280,19 @@ private void walkTree(ParseTree node, StringBuilder sb, FormatState state, int b
 		}
 	}
 
+	/**
+	 * Checks whether a terminal node is a comma inside the select_clause rule
+	 * (i.e., separating SELECT list items).
+	 */
+	private boolean isSelectListComma(TerminalNode terminal) {
+		if (terminal.getSymbol().getType() != JpqlParser.T__0) { // ','
+			return false;
+		}
+		ParseTree parent = terminal.getParent();
+		return parent instanceof ParserRuleContext
+				&& ((ParserRuleContext) parent).getRuleIndex() == JpqlParser.RULE_select_clause;
+	}
+
 	/**
 	 * Checks whether a terminal node is an AND or OR inside a conditional_expression
 	 * or conditional_term (i.e., a WHERE/HAVING condition combinator, not AND in BETWEEN).

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/postgresql/PostgreSqlQueryFormatter.java

@@ -223,6 +223,17 @@ private void walkTree(ParseTree node, StringBuilder sb, FormatState state, int b
 				return;
 			}
 
+			// Handle commas in SELECT list - newline after comma
+			if (isSelectListComma(terminal)) {
+				sb.append(text);
+				sb.append('\n');
+				appendIndent(sb, baseIndent + 1);
+				state.needsSpace = false;
+				state.atLineStart = true;
+				state.lastTokenType = tokenType;
+				return;
+			}
+
 			// Determine spacing
 			boolean spaceNeeded = state.needsSpace
 					&& !state.atLineStart
@@ -284,6 +295,19 @@ && isInsideParens(ctx)) {
 		}
 	}
 
+	/**
+	 * Checks whether a terminal node is a comma inside the target_list rule
+	 * (i.e., separating SELECT list items).
+	 */
+	private boolean isSelectListComma(TerminalNode terminal) {
+		if (terminal.getSymbol().getType() != PostgreSqlLexer.COMMA) {
+			return false;
+		}
+		ParseTree parent = terminal.getParent();
+		return parent instanceof ParserRuleContext parentCtx
+				&& parentCtx.getRuleIndex() == PostgreSqlParser.RULE_target_list;
+	}
+
 	/**
 	 * Checks whether a terminal node is an AND or OR inside the expression rules
 	 * a_expr_and or a_expr_or (i.e., a WHERE/HAVING condition combinator,

headless-services/commons/jpql/src/test/java/org/springframework/ide/vscode/parser/hql/HqlQueryFormatterTest.java

@@ -87,7 +87,8 @@ void selectWithFetchJoin() {
 	@Test
 	void selectWithGroupByHavingOrderBy() {
 		assertEquals("""
-				SELECT d.name, COUNT(e)
+				SELECT d.name,
+				  COUNT(e)
 				FROM Employee e
 				  JOIN e.department d
 				GROUP BY d.name
@@ -132,7 +133,8 @@ void updateStatement() {
 	@Test
 	void insertStatement() {
 		assertEquals("""
-				INSERT INTO Employee(name, salary) SELECT p.name, p.salary
+				INSERT INTO Employee(name, salary) SELECT p.name,
+				  p.salary
 				FROM Prospect p
 				WHERE p.approved = true""",
 				formatter.format("INSERT INTO Employee(name, salary) SELECT p.name, p.salary FROM Prospect p WHERE p.approved = true"));
@@ -239,7 +241,8 @@ void queryPreservesKeywordCase() {
 	@Test
 	void queryWithCrossJoin() {
 		assertEquals("""
-				SELECT e, d
+				SELECT e,
+				  d
 				FROM Employee e
 				  CROSS JOIN Department d
 				WHERE e.active = true""",

headless-services/commons/jpql/src/test/java/org/springframework/ide/vscode/parser/jpql/JpqlQueryFormatterTest.java

@@ -87,7 +87,8 @@ void selectWithFetchJoin() {
 	@Test
 	void selectWithGroupByHavingOrderBy() {
 		assertEquals("""
-				SELECT d.name, COUNT(e)
+				SELECT d.name,
+				  COUNT(e)
 				FROM Employee e
 				  JOIN e.department d
 				GROUP BY d.name

headless-services/commons/jpql/src/test/java/org/springframework/ide/vscode/parser/postgresql/PostgreSqlQueryFormatterTest.java

@@ -35,7 +35,8 @@ void simpleSelectFrom() {
 	@Test
 	void selectFromWhere() {
 		assertEquals("""
-				SELECT e.name, e.salary
+				SELECT e.name,
+				  e.salary
 				FROM employees e
 				WHERE e.active = true""",
 				formatter.format("SELECT e.name, e.salary FROM employees e WHERE e.active = true"));
@@ -55,7 +56,8 @@ void selectFromWhereWithAndOr() {
 	@Test
 	void selectWithJoin() {
 		assertEquals("""
-				SELECT e.name, d.name
+				SELECT e.name,
+				  d.name
 				FROM employees e
 				  JOIN departments d ON e.dept_id = d.id
 				WHERE d.active = true""",
@@ -65,7 +67,9 @@ void selectWithJoin() {
 	@Test
 	void selectWithMultipleJoins() {
 		assertEquals("""
-				SELECT o.id, c.name, i.product
+				SELECT o.id,
+				  c.name,
+				  i.product
 				FROM orders o
 				  JOIN customers c ON o.customer_id = c.id
 				  LEFT JOIN order_items i ON o.id = i.order_id
@@ -77,7 +81,8 @@ void selectWithMultipleJoins() {
 	@Test
 	void selectWithGroupByHavingOrderBy() {
 		assertEquals("""
-				SELECT d.name, COUNT(*)
+				SELECT d.name,
+				  COUNT(*)
 				FROM employees e
 				  JOIN departments d ON e.dept_id = d.id
 				GROUP BY d.name