Don't only match the current function as the current scope, but also
classes, namespaces and others containers.

Closes #1996778.