From 041d838bcd7fed68b2d738cf613f35fc96793ec7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 16 Apr 2019 13:04:17 -0400 Subject: [PATCH] Respond to CR. --- Scripts/sds_codegen/sds_codegen.sh | 26 ++++++++++++-------------- Scripts/sds_codegen/sds_generate.py | 1 + SignalServiceKit/src/Messages/TSCall.h | 14 +++++++------- SignalServiceKit/src/Messages/TSCall.m | 14 +++++++------- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Scripts/sds_codegen/sds_codegen.sh b/Scripts/sds_codegen/sds_codegen.sh index 012e878306..76a77cfd51 100755 --- a/Scripts/sds_codegen/sds_codegen.sh +++ b/Scripts/sds_codegen/sds_codegen.sh @@ -25,24 +25,22 @@ REPO_ROOT=`git rev-parse --show-toplevel` # and generates fake Obj-c headers (.h) that @interface and @protocol # stubs for each swift class. This is analogous to a very simplified # version of the "-Swift.h" files used by Swift for bridging. -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +$REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes -# # We parse Obj-C source files (.m only, not .mm yet) to extract simple class descriptions (class name, base class, property names and types, etc.) -# # -# # Common -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Storage/TSYapDatabaseObject.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +# We parse Obj-C source files (.m only, not .mm yet) to extract simple class descriptions (class name, base class, property names and types, etc.) # -# # Threads -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/TSThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSContactThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSGroupThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes -# -# # Interactions -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal/src/ViewControllers/ConversationView/TypingIndicatorInteraction.swift --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Messages --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +# Common +$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Storage/TSYapDatabaseObject.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes -# $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path ./SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +# Threads +$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/TSThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSContactThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Contacts/Threads/TSGroupThread.m --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes + +# Interactions +$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal/src/ViewControllers/ConversationView/TypingIndicatorInteraction.swift --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes +$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/src/Messages --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes # We parse Swift source files to extract simple class descriptions (class name, base class, property names and types, etc.) # diff --git a/Scripts/sds_codegen/sds_generate.py b/Scripts/sds_codegen/sds_generate.py index 7c4c2607f0..4c4f5860e5 100755 --- a/Scripts/sds_codegen/sds_generate.py +++ b/Scripts/sds_codegen/sds_generate.py @@ -890,6 +890,7 @@ class %sSerializer: SDSSerializer { swift_body = sds_common.clean_up_generated_swift(swift_body) + # Add some random whitespace to trigger the auto-formatter. swift_body = swift_body + (' ' * random.randint(1, 100)) with open(swift_filepath, 'wt') as f: diff --git a/SignalServiceKit/src/Messages/TSCall.h b/SignalServiceKit/src/Messages/TSCall.h index f7492f08e8..af103e6fcb 100644 --- a/SignalServiceKit/src/Messages/TSCall.h +++ b/SignalServiceKit/src/Messages/TSCall.h @@ -35,13 +35,13 @@ NSString *NSStringFromCallType(RPRecentCallType callType); inThread:(TSContactThread *)thread NS_DESIGNATED_INITIALIZER; - (instancetype)initWithUniqueId:(NSString *)uniqueId - receivedAtTimestamp:(uint64_t)receivedAtTimestamp - sortId:(uint64_t)sortId - timestamp:(uint64_t)timestamp - uniqueThreadId:(NSString *)uniqueThreadId - callSchemaVersion:(NSUInteger)callSchemaVersion - callType:(RPRecentCallType)callType - read:(BOOL)read NS_DESIGNATED_INITIALIZER; + receivedAtTimestamp:(uint64_t)receivedAtTimestamp + sortId:(uint64_t)sortId + timestamp:(uint64_t)timestamp + uniqueThreadId:(NSString *)uniqueThreadId + callSchemaVersion:(NSUInteger)callSchemaVersion + callType:(RPRecentCallType)callType + read:(BOOL)read NS_DESIGNATED_INITIALIZER; - (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; diff --git a/SignalServiceKit/src/Messages/TSCall.m b/SignalServiceKit/src/Messages/TSCall.m index a2465ea762..f73ba6b7e1 100644 --- a/SignalServiceKit/src/Messages/TSCall.m +++ b/SignalServiceKit/src/Messages/TSCall.m @@ -72,13 +72,13 @@ NSUInteger TSCallCurrentSchemaVersion = 1; } - (instancetype)initWithUniqueId:(NSString *)uniqueId - receivedAtTimestamp:(uint64_t)receivedAtTimestamp - sortId:(uint64_t)sortId - timestamp:(uint64_t)timestamp - uniqueThreadId:(NSString *)uniqueThreadId - callSchemaVersion:(NSUInteger)callSchemaVersion - callType:(RPRecentCallType)callType - read:(BOOL)read + receivedAtTimestamp:(uint64_t)receivedAtTimestamp + sortId:(uint64_t)sortId + timestamp:(uint64_t)timestamp + uniqueThreadId:(NSString *)uniqueThreadId + callSchemaVersion:(NSUInteger)callSchemaVersion + callType:(RPRecentCallType)callType + read:(BOOL)read { self = [super initWithUniqueId:uniqueId receivedAtTimestamp:receivedAtTimestamp