From 172f35fb6489a455a6ed850b20ef8025bff141d3 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@fb.com>
Date: Wed, 20 Sep 2017 09:43:14 -0700
Subject: [PATCH] When nesting for non-list contexts, inherit list info.

This ensures that if you enter a conditional block while inside a list
block, the list "state" from the outer list will still be visible. For
example (somewhat contrived, but gets the point across):

{{#list}}
{{#name}}{{-index}}. {{.}}{{/name}}
{{^name}}{{-index}}. No name!{{/name}}
{{/list}}

Yields something like:

1. Bob
2. Mary
3. No name!
4. Jim

Fixes #90.
---
 .../java/com/samskivert/mustache/Mustache.java  |  2 +-
 .../java/com/samskivert/mustache/Template.java  |  6 +++++-
 .../com/samskivert/mustache/SharedTests.java    | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/samskivert/mustache/Mustache.java b/src/main/java/com/samskivert/mustache/Mustache.java
index 6399e94..88e7929 100644
--- a/src/main/java/com/samskivert/mustache/Mustache.java
+++ b/src/main/java/com/samskivert/mustache/Mustache.java
@@ -878,7 +878,7 @@ public class Mustache
             } else if (_comp.isFalsey(value)) {
                 // omit the section
             } else {
-                executeSegs(tmpl, ctx.nest(value, 0, false, false), out);
+                executeSegs(tmpl, ctx.nest(value), out);
             }
         }
         @Override public void decompile (Delims delims, StringBuilder into) {
diff --git a/src/main/java/com/samskivert/mustache/Template.java b/src/main/java/com/samskivert/mustache/Template.java
index 3731670..9a1587f 100644
--- a/src/main/java/com/samskivert/mustache/Template.java
+++ b/src/main/java/com/samskivert/mustache/Template.java
@@ -157,7 +157,7 @@ public class Template
                 execute(currentCtx, out);
             }
             @Override public void execute (Object context, Writer out) {
-                execute(currentCtx.nest(context, 0, false, false), out);
+                execute(currentCtx.nest(context), out);
             }
             @Override public Object context () {
                 return currentCtx.data;
@@ -339,6 +339,10 @@ public class Template
             this.onLast = onLast;
         }
 
+        public Context nest (Object data) {
+            return new Context(data, this, index, onFirst, onLast);
+        }
+
         public Context nest (Object data, int index, boolean onFirst, boolean onLast) {
             return new Context(data, this, index, onFirst, onLast);
         }
diff --git a/src/test/java/com/samskivert/mustache/SharedTests.java b/src/test/java/com/samskivert/mustache/SharedTests.java
index 903e272..ef47483 100644
--- a/src/test/java/com/samskivert/mustache/SharedTests.java
+++ b/src/test/java/com/samskivert/mustache/SharedTests.java
@@ -431,6 +431,23 @@ public abstract class SharedTests extends GWTTestCase
              context("things", Arrays.asList("foo", "bar", "baz")));
     }
 
+    @Test public void testNestedIndex () {
+        class Foo {
+            public String name;
+            public Integer quantity;
+            public Foo(String name, Integer quantity) {
+                this.name = name;
+                this.quantity = quantity;
+            }
+        }
+        String tmpl =
+            "{{#fooList}}\n" +
+            "{{#quantity}}|q{{-index}}={{quantity}}{{/quantity}}|{{name}}\n" +
+            "{{/fooList}}";
+        test("|q1=1|a\n|b\n", tmpl,
+             context("fooList", Arrays.asList(new Foo("a", 1), new Foo("b", null))));
+    }
+
     @Test public void testLineReporting () {
         String tmpl = "first line\n{{nonexistent}}\nsecond line";
         try {