fix(gui): rename class while rename constructor (#1441)

skylot · Apr 8, 2022 · 83decc2 · 83decc2
1 parent 92faa56
commit 83decc2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
@@ -103,6 +103,9 @@ public String getSyntaxName() {
 
 	@Override
 	public boolean canRename() {
+		if (mth.isClassInit()) {
+			return false;
+		}
 		return !mth.getMethodNode().contains(AFlag.DONT_RENAME);
 	}
 

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
@@ -87,10 +87,24 @@ private RenameDialog(MainWindow mainWindow, JNode source, JNode node) {
 		this.mainWindow = mainWindow;
 		this.cache = mainWindow.getCacheObject();
 		this.source = source;
-		this.node = node;
+		this.node = replaceNode(node);
 		initUI();
 	}
 
+	private JNode replaceNode(JNode node) {
+		if (node instanceof JMethod) {
+			JavaMethod javaMethod = ((JMethod) node).getJavaMethod();
+			if (javaMethod.isClassInit()) {
+				throw new JadxRuntimeException("Can't rename class init method: " + node);
+			}
+			if (javaMethod.isConstructor()) {
+				// rename class instead constructor
+				return node.getJParent();
+			}
+		}
+		return node;
+	}
+
 	private void rename() {
 		try {
 			updateCodeRenames(set -> processRename(node, renameField.getText(), set));