When merging two ApexClass objects we prefer members we willingly overwrite a members type with a primitive if it's currently Object, additionally, when encountering a member during a merge operation that is an ApexClass we recursively call merge on all of that ApexClass' members.

Author: josephbleau

app/models/ApexClass.java

@@ -64,7 +64,11 @@ boolean membersEqual(Map<ApexMember, ApexType> other) {
 
 	void mergeFields(ApexClass other) {
 		for (ApexMember key : other.getMembers().keySet() ) {
-			if (members.get(key) == null) {
+			if (members.get(key) instanceof ApexClass && other.getMembers().get(key) instanceof ApexClass) {
+				((ApexClass) members.get(key)).mergeFields((ApexClass) other.getMembers().get(key));
+			}
+
+			if (members.get(key) == null || members.get(key) == ApexPrimitive.OBJECT) {
 				members.put(key, other.getMembers().get(key));
 			}
 		}