From 6f1d2d1f1d511217ff5f69f779166a9fc6c0c1d9 Mon Sep 17 00:00:00 2001
From: Adlai Holler <adlai@icloud.com>
Date: Fri, 9 Mar 2018 14:23:27 -0800
Subject: [PATCH] [ASTextNode] Fix locking, add test for issue #trivial (#825)

* A few small fixes plus a failing test for ASTextNode

* Change the approach

* Update changelog

* Eh screw null_resettable

* No need for changelog now
---
 Source/ASTextNode.mm                           |   7 +++++++
 Tests/ASTextNodeSnapshotTests.m                |  17 +++++++++++++++++
 ...nheritedFromTextWhenTruncateTailMode@2x.png | Bin 0 -> 2396 bytes
 3 files changed, 24 insertions(+)
 create mode 100644 Tests/ReferenceImages_iOS_10/ASTextNodeSnapshotTests/testThatTruncationTokenAttributesPrecedeThoseInheritedFromTextWhenTruncateTailMode@2x.png

diff --git a/Source/ASTextNode.mm b/Source/ASTextNode.mm
index e2a594b05..522ebabed 100644
--- a/Source/ASTextNode.mm
+++ b/Source/ASTextNode.mm
@@ -177,6 +177,7 @@ @implementation ASTextNode {
   NSArray *_exclusionPaths;
 
   NSAttributedString *_attributedText;
+  NSAttributedString *_truncationAttributedText;
   NSAttributedString *_composedTruncationText;
 
   NSString *_highlightedLinkAttributeName;
@@ -1189,6 +1190,12 @@ - (UIEdgeInsets)shadowPadding
   return defaultTruncationAttributedString;
 }
 
+- (NSAttributedString *)truncationAttributedText
+{
+  ASDN::MutexLocker l(__instanceLock__);
+  return _truncationAttributedText;
+}
+
 - (void)setTruncationAttributedText:(NSAttributedString *)truncationAttributedText
 {
   {
diff --git a/Tests/ASTextNodeSnapshotTests.m b/Tests/ASTextNodeSnapshotTests.m
index 0d86a7274..c81f5241a 100644
--- a/Tests/ASTextNodeSnapshotTests.m
+++ b/Tests/ASTextNodeSnapshotTests.m
@@ -120,4 +120,21 @@ - (void)testShadowing
   ASSnapshotVerifyNode(textNode, nil);
 }
 
+/**
+ * https://github.com/TextureGroup/Texture/issues/822
+ */
+- (void)DISABLED_testThatTruncationTokenAttributesPrecedeThoseInheritedFromTextWhenTruncateTailMode
+{
+  ASTextNode *textNode = [[ASTextNode alloc] init];
+  textNode.style.maxSize = CGSizeMake(20, 80);
+  NSMutableAttributedString *mas = [[NSMutableAttributedString alloc] initWithString:@"Quality is an important "];
+  [mas appendAttributedString:[[NSAttributedString alloc] initWithString:@"thing" attributes:@{ NSBackgroundColorAttributeName : UIColor.yellowColor}]];
+  textNode.attributedText = mas;
+  textNode.truncationMode = NSLineBreakByTruncatingTail;
+  
+  textNode.truncationAttributedText = [[NSAttributedString alloc] initWithString:@"\u2026" attributes:@{ NSBackgroundColorAttributeName: UIColor.greenColor }];
+  ASDisplayNodeSizeToFitSizeRange(textNode, ASSizeRangeMake(CGSizeZero, CGSizeMake(INFINITY, INFINITY)));
+  ASSnapshotVerifyNode(textNode, nil);
+}
+
 @end
diff --git a/Tests/ReferenceImages_iOS_10/ASTextNodeSnapshotTests/testThatTruncationTokenAttributesPrecedeThoseInheritedFromTextWhenTruncateTailMode@2x.png b/Tests/ReferenceImages_iOS_10/ASTextNodeSnapshotTests/testThatTruncationTokenAttributesPrecedeThoseInheritedFromTextWhenTruncateTailMode@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..40351ad62b1b5757f6367d86c7d3a20fa42f676d
GIT binary patch
literal 2396
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
O0000<MNUMnLSTYPV}zOj

literal 0
HcmV?d00001