From b82128ee4ed4eb3da0914373859286255f08fb33 Mon Sep 17 00:00:00 2001
From: Michael Schneider <maicki@users.noreply.github.com>
Date: Sun, 24 Jun 2018 08:56:10 -0700
Subject: [PATCH] Add missing instance variables in ASTextNode and warnings
 cleanup #trivial (#984)

* Add missing instance variables in ASTextNode and warnings cleanup

* Re-add drain
---
 Source/ASDisplayNodeExtras.h |  2 +-
 Source/ASRunLoopQueue.mm     |  5 +++++
 Source/ASTextNode.mm         | 27 ++++++++++++++++++++++++++-
 Source/ASTextNode2.mm        |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Source/ASDisplayNodeExtras.h b/Source/ASDisplayNodeExtras.h
index b47eb5c6ea..9a8c2cd0c0 100644
--- 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
index 1ac258b2b9..fd7b39fd41 100644
--- a/Source/ASRunLoopQueue.mm
+++ b/Source/ASRunLoopQueue.mm
@@ -65,6 +65,11 @@ static void runLoopSourceCallback(void *info) {
   ASDisplayNodeFailAssert(@"Abstract method.");
 }
 
+- (void)drain
+{
+  ASDisplayNodeFailAssert(@"Abstract method.");
+}
+
 @end
 
 @implementation ASDeallocQueueV1 {
diff --git a/Source/ASTextNode.mm b/Source/ASTextNode.mm
index 428a19b2ce..96842d26a0 100644
--- a/Source/ASTextNode.mm
+++ b/Source/ASTextNode.mm
@@ -191,7 +191,12 @@ static ASTextKitRenderer *rendererForAttributes(ASTextKitAttributes attributes,
 
   NSAttributedString *_attributedText;
   NSAttributedString *_truncationAttributedText;
+  NSAttributedString *_additionalTruncationMessage;
   NSAttributedString *_composedTruncationText;
+  NSArray<NSNumber *> *_pointSizeScaleFactors;
+  NSLineBreakMode _truncationMode;
+  
+  NSUInteger _maximumNumberOfLines;
 
   NSString *_highlightedLinkAttributeName;
   id _highlightedLinkAttributeValue;
@@ -1175,6 +1180,11 @@ static NSAttributedString *DefaultTruncationAttributedString()
   }
 }
 
+- (NSAttributedString *)additionalTruncationMessage
+{
+  return ASLockedSelf(_additionalTruncationMessage);
+}
+
 - (void)setTruncationMode:(NSLineBreakMode)truncationMode
 {
   if (ASLockedSelfCompareAssign(_truncationMode, truncationMode)) {
@@ -1182,18 +1192,28 @@ static NSAttributedString *DefaultTruncationAttributedString()
   }
 }
 
+- (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)) {
@@ -1201,6 +1221,11 @@ static NSAttributedString *DefaultTruncationAttributedString()
   }
 }
 
+- (NSUInteger)maximumNumberOfLines
+{
+   return ASLockedSelf(_maximumNumberOfLines);
+}
+
 - (NSUInteger)lineCount
 {
   return ASLockedSelf([[self _locked_renderer] lineCount]);
diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
index e6d0ad50a5..6f97fa6c7e 100644
--- a/Source/ASTextNode2.mm
+++ b/Source/ASTextNode2.mm
@@ -950,7 +950,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ];
   }
 }
 
-- (NSArray *)pointSizeScaleFactors
+- (NSArray<NSNumber *> *)pointSizeScaleFactors
 {
   return ASLockedSelf(_pointSizeScaleFactors);
 }