restructure diff transform, markLines, markGutter