I have an almost working version of #38 fix, but it does break all the comments indentation, I have pushed it to my own fork, so it might help someone to finish implementing it: https://github.com/ruyadorno/esformatter/commit/6d163e81629a5035a4ec9d1e3238547264e43277