fix Parser for SELECT with aggregate functions inside parentheses (#134)

Author: jmgrassau

com.sap.adt.abapcleaner/src/com/sap/adt/abapcleaner/parser/Command.java

@@ -1098,7 +1098,7 @@ private boolean opensSelectLoop() throws NullPointerException {
 		// - SELECT DISTINCT (column) FROM spfli WHERE ...
 		// (see https://help.sap.com/doc/abapdocu_latest_index_htm/latest/en-US/index.htm?file=abapselect_list.htm)
 		Token selectListStart = selectClauseStart;
-		if (selectListStart.textStartsWith("("))
+		if (selectListStart.textStartsWith("(") && selectListStart.getNext().isAttached())
 			return true;
 
 		// loop over the columns in the select list. Examples showing the [select list] in brackets:
@@ -1113,8 +1113,23 @@ private boolean opensSelectLoop() throws NullPointerException {
 		while (token != null && token != selectClauseEnd) {
 			// if any of the columns in the select clause is NOT an aggregate function, ENDSELECT is required
 			// (do not use token.isAnyKeyword() here, since some aggregate functions may not be classified correctly)
-			if (!token.textEqualsAny(aggregateFunctions))
+			boolean aggregateFunctionFound = false;
+			if (token.textEquals("(")) {
+				// consider arithmetic expressions such as '( SUM( amt1 ) + SUM( amt2 ) ) AS amt_sum'
+				Token test = token.getNextCodeToken();
+				while (test != token.getNextSibling()) {
+					if (test.textEqualsAny(aggregateFunctions)) {
+						aggregateFunctionFound = true;
+						break;
+					}
+					test = test.getNextCodeToken();
+				}
+			} else {
+				aggregateFunctionFound = token.textEqualsAny(aggregateFunctions); 
+			}
+			if (!aggregateFunctionFound) { 
 				return true;
+			}
 
 			// move behind the closing parenthesis ")" of the aggregate function; even "COUNT(*)" is tokenized into 3 Tokens
 			token = token.getNextCodeSibling().getNextCodeSibling();

test/com.sap.adt.abapcleaner.test/src/com/sap/adt/abapcleaner/parser/CommandTest.java

@@ -1110,6 +1110,7 @@ void testRequiresEndSelect() {
 		assertFalse(buildCommand("SELECT FROM dtab FIELDS fld1, MIN( price ) AS min_price, MAX( price ) AS max_price GROUP BY fld1 INTO TABLE @DATA(result).").getOpensLevel());
 		assertFalse(buildCommand("SELECT FROM dtab FIELDS COUNT( CASE WHEN num1 < 4 THEN 'X' WHEN num1 BETWEEN 4 AND 7 THEN 'Y' END ) AS cnt, COUNT(*) AS cntstar INTO TABLE @DATA(result).").getOpensLevel());
 		assertFalse(buildCommand("SELECT FROM dtab FIELDS COUNT(*) INTO (@DATA(avg)).").getOpensLevel());
+		assertFalse(buildCommand("SELECT ( SUM( amt1 ) + SUM( amt2 ) ) AS amt_sum FROM any_table INTO @DATA(lt_amount).").getOpensLevel());
 	}
 
 	@Test