Handle old given syntax where identifier and type are seperated by ne…

…w line (scala#21957)

Fixes scala#21768 

Fixes usages of `with {...}` and `= new {}` declarations presented in
tests.
[Cherry-picked 7644ecd][modified]