Please change a bit behavior of "Add new line at the end of file?" to "One new line at end of file?". This should not only add a new line when there is none, but also if there is more than one, make it exactly one.
BTW. for example "git diff" by default shows these empty lines at the end of file in red color same as for trailing white-spaces at the end of line.