Improve function declaration wrapping when it contains generic type definitions

Improve function declaration wrapping when it contains generic type definitions #6203