Update highlighting to wrap properly with softwrap, add regex support for costructing range