fix(config_parser): handle substitutions with resolved values of type…

… ConfigValues (#322)

* fix(config_parser): resolve substitutions of type ConfigValues

* test(config_parser): add tests for nested substitutions

pyhocon/config_parser.py

@@ -660,7 +660,8 @@ def resolve_substitutions(cls, config, accept_unresolved=False):
                         cache_values = cache.get(substitution)
                         if cache_values is None:
                             continue
-                    if not isinstance(resolved_value, ConfigValues):
+
+                    if resolved_value:
                         cache_values.append(substitution)
                         overrides = [s for s in substitutions if s.parent.overridden_value == substitution.parent]
                         if len(overrides) > 0:

samples/substitutions.d/base.conf

@@ -0,0 +1,12 @@
+foo {
+  foo-inner {
+    pre-foo = 1
+    foo-sub = ${foo.foo-inner.pre-foo}${foo.foo-inner.bar}
+  }
+}
+
+bar {
+  bar-inner {
+    foo-sub = ${foo.foo-inner.foo-sub}
+  }
+}

samples/substitutions.d/child.conf

@@ -0,0 +1,7 @@
+include required("base.conf")
+
+foo {
+  foo-inner {
+    bar = 1
+  }
+}

tests/test_config_parser.py

@@ -2632,6 +2632,11 @@ def test_escape_sequences_json_equivalence(self):
         assert config == expected
         assert config == json.loads(source)
 
+    def test_nested_substitution(self):
+        config = ConfigFactory.parse_file("samples/substitutions.d/child.conf")
+        assert config.get_int("foo.foo-inner.foo-sub") == 11
+        assert config.get_int("bar.bar-inner.foo-sub") == 11
+
     def test_triple_quotes_keys(self):
         config = ConfigFactory.parse_string("\"\"\"foo\"\"\" = bar")
         assert config['foo'] == 'bar'