Fix @param completion to include param name

Also add two spaces between @param and param name to match
to the one in whole comment block format (which inserted by ctrl+Enter).
Merge branch 'fix-param-completion'