Use diagnostics for build plugin instead of adding marks separately

Still work in progress. Will need to create the diagnostics filtering before continuing. See !1177 (closed)