Migrate from variableType(Matcher) to variableType(TypePredicate)
#5593
+52
−36
variableType(Matcher) to variableType(TypePredicate)
#5593