| commit | c9457b821a478af347704ac989baa6e380dddce2 | [log] [tgz] |
|---|---|---|
| author | Josh Tynjala <joshtynjala@apache.org> | Tue Jan 05 13:09:03 2021 -0800 |
| committer | Josh Tynjala <joshtynjala@apache.org> | Tue Jan 05 13:09:03 2021 -0800 |
| tree | ff812ce0432c1693f999828157261b186d5c90fd | |
| parent | 23e64f0e7297d9267cbd9b2d4d37fb60c6582552 [diff] |
MXMLRoyaleEmitter: use emitter tokens instead of strings for the defineProperties call and fix whitespace before first property
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java index ff2fc41..462c3c8 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -2254,10 +2254,22 @@ String formattedCName = formatQualifiedName(cname); - write("Object.defineProperties("); + write(JSGoogEmitterTokens.OBJECT); + write(ASEmitterTokens.MEMBER_ACCESS); + write(JSEmitterTokens.DEFINE_PROPERTIES); + write(ASEmitterTokens.PAREN_OPEN); write(formattedCName); - writeNewline(".prototype, /** @lends {" + formattedCName + ".prototype} */ {"); + write(ASEmitterTokens.MEMBER_ACCESS); + write(JSEmitterTokens.PROTOTYPE); + write(ASEmitterTokens.COMMA); + write(ASEmitterTokens.SPACE); + write("/** @lends {"); + write(formattedCName); + write(ASEmitterTokens.MEMBER_ACCESS); + write(JSEmitterTokens.PROTOTYPE); + write("} */ {"); indentPush(); + writeNewline(); int i = 0; for (MXMLDescriptorSpecifier instance : instances) {
diff --git a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js index 8efd46d..5afeced 100644 --- a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js +++ b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
@@ -386,7 +386,7 @@ Object.defineProperties(MyInitialView.prototype, /** @lends {MyInitialView.prototype} */ { -lbl: { + lbl: { /** @this {MyInitialView} */ get: function() { return this.lbl_;
diff --git a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js index 9fda5ff..c930caa 100644 --- a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js +++ b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
@@ -222,7 +222,7 @@ Object.defineProperties(RoyaleTest_again.prototype, /** @lends {RoyaleTest_again.prototype} */ { -service: { + service: { /** @this {RoyaleTest_again} */ get: function() { return this.service_;