Skip to content

Internal #2769

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
Open

Internal #2769

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
46 changes: 30 additions & 16 deletions java/src/com/google/template/soy/passes/LocalVariablesNodeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import com.google.template.soy.soytree.defn.SymbolVar.SymbolKind;
import com.google.template.soy.soytree.defn.TemplateHeaderVarDefn;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -194,25 +195,38 @@ protected void visitSoyFileNode(SoyFileNode node) {
localVariables.errorReporter = getErrorReporter();
localVariables.enterScope();

// Define all templates in scope before visiting them so that any template can reference
// any other template.
for (TemplateNode template : node.getTemplates()) {
localVariables.define(template.asVarDefn(), template);
}

// Allow forward references between externs.
for (ExternNode extern : node.getExterns()) {
VarDefn var = extern.getVar();
VarDefn preexisting = localVariables.lookup(var.refName());
if (preexisting instanceof SymbolVar symbolVar
&& symbolVar.getSymbolKind() == SymbolKind.EXTERN) {
// Allow multiple externs with the same name.
continue;
List<ConstNode> constNodes = new ArrayList<>();
List<SoyNode> scopedChildren = new ArrayList<>();
for (SoyNode child : node.getChildren()) {
// Step 1: "Hoist" (like TSJS) function-like Soy nodes -- {template} and {extern} -- before
// visiting their bodies. Allows for forward and backward references between these nodes.
if (child instanceof TemplateNode template) {
localVariables.define(template.asVarDefn(), template);
scopedChildren.add(template);
} else if (child instanceof ExternNode extern) {
// Allow forward references between externs.
VarDefn var = extern.getVar();
VarDefn preexisting = localVariables.lookup(var.refName());
if (preexisting instanceof SymbolVar symbolVar
&& symbolVar.getSymbolKind() == SymbolKind.EXTERN) {
// Allow multiple externs with the same name.
continue;
}
localVariables.define(var, node);
scopedChildren.add(extern);
} else if (child instanceof ConstNode constNode) {
constNodes.add(constNode);
} else {
visit(child);
}
localVariables.define(var, node);
}

super.visitSoyFileNode(node);
// Step 2: Define file-level constants.
constNodes.forEach(this::visit);

// Step 3: Visit the bodies of templates and externs.
scopedChildren.forEach(this::visit);

if (cleanUpFileScope()) {
localVariables.exitScope();
localVariables = null;
Expand Down