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
The following commit(s) were added to refs/heads/develop by this push:
new b03906bae Fix --watch issue where binding data was incorrectly lost
when rewriting .js files
b03906bae is described below
commit b03906baebf2a91f6a833585cd7598e1ab4ed6af
Author: Josh Tynjala <[email protected]>
AuthorDate: Thu Apr 7 13:45:40 2022 -0700
Fix --watch issue where binding data was incorrectly lost when rewriting
.js files
---
.../main/java/org/apache/royale/compiler/clients/COMPJSCNative.java | 6 ++++++
.../main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java | 6 ++++++
.../main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java | 6 ++++++
.../main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java | 6 ++++++
.../main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java | 6 ++++++
.../org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java | 6 ++++++
.../src/main/java/org/apache/royale/compiler/clients/COMPC.java | 6 ++++++
.../src/main/java/org/apache/royale/compiler/clients/MXMLC.java | 6 ++++++
8 files changed, 48 insertions(+)
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
index c3c432c52..6837c0d5a 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
@@ -616,6 +616,12 @@ public class COMPJSCNative extends MXMLJSCNative
target = project.getBackend().createTarget(project,
getTargetSettings(), null);
((JSTarget) target).build(null, problems);
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
index 763ac5161..b1550cd41 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
@@ -683,6 +683,12 @@ public class COMPJSCRoyale extends MXMLJSCRoyale
target = project.getBackend().createTarget(project,
getTargetSettings(), null);
((JSTarget) target).build(null, problems);
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
index d3034b045..487418157 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
@@ -317,6 +317,12 @@ public class MXMLJSCNative implements
JSCompilerEntryPoint, ProblemQueryProvider
target = project.getBackend().createTarget(project,
getTargetSettings(), null);
((JSTarget) target).build(mainCU, problems);
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
index 8f6812832..d161f4dd0 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
@@ -320,6 +320,12 @@ public class MXMLJSCNode implements JSCompilerEntryPoint,
ProblemQueryProvider,
target = project.getBackend().createTarget(project,
getTargetSettings(), null);
((JSTarget) target).build(mainCU, problems);
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
index a66ce9bd0..025632a01 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyale.java
@@ -342,6 +342,12 @@ public class MXMLJSCRoyale implements
JSCompilerEntryPoint, ProblemQueryProvider
target = project.getBackend().createTarget(project,
getTargetSettings(), null);
((JSTarget) target).build(mainCU, problems);
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
index c1db3643f..88e06b5f5 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCRoyaleCordova.java
@@ -322,6 +322,12 @@ public class MXMLJSCRoyaleCordova implements
JSCompilerEntryPoint, ProblemQueryP
target = project.getBackend().createTarget(project,
getTargetSettings(), null);
((JSTarget) target).build(mainCU, problems);
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
index 150a572c6..62bd4e53f 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
@@ -150,6 +150,12 @@ public class COMPC extends MXMLC implements FlexTool
throw new IOException("Failed to setup target file.");
}
buildArtifact();
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
index eec12389c..b45f13a5c 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
@@ -303,6 +303,12 @@ public class MXMLC implements FlexTool
throw new IOException("Failed to setup target file.");
}
buildArtifact();
+ for (ICompilationUnit unit : units)
+ {
+ // call waitForBuildFinish() to ensure that binding
data
+ // doesn't get lost when a new definition is created
+ unit.waitForBuildFinish(problems, null);
+ }
}
finally
{
