-
Hixie authored
The "leaf merge" feature was getting confused when we reset the SemanticsNode. We now separately track whether the node itself is marked as being merged vs whether we inherited that state, and we don't reset the inherited state until you're reattached or reserialised. In the latter case, we do a "just in time" clearing of the flag just like we previously did a "just in time" setting of the flag, except now the flag we're setting or clearing is the inherited flag not the actual flag.
9cea6c50