omry / omegaconf / f86508b4-7b28-4562-b2ff-47cd96c8b655

100%

master: 100%

push

circleci

Preserve unresolved interpolations when merging missing structured nodes

When a merge combined a destination node holding an unresolved interpolation
with a source node that was MISSING but typed as a structured config,
OmegaConf synthesized a prototype for the source and then expanded the
destination interpolation. That replaced the interpolation with the
structured type's default value, so the merged config no longer preserved
the original interpolation semantics.

Fix this by tracking when the source started out as a missing structured
node and treating the synthesized prototype as type information only. In
that case, keep the destination interpolation intact, update its type
metadata, and skip the expansion path that would otherwise materialize the
default structured value. Add a regression test covering a structured child
whose interpolation target must remain unresolved after merge.

Closes #1205

6 of 6 new or added lines in 1 file covered. (100.0%)

3615 of 3615 relevant lines covered (100.0%)

1.0 hits per line