ruiu added a comment. Instead of adding a new class, do you think you can change the behavior of WithColor so that it restores the original colors instead of resetting it? CHANGES SINCE LAST ACTION https://reviews.llvm.org/D67060/new/ https://reviews.llvm.org/D67060