You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2022/01/23 05:57:21 UTC
[royale-compiler] branch ReleaseModules updated: change prevent-rename-object-keys to a list like other config lists
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch ReleaseModules
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/ReleaseModules by this push:
new 1f0aced change prevent-rename-object-keys to a list like other config lists
1f0aced is described below
commit 1f0aced5933c394fd41603adb12e58c171e4a708
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Jan 22 21:57:15 2022 -0800
change prevent-rename-object-keys to a list like other config lists
---
.../internal/driver/js/goog/JSGoogConfiguration.java | 14 +++++++++-----
.../compiler/internal/graph/GoogDepsWriter.java | 20 +++++---------------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 3bf5239..b528df6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -899,19 +899,23 @@ public class JSGoogConfiguration extends JSConfiguration
// 'prevent-rename-object-keys'
//
- private String preventRenameObjectKeys = null;
+ private List<String> preventRenameObjectKeys = new ArrayList<String>();
- public String getPreventRenameObjectKeys()
+ public List<String> getPreventRenameObjectKeys()
{
return preventRenameObjectKeys;
}
- @Config
+ @Config(allowMultiple = true, isPath = false)
@Mapping("prevent-rename-object-keys")
- public void setPreventRenameObjectKeys(ConfigurationValue cv, String value)
+ @Arguments("key")
+ @InfiniteArguments
+ public void setPreventRenameObjectKeys(ConfigurationValue cv, String[] keys)
throws ConfigurationException
{
- preventRenameObjectKeys = value;
+ preventRenameObjectKeys.clear();
+ for (String key : keys)
+ preventRenameObjectKeys.add(key);
}
//
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
index fa0d7a0..2240c24 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
@@ -85,7 +85,7 @@ public class GoogDepsWriter {
preventRenameObjectKeys = config.getPreventRenameObjectKeys();
}
- private String preventRenameObjectKeys = null;
+ private List<String> preventRenameObjectKeys = null;
private boolean externsReporting = false;
private ProblemQuery problems;
private String moduleOutput;
@@ -717,11 +717,6 @@ public class GoogDepsWriter {
}
}
}
- String[] preventRenameKeys = null;
- if (preventRenameObjectKeys != null)
- {
- preventRenameKeys = preventRenameObjectKeys.split(",");
- }
// first scan requires in case this is a module and some have been externed
int j = main.fileInfo.googProvideLine + 1;
@@ -744,10 +739,10 @@ public class GoogDepsWriter {
{
j++;
}
- if (preventRenameKeys != null)
+ if (preventRenameObjectKeys != null && preventRenameObjectKeys.size() > 0)
{
boolean lineChanged = false;
- for (String key : preventRenameKeys)
+ for (String key : preventRenameObjectKeys)
{
if (line.contains("." + key))
{
@@ -913,21 +908,16 @@ public class GoogDepsWriter {
int lastRequireLine = -1;
FileInfo fi = gd.fileInfo;
// int suppressCount = 0;
- String[] preventRenameKeys = null;
- if (preventRenameObjectKeys != null)
- {
- preventRenameKeys = preventRenameObjectKeys.split(",");
- }
int i = 0;
int stopLine = fi.constructorLine;
if (fi.constructorLine == -1) // standalone functions
stopLine = fi.googProvideLine + 4; // search a few more lines after goog.provide
for (String line : fileLines)
{
- if (preventRenameKeys != null)
+ if (preventRenameObjectKeys != null && preventRenameObjectKeys.size() > 0)
{
boolean lineChanged = false;
- for (String key : preventRenameKeys)
+ for (String key : preventRenameObjectKeys)
{
if (line.contains("." + key))
{