Repository: flex-falcon Updated Branches: refs/heads/cordova [created] a44c2e749
fix handling of flexjscordovaplugin Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b0f9dfee Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b0f9dfee Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b0f9dfee Branch: refs/heads/cordova Commit: b0f9dfee122a3abff112ee5d11789aa093f6813f Parents: ff17848 Author: Alex Harui <[email protected]> Authored: Mon Jun 12 21:30:34 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Mon Jun 12 21:30:34 2017 -0700 ---------------------------------------------------------------------- .../internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java | 1 + .../internal/codegen/js/jx/PackageHeaderEmitter.java | 9 +++++++++ .../flex/compiler/utils/JSClosureCompilerWrapper.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b0f9dfee/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java index 0a1d2d4..cd041c0 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java @@ -59,6 +59,7 @@ public enum JSFlexJSEmitterTokens implements IEmitterTokens SKIP_FUNCTION_COERCIONS("skipFunctionCoercions"), JSX("JSX"), VECTOR("org.apache.flex.utils.Language.Vector"), + CORDOVA_PLUGIN("@flexjscordovaplugin"), ; private String token; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b0f9dfee/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java index 5d2c413..2153ea0 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java @@ -70,6 +70,7 @@ public class PackageHeaderEmitter extends JSSubEmitter implements .getAllLocalDefinitions()); String qname = null; boolean isExterns = false; + String cordovaPlugin = null; if (type != null) { qname = type.getQualifiedName(); @@ -83,6 +84,12 @@ public class PackageHeaderEmitter extends JSSubEmitter implements String asDocString = asDoc.commentNoEnd(); isExterns = asDocString.contains(JSFlexJSEmitterTokens.EXTERNS.getToken()); getEmitter().getModel().isExterns = isExterns; + int c = asDocString.indexOf(JSFlexJSEmitterTokens.CORDOVA_PLUGIN.getToken()); + if (c != -1) + { + int c2 = asDocString.indexOf("\n", c); + cordovaPlugin = asDocString.substring(c + JSFlexJSEmitterTokens.CORDOVA_PLUGIN.getToken().length(), c2).trim(); + } } } } @@ -136,6 +143,8 @@ public class PackageHeaderEmitter extends JSSubEmitter implements writeNewline(" * @fileoverview"); if (isExterns) writeNewline(" * @externs"); + if (cordovaPlugin != null) + writeNewline(" * " + JSFlexJSEmitterTokens.CORDOVA_PLUGIN.getToken() + " " + cordovaPlugin); writeNewline(" *"); // need to suppress access controls so access to protected/private from defineProperties // doesn't generate warnings. http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b0f9dfee/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java index 42ad2b3..9fb9af3 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java @@ -182,7 +182,7 @@ public class JSClosureCompilerWrapper String[] asdocTags = new String[] {"productversion", "playerversion", "langversion", "copy", "asparam", "asreturn", "asprivate", - "flexjsignoreimport", "flexjsignorecoercion", "flexjsnoimplicitstringconversion"}; + "flexjsignoreimport", "flexjsignorecoercion", "flexjsnoimplicitstringconversion", "flexjscordovaplugin"}; options_.setExtraAnnotationNames(Arrays.asList(asdocTags)); }
