You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/08/04 18:49:58 UTC
[royale-compiler] branch develop updated (28ad0ca -> fd67d58)
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 28ad0ca [maven-release-plugin] prepare for next development iteration
new 70c7894 JSRoyaleASDocEmitter: fix null exception on resolving parameter type
new fd67d58 JSRoyaleASDocEmitter: similar null check for return type as for parameter type
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../codegen/js/royale/JSRoyaleASDocEmitter.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
[royale-compiler] 02/02: JSRoyaleASDocEmitter: similar null check
for return type as for parameter type
Posted by jo...@apache.org.
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
commit fd67d58a44f66a945858002735bd94fb0bfe15c1
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Aug 4 11:45:37 2021 -0700
JSRoyaleASDocEmitter: similar null check for return type as for parameter type
---
.../internal/codegen/js/royale/JSRoyaleASDocEmitter.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
index 5390471..1d013b5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
@@ -593,9 +593,17 @@ public class JSRoyaleASDocEmitter extends JSGoogEmitter implements IJSRoyaleEmit
}
write(" \"return\": \"");
if (node.getReturnType().equals("void"))
+ {
write("void");
+ }
else if (node.getReturnTypeNode() != null)
- write(formatQualifiedName(node.getReturnTypeNode().resolveType(getWalker().getProject()).getQualifiedName()));
+ {
+ ITypeDefinition returnDef = node.getReturnTypeNode().resolveType(getWalker().getProject());
+ if (returnDef != null)
+ {
+ write(formatQualifiedName(returnDef.getQualifiedName()));
+ }
+ }
writeNewline("\",");
write(" \"params\": [");
boolean firstParam = true;
[royale-compiler] 01/02: JSRoyaleASDocEmitter: fix null exception
on resolving parameter type
Posted by jo...@apache.org.
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
commit 70c789417c572bbda63d1794f874a0e579f79d79
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Aug 4 11:44:18 2021 -0700
JSRoyaleASDocEmitter: fix null exception on resolving parameter type
---
.../internal/codegen/js/royale/JSRoyaleASDocEmitter.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
index 1f4142c..5390471 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
@@ -41,6 +41,7 @@ import org.apache.royale.compiler.definitions.IAccessorDefinition;
import org.apache.royale.compiler.definitions.IDefinition;
import org.apache.royale.compiler.definitions.IPackageDefinition;
import org.apache.royale.compiler.definitions.IParameterDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
import org.apache.royale.compiler.definitions.metadata.IDeprecationInfo;
import org.apache.royale.compiler.definitions.references.INamespaceReference;
import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitter;
@@ -607,9 +608,11 @@ public class JSRoyaleASDocEmitter extends JSGoogEmitter implements IJSRoyaleEmit
write("{ \"name\": \"");
write(param.getBaseName());
write("\", \"type\": \"");
- if (param.getTypeReference() != null)
- write(formatQualifiedName(param.getTypeReference().resolve(getWalker().getProject(),
- node.getContainingScope().getScope(), DependencyType.SIGNATURE, false).getQualifiedName()));
+ ITypeDefinition paramDef = param.resolveType(getWalker().getProject());
+ if (paramDef != null)
+ {
+ write(formatQualifiedName(paramDef.getQualifiedName()));
+ }
write("\"}");
}
write("]");