From 2b4ee9bd3677ad579d10a463f13c52d921ae8110 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 23 Oct 2018 16:45:22 -0700 Subject: [PATCH] Add support for fallback object value of nil Summary: This lets callers provide a fallback object value (e.g. `[NSNull null]`) for safety when the returned object is required to be non-null. Reviewed By: natestedman Differential Revision: D10504059 fbshipit-source-id: 1217755e84a927fe8cfbd0e944af55613f1f7c75 --- remodel-plugin/src/plugins/iglistdiffable-utils.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/remodel-plugin/src/plugins/iglistdiffable-utils.ts b/remodel-plugin/src/plugins/iglistdiffable-utils.ts index bb7d26f4..d136db9e 100644 --- a/remodel-plugin/src/plugins/iglistdiffable-utils.ts +++ b/remodel-plugin/src/plugins/iglistdiffable-utils.ts @@ -40,7 +40,11 @@ function formattedStringValueForIvarWithFormatSpecifier(iVarString:string, strin return "[NSString stringWithFormat:@\"" + stringFormatSpecifier + "\", " + castString + iVarString + "]"; } -function objectValueForAttribute(attribute:ObjectSpec.Attribute):string { +function nullableObjectValueWithFallback(objectValue:string, optionalFallback:string=null) { + return (optionalFallback === null) ? objectValue : `${objectValue} ?: ${optionalFallback}`; +} + +function objectValueForAttribute(attribute:ObjectSpec.Attribute, optionalFallback:string=null):string { const iVarString:string = ObjectSpecCodeUtils.ivarForAttribute(attribute); const type:ObjC.Type = ObjectSpecCodeUtils.computeTypeOfAttribute(attribute); @@ -49,7 +53,7 @@ function objectValueForAttribute(attribute:ObjectSpec.Attribute):string { return formattedStringValueForIvarWithFormatSpecifier(iVarString, "%@"); }, NSObject: function() { - return iVarString; + return nullableObjectValueWithFallback(iVarString, optionalFallback); }, BOOL: function() { return iVarString + " ? @\"YES\" : @\"NO\""; @@ -112,7 +116,7 @@ function objectValueForAttribute(attribute:ObjectSpec.Attribute):string { return formattedStringValueForIvarWithFormatSpecifier(iVarString, "%@"); }, unmatchedType: function() { - return "self"; + return nullableObjectValueWithFallback('self', optionalFallback); } }, type); }