Skip to content

Remove this. #2751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −6
Open

Remove this. #2751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions java/src/com/google/template/soy/passes/ResolveExpressionTypesPass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,15 +631,16 @@ private TypeNarrowingConditionVisitor createTypeNarrowingConditionVisitor() {
}

@CanIgnoreReturnValue
private boolean resolveImplicitExtern(
@Nullable
private ExternNode resolveImplicitExtern(
VarRefNode ref, Supplier<ImmutableList<SoyType>> paramTypes) {
var defnDecl = ref.getDefnDecl();
ExternNode e = implicitExterns.get(defnDecl);
if (e == null) {
if (implicitExterns.containsKey(defnDecl)) {
errorReporter.report(ref.getSourceLocation(), IMPLICIT_NOT_CALLED_ONCE);
}
return false;
return null;
}
implicitExterns.put(defnDecl, null);
ImmutableList<SoyType> impliedTypes = paramTypes.get();
Expand Down Expand Up @@ -674,7 +675,7 @@ private boolean resolveImplicitExtern(
}
e.getTypeNode().setResolvedType(newFnType, true);
e.getVar().setType(newFnType);
return true;
return e;
}

@CanIgnoreReturnValue
Expand Down Expand Up @@ -2448,12 +2449,16 @@ private boolean maybeSetExtern(FunctionNode node, List<? extends Extern> externT
SoyType returnType = null;
if (node.getNameExpr() instanceof VarRefNode varRefNode) {
// Resolve implicit types for `liftedExtern(p1, ...)`
if (resolveImplicitExtern(
varRefNode,
() -> node.getParams().stream().map(ExprNode::getType).collect(toImmutableList()))) {
var resolvedExternNode =
resolveImplicitExtern(
varRefNode,
() ->
node.getParams().stream().map(ExprNode::getType).collect(toImmutableList()));
if (resolvedExternNode != null) {
returnType = ((FunctionType) varRefNode.getType()).getReturnType();
node.setAllowedParamTypes(
node.getParams().stream().map(ExprNode::getType).collect(toImmutableList()));
ref = Metadata.forAst(resolvedExternNode);
}
}
if (returnType == null) {
Expand Down
Loading