commit 74cf21c942ee2bbfd7b4ae7676e165670c7b4614
author Josh Tynjala <joshtynjala@apache.org> Wed Jul 29 13:31:08 2020 -0700
committer Josh Tynjala <joshtynjala@apache.org> Wed Jul 29 13:31:08 2020 -0700
tree 6f5e958c9afce70fc3994c4dda395820c824c106
parent 6556d04c61080aade2f0e46f322dccefd8f37359

ClosureUtils: better handling of custom namespaces so that the original name is not prevented from being renamed

compiler-jx/src/main/java/org/apache/royale/compiler/utils/ClosureUtils.java

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ClosureUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ClosureUtils.java
index 3c47b35..17676c7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ClosureUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ClosureUtils.java
@@ -113,12 +113,13 @@
                                         continue;
                                     }
                                 }
+                                String baseName = localDef.getBaseName();
                                 if (isCustomNS)
                                 {
                                     String uri = nsRef.resolveNamespaceReference(project).getURI();
-                                    result.add(JSRoyaleEmitter.formatNamespacedProperty(uri, localDef.getBaseName(), false));
+                                    baseName = JSRoyaleEmitter.formatNamespacedProperty(uri, baseName, false);
                                 }
-                                result.add(localDef.getBaseName());
+                                result.add(baseName);
                             }
                         }
                     }