Refactoring auto-completion