resolve: Use def_kind query to cleanup some code
#118620
Merged
def_kind query to cleanup some code
#118620