You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2020/09/16 18:40:53 UTC
[royale-compiler] 01/02: RenamePropertiesWithModuleSupport: better
null handling for propertyNamesToKeep
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit e66da18f9e8b33a7d7c6aa5ff6805cf884806549
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Sep 16 11:34:56 2020 -0700
RenamePropertiesWithModuleSupport: better null handling for propertyNamesToKeep
---
.../javascript/jscomp/RenamePropertiesWithModuleSupport.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/compiler-jx/src/main/java/com/google/javascript/jscomp/RenamePropertiesWithModuleSupport.java b/compiler-jx/src/main/java/com/google/javascript/jscomp/RenamePropertiesWithModuleSupport.java
index c6e6746..7e81f91 100644
--- a/compiler-jx/src/main/java/com/google/javascript/jscomp/RenamePropertiesWithModuleSupport.java
+++ b/compiler-jx/src/main/java/com/google/javascript/jscomp/RenamePropertiesWithModuleSupport.java
@@ -371,7 +371,7 @@ class RenamePropertiesWithModuleSupport implements CompilerPass {
propNode.getString())) {
externedNames.add(propNode.getString());
break;
- } else if(propertyNamesToKeep.contains(propNode.getString())) {
+ } else if(propertyNamesToKeep != null && propertyNamesToKeep.contains(propNode.getString())) {
break;
}
maybeMarkCandidate(propNode);
@@ -388,7 +388,7 @@ class RenamePropertiesWithModuleSupport implements CompilerPass {
quotedNames.add(key.getString());
} else if (compiler.getCodingConvention().blockRenamingForProperty(key.getString())) {
externedNames.add(key.getString());
- } else if(propertyNamesToKeep.contains(key.getString())) {
+ } else if(propertyNamesToKeep != null && propertyNamesToKeep.contains(key.getString())) {
continue;
} else {
maybeMarkCandidate(key);
@@ -407,7 +407,7 @@ class RenamePropertiesWithModuleSupport implements CompilerPass {
quotedNames.add(key.getString());
} else if (compiler.getCodingConvention().blockRenamingForProperty(key.getString())) {
externedNames.add(key.getString());
- } else if(propertyNamesToKeep.contains(key.getString())) {
+ } else if(propertyNamesToKeep != null && propertyNamesToKeep.contains(key.getString())) {
continue;
} else {
maybeMarkCandidate(key);
@@ -450,7 +450,7 @@ class RenamePropertiesWithModuleSupport implements CompilerPass {
Node fnName = member.getFirstChild();
if (compiler.getCodingConvention().blockRenamingForProperty(memberDefName)) {
externedNames.add(fnName.getString());
- } else if(propertyNamesToKeep.contains(memberDefName)) {
+ } else if(propertyNamesToKeep != null && propertyNamesToKeep.contains(memberDefName)) {
continue;
} else if (memberDefName.equals("constructor")
|| memberDefName.equals("superClass_")) {