main
Add new diag id
Fixup
Fix global alias cases
Fixup 'add import on paste' to respect import ordering and grouping