Add missing instance variables in ASTextNode and warnings cleanup #tr…

…ivial (TextureGroup#984) * Add missing instance variables in ASTextNode and warnings cleanup * Re-add drain
mikezucc · Oct 2, 2018 · 60fef32 · 60fef32
1 parent 8787ce5
commit 60fef32
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/Source/ASDisplayNodeExtras.h b/Source/ASDisplayNodeExtras.h
@@ -216,6 +216,6 @@ AS_EXTERN void ASDisplayNodeDisableHierarchyNotifications(ASDisplayNode *node);
 AS_EXTERN void ASDisplayNodeEnableHierarchyNotifications(ASDisplayNode *node);
 
 // Not to be called directly.
-AS_EXTERN void _ASSetDebugNames(Class owningClass, NSString *names, ASDisplayNode *object, ...);
+AS_EXTERN void _ASSetDebugNames(Class owningClass, NSString *names, ASDisplayNode * _Nullable object, ...);
 
 NS_ASSUME_NONNULL_END
diff --git a/Source/ASRunLoopQueue.mm b/Source/ASRunLoopQueue.mm
@@ -65,6 +65,11 @@ - (void)releaseObjectInBackground:(id  _Nullable __strong *)objectPtr
   ASDisplayNodeFailAssert(@"Abstract method.");
 }
 
+- (void)drain
+{
+  ASDisplayNodeFailAssert(@"Abstract method.");
+}
+
 @end
 
 @implementation ASDeallocQueueV1 {

diff --git a/Source/ASTextNode.mm b/Source/ASTextNode.mm
@@ -191,7 +191,12 @@ @implementation ASTextNode {
 
   NSAttributedString *_attributedText;
   NSAttributedString *_truncationAttributedText;
+  NSAttributedString *_additionalTruncationMessage;
   NSAttributedString *_composedTruncationText;
+  NSArray<NSNumber *> *_pointSizeScaleFactors;
+  NSLineBreakMode _truncationMode;
+
+  NSUInteger _maximumNumberOfLines;
 
   NSString *_highlightedLinkAttributeName;
   id _highlightedLinkAttributeValue;
@@ -1175,32 +1180,52 @@ - (void)setAdditionalTruncationMessage:(NSAttributedString *)additionalTruncatio
   }
 }
 
+- (NSAttributedString *)additionalTruncationMessage
+{
+  return ASLockedSelf(_additionalTruncationMessage);
+}
+
 - (void)setTruncationMode:(NSLineBreakMode)truncationMode
 {
   if (ASLockedSelfCompareAssign(_truncationMode, truncationMode)) {
     [self setNeedsDisplay];
   }
 }
 
+- (NSLineBreakMode)truncationMode
+{
+  return ASLockedSelf(_truncationMode);
+}
+
 - (BOOL)isTruncated
 {
   return ASLockedSelf([[self _locked_renderer] isTruncated]);
 }
 
-- (void)setPointSizeScaleFactors:(NSArray *)pointSizeScaleFactors
+- (void)setPointSizeScaleFactors:(NSArray<NSNumber *> *)pointSizeScaleFactors
 {
   if (ASLockedSelfCompareAssignCopy(_pointSizeScaleFactors, pointSizeScaleFactors)) {
     [self setNeedsDisplay];
   }
 }
 
+- (NSArray<NSNumber *> *)pointSizeScaleFactors
+{
+  return ASLockedSelf(_pointSizeScaleFactors);
+}
+
 - (void)setMaximumNumberOfLines:(NSUInteger)maximumNumberOfLines
 {
   if (ASLockedSelfCompareAssign(_maximumNumberOfLines, maximumNumberOfLines)) {
     [self setNeedsDisplay];
   }
 }
 
+- (NSUInteger)maximumNumberOfLines
+{
+   return ASLockedSelf(_maximumNumberOfLines);
+}
+
 - (NSUInteger)lineCount
 {
   return ASLockedSelf([[self _locked_renderer] lineCount]);

diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -950,7 +950,7 @@ - (void)setPointSizeScaleFactors:(NSArray<NSNumber *> *)scaleFactors
   }
 }
 
-- (NSArray *)pointSizeScaleFactors
+- (NSArray<NSNumber *> *)pointSizeScaleFactors
 {
   return ASLockedSelf(_pointSizeScaleFactors);
 }