Clarify why field/method counts would be different after assembling

Col-E · Nov 14, 2024 · 9549aa0 · 9549aa0
1 parent 8199604
commit 9549aa0
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/assembler/AssemblerPane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/assembler/AssemblerPane.java
@@ -447,17 +447,21 @@ private CompletableFuture<Void> assemble() {
 							String memberType;
 							if (oldMember.isMethod()) {
 								memberType = "method";
-								if (assembledClass.getMethods().size() == methodCount) {
-									newMember = assembledClass.getDeclaredMethod(oldMember.getName(), oldMember.getDescriptor());
-								} else {
-									newMember = null;
+								newMember = assembledClass.getDeclaredMethod(oldMember.getName(), oldMember.getDescriptor());
+								if (methodCount != assembledClass.getMethods().size()){
+									ASTElement sourceAst = lastConcreteAst.get(0);
+									Error err = new Error("Assembling in this context detected a change in the number of methods.\n" +
+											"Check and see if your class has illegal duplicate method definitions.", sourceAst.location());
+									processErrors(List.of(err), ProblemPhase.BUILD);
 								}
 							} else {
 								memberType = "field";
-								if (assembledClass.getFields().size() == fieldCount) {
-									newMember = assembledClass.getDeclaredField(oldMember.getName(), oldMember.getDescriptor());
-								} else {
-									newMember = null;
+								newMember = assembledClass.getDeclaredField(oldMember.getName(), oldMember.getDescriptor());
+								if (fieldCount != assembledClass.getFields().size()){
+									ASTElement sourceAst = lastConcreteAst.get(0);
+									Error err = new Error("Assembling in this context detected a change in the number of fields.\n" +
+											"Check and see if your class has illegal duplicate field definitions.", sourceAst.location());
+									processErrors(List.of(err), ProblemPhase.BUILD);
 								}
 							}