Add support for @catch
and @semanticNonNull
#5405
Merged
@catch
and @semanticNonNull
#5405