Refactored declaration completion

Refactored completion around accessors (public/private/inline/...) and declarations (var/function/class).
Of course `macro` can be used elsewhere as well...