Fix grouping of parameters inside a function
Merge branch 'bug/coffeescript-highlighting'

In regards to #518