Repository: flex-falcon Updated Branches: refs/heads/develop 7e1530477 -> b36dc8ab1
fix JSON format Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b36dc8ab Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b36dc8ab Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b36dc8ab Branch: refs/heads/develop Commit: b36dc8ab159dcaff73d8efe9098dfd2629ffd78b Parents: 7e15304 Author: Alex Harui <[email protected]> Authored: Mon Dec 5 13:57:25 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Dec 5 13:57:25 2016 -0800 ---------------------------------------------------------------------- .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b36dc8ab/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java index ab53666..0306072 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java @@ -77,7 +77,7 @@ import org.apache.flex.compiler.utils.NativeUtils; public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmitter, IJSFlexJSASDocEmitter { - private boolean wroteSomething = false; + private boolean firstMember = true; @Override public String postProcess(String output) @@ -247,14 +247,11 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit indentPush(); indentPush(); } - boolean firstMember = true; + firstMember = true; for (IDefinitionNode mnode : members) { - if (!firstMember && wroteSomething) - writeNewline(","); - firstMember = false; - wroteSomething = false; getWalker().walk(mnode); + firstMember = false; } if (members.length > 0) { @@ -270,14 +267,11 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit indentPush(); indentPush(); } - boolean firstEvent = true; + firstMember = true; for (IMetaTagNode mnode : metas) { - if (!firstEvent && wroteSomething) - writeNewline(","); - firstEvent = false; - wroteSomething = false; writeEventTagNode(mnode); + firstMember = false; } if (metas.length > 0) { @@ -332,14 +326,11 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit writeNewline(","); writeNewline("members: ["); } - boolean firstMember = true; + firstMember = true; for (IDefinitionNode mnode : members) { - if (!firstMember && wroteSomething) - writeNewline(","); - firstMember = false; - wroteSomething = false; getWalker().walk(mnode); + firstMember = false; } if (members.length > 0) { @@ -368,6 +359,8 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit String name = node.getName(); if (accessors.contains(name)) return; accessors.add(name); + if (!firstMember) + writeNewline(","); writeNewline("{ \"type\": \"accessor\","); IAccessorDefinition def = (IAccessorDefinition)node.getDefinition(); IAccessorDefinition otherDef = (IAccessorDefinition)def.resolveCorrespondingAccessor(getWalker().getProject()); @@ -408,6 +401,8 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit String name = node.getName(); if (accessors.contains(name)) return; accessors.add(name); + if (!firstMember) + writeNewline(","); writeNewline("{ \"type\": \"accessor\","); IAccessorDefinition def = (IAccessorDefinition)node.getDefinition(); IAccessorDefinition otherDef = (IAccessorDefinition)def.resolveCorrespondingAccessor(getWalker().getProject()); @@ -448,6 +443,8 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit ASDocComment asDoc = (ASDocComment) node.getASDocComment(); if (asDoc != null && asDoc.commentNoEnd().contains("@private")) return; + if (!firstMember) + writeNewline(","); writeNewline("{ \"type\": \"field\","); write(" \"qname\": \""); write(formatQualifiedName(node.getQualifiedName())); @@ -469,6 +466,8 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit ASDocComment asDoc = (ASDocComment) node.getASDocComment(); if (asDoc != null && asDoc.commentNoEnd().contains("@private")) return; + if (!firstMember) + writeNewline(","); writeNewline("{ \"type\": \"variable\","); write(" \"qname\": \""); write(formatQualifiedName(node.getQualifiedName())); @@ -489,6 +488,9 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit String name = node.getName(); if (accessors.contains(name)) return; + if (!firstMember) + writeNewline(","); + accessors.add(name); writeNewline("{ \"type\": \"accessor\","); IAccessorDefinition def = (IAccessorDefinition)node.getDefinition(); @@ -527,6 +529,8 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit { if (node.getDefinition().isPrivate()) return; + if (!firstMember) + writeNewline(","); ASDocComment asDoc = (ASDocComment) node.getASDocComment(); if (asDoc != null && asDoc.commentNoEnd().contains("@private")) return; @@ -537,7 +541,10 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit writeDefinitionAttributes(node.getDefinition()); indentPush(); if (asDoc != null) + { writeASDoc(asDoc); + writeNewline(","); + } write(" \"return\": \""); write(formatQualifiedName(node.getReturnType())); writeNewline("\","); @@ -612,14 +619,7 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit indentPop(); } } - - @Override - public void write(String value) - { - super.write(value); - wroteSomething = true; - } - + public void writeDefinitionAttributes(IDefinition def) { write(" \"namespace\": ");
