Thanks for the runnable example here @jonesbusy ! Had a brief look, and I suspect there's an logical error in the recipe.

As a bit of background: comments are not floating elements, but attached to the next LST element. That allows them to move with the code, as opposed to having to always check of and move both with any restructuring. In this case, it seems the recipe has made the assumption that we can remove the comment, and add it to the "next" element. But in your case there is no next element, so the comment is accidentally lost.

What we should be doing here (I think) is to add any left over comment to the eof of the matching document / documents (TBD), via an additional vistDocument(s) override. That should then make sure we don't accidentally lose any commented out elements at the end of a doc. I hope that's clear!

Thanks for the hint. Really helpful. I will try to take a look at it and perform also more test when the key is not the last element of the document

I did a tentative to implement visitDocument. Not sure if it's the best approach (and if I understand it completly).

But at least the tests added are passing now.

Any other advice appreciated

Thanks for the fixed and merge! Much appreciated