commit e66da18f9e8b33a7d7c6aa5ff6805cf884806549
author Josh Tynjala <joshtynjala@apache.org> Wed Sep 16 11:34:56 2020 -0700
committer Josh Tynjala <joshtynjala@apache.org> Wed Sep 16 11:34:56 2020 -0700
tree 8f06dd3aade1159fe32bbd31280bcdfbd1969875
parent f23844ff3001d54df9cde3e93678d2f3520740cc

RenamePropertiesWithModuleSupport: better null handling for propertyNamesToKeep

compiler-jx/src/main/java/com/google/javascript/jscomp/RenamePropertiesWithModuleSupport.java

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 @@
                 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 @@
               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 @@
               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 @@
                   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_")) {