fix: add missing " * " on new line for block comments, flip addCodeCo…

…mment args (#2145)
skylot · Apr 8, 2024 · 41d6b00 · 41d6b00
1 parent dbadbb0
commit 41d6b00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/jadx-core/src/main/java/jadx/api/data/CommentStyle.java b/jadx-core/src/main/java/jadx/api/data/CommentStyle.java
@@ -9,29 +9,33 @@ public enum CommentStyle {
 	 */
 	LINE("// ", "// ", ""),
 
+	// @formatter:off
 	/**
 	 * <pre>
 	 * /*
 	 *  * comment
-	 * *&#47;
+	 *  *&#47;
 	 * </pre>
 	 */
-	BLOCK("/*\n ", " ", "\n */"),
+	// @formatter:on
+	BLOCK("/*\n * ", " * ", "\n */"),
 
 	/**
 	 * <pre>
 	 * /* comment *&#47;
 	 * </pre>
 	 */
-	BLOCK_CONDENSED("/* ", " ", " */"),
+	BLOCK_CONDENSED("/* ", " * ", " */"),
 
+	// @formatter:off
 	/**
 	 * <pre>
 	 * /**
 	 *  * comment
-	 * *&#47;
+	 *  *&#47;
 	 * </pre>
 	 */
+	// @formatter:on
 	JAVADOC("/**\n * ", " * ", "\n */"),
 
 	/**

diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/NotificationAttrNode.java b/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/NotificationAttrNode.java
@@ -30,7 +30,7 @@ public void addCodeComment(String comment) {
 		addAttr(AType.CODE_COMMENTS, new CodeComment(comment, CommentStyle.LINE));
 	}
 
-	public void addCodeComment(CommentStyle style, String comment) {
+	public void addCodeComment(String comment, CommentStyle style) {
 		addAttr(AType.CODE_COMMENTS, new CodeComment(comment, style));
 	}