More correct completion testing + fixed small bug in keyword completion
Do not autopopup completion in name of generic function or property too
Extract method
Minor code refactoring