Changed completions to select first the parameter with the comma and then without the comma

I prefer this behaviour because you can decide if you want to keep the parameter or not.

The other way, if you want to keep it you have to rewrite the comma and the space again.

Feel free to merge it or not, or discuss about it.