fix NeedlessClearRule for multiple commands on same line (SAP#315)

Author: jmgrassau

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

@@ -1829,7 +1829,15 @@ else if (token.getParentCommand() != this)
 		}
 		String insertText = ABAP.COMMENT_SIGN_STRING + " " + commentText.trim();
 		Token newComment = Token.create(firstInLine.lineBreaks, firstInLine.spacesLeft, insertText, firstInLine.sourceLineNum, language);
-		firstInLine.lineBreaks = 1;
+
+		// if this Command follows another Command on the same line, put both the comment and this Command to an own line
+		if (firstInLine == firstToken && firstInLine.lineBreaks == 0 && !isFirstCommandInCode()) {
+			int indent = getIndent();
+			firstInLine.setWhitespace(1, indent);
+			newComment.setWhitespace(1, indent);
+		} else {
+			firstInLine.lineBreaks = 1;
+		}
 
 		if (firstInLine.getPrev() == null) {
 			// check whether the comment was already created in a previous cleanup run, potentially checking multiple attached comments

com.sap.adt.abapcleaner/src/com/sap/adt/abapcleaner/programbase/CommandLineArgs.java

@@ -45,6 +45,7 @@ public class CommandLineArgs {
 
 	public static String[] getAllOptions() { return allOptions; }
 
+	@SuppressWarnings("unused")
 	public static CommandLineArgs create(Persistency persistency, String[] args) {
 		if (args == null || args.length == 0)
 			return null;
@@ -110,7 +111,7 @@ public static CommandLineArgs create(Persistency persistency, String[] args) {
 				targetDir = persistency.getAbsolutePath(nextArg);
 
 			} else if (arg.equals(OPT_LINE_RANGE)) {
-				String lineRange = nextArg;
+				String lineRange = (nextArg == null) ? "" : nextArg;
 				int sepPos = lineRange.indexOf(LINE_RANGE_SEP);
 				int startLine = (sepPos <= 0) ? -1 : Integer.valueOf(lineRange.substring(0, sepPos));
 				int lastLine = (sepPos < 0 || sepPos + 1 >= lineRange.length()) ? -1 : Integer.valueOf(lineRange.substring(sepPos + 1));
@@ -163,8 +164,9 @@ public static CommandLineArgs create(Persistency persistency, String[] args) {
 			}
 
 			// skip next argument, since it was already consumed above
-			if (nextArg != null)
+			if (nextArg != null) {
 				++i;
+			}
 		}
 
 		if (sourceDir != null && sourceCode != null) {

test/com.sap.adt.abapcleaner.test/src/com/sap/adt/abapcleaner/rules/declarations/NeedlessClearTest.java

@@ -409,4 +409,19 @@ void testClearExportingParameterKept() {
 
 		testRule();
 	}
+
+	@Test
+	void testClearOnSameLineAsPrevCommand() {
+		buildSrc("    DATA lo_any TYPE REF TO lcl_any.");
+		buildSrc("    FREE lo_any. CLEAR lo_any.");
+
+		buildExp("    DATA lo_any TYPE REF TO lcl_any.");
+		buildExp("    FREE lo_any.");
+		buildExp("    \" TODO: remove needless CLEAR (ABAP cleaner)");
+		buildExp("    CLEAR lo_any.");
+
+		putAnyMethodAroundSrcAndExp();
+
+		testRule();
+	}
 }