Decompiler name shadowing resolution

https://github.com/JetBrains/intellij-community/pull/295
2015-09-07 20:44:51 +03:00
parent ee740aa056
commit 766fc1390d
10 changed files with 24 additions and 1 deletions
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -99,7 +99,8 @@ public class ImportCollector {

    if (existsDefaultClass ||
        (mapSimpleNames.containsKey(nshort) && !npackage.equals(mapSimpleNames.get(nshort)))) {
-      return fullname;
+      //  don't return full name because if the class is a inner class, full name refers to the parent full name, not the child full name
+      return retname == null ? fullname : (npackage + "." + retname);
    }
    else if (!mapSimpleNames.containsKey(nshort)) {
      mapSimpleNames.put(nshort, npackage);