diagnostics: fix bad interaction between line spans and line numbers