Improve recursive class detection

Added code to handle the case when the line you are completing on is
itself a call chain from a variable that created from an other assignment
Merge branch 'master' into my-develop