codegen: fix interaction between ^for and ^partial (#92)

When a ^for loop is used in the main page, it was incorrectly being generated even when the route was to the partial.
adhocteam · Jan 17, 2023 · 348a6c0 · 348a6c0
1 parent 433d5d1
commit 348a6c0
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Paul Smith. All rights reserved.
+Copyright (c) Paul Smith. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/main.go b/main.go
@@ -1514,9 +1514,11 @@ func (g *pageCodeGen) genNodePartial(n node, p *partial) {
 					g.bodyPrintf("printEscaped(%s, %s)\n", g.ioWriterVar, n.expr)
 				}
 			case *nodeFor:
-				g.bodyPrintf("for %s {\n", n.clause.code)
-				f(n.block)
-				g.bodyPrintf("}\n")
+				if state == stateInPartialScope {
+					g.bodyPrintf("for %s {\n", n.clause.code)
+					f(n.block)
+					g.bodyPrintf("}\n")
+				}
 				return false
 			case *nodeIf:
 				g.bodyPrintf("if %s {\n", n.cond.expr)

diff --git a/testdata/partial_for.out b/testdata/partial_for.out
@@ -0,0 +1,11 @@
+
+
+    <p>0</p>
+    <p>1</p>
+    <p>2</p>
+
+    <div>
+
+            0
+            1
+    </div>
diff --git a/testdata/partial_for.up b/testdata/partial_for.up
@@ -0,0 +1,11 @@
+^layout !
+^for i := 0; i < 3; i++ {
+    <p>^i</p>
+}
+^partial p {
+    <div>
+        ^for ii := 0; ii < 2; ii++ {
+            <text>^ii</text>
+        }
+    </div>
+}
diff --git a/testdata/partial_for/0.conf b/testdata/partial_for/0.conf
@@ -0,0 +1 @@
+requestPath=/testdata/partial_for/p
diff --git a/testdata/partial_for/0.out b/testdata/partial_for/0.out
@@ -0,0 +1,6 @@
+
+    <div>
+
+            0
+            1
+    </div>