Merge pull request #1709 from maicki/TextKitTruncationFixFollowUp

appleguy · appleguy · commit 735a8d5088d0 · 2016-06-04T15:44:57.000-07:00
Change visibleSizeRange to return a range with 0 location and length
diff --git a/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm b/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm
@@ -272,7 +272,7 @@ - (NSRange)firstVisibleRange
     return visibleRanges[0];
   }
   
-  return NSMakeRange(NSNotFound, 0);
+  return NSMakeRange(0, 0);
 }
 
 @end
diff --git a/AsyncDisplayKitTests/ASTextKitTruncationTests.mm b/AsyncDisplayKitTests/ASTextKitTruncationTests.mm
@@ -152,7 +152,7 @@ - (void)testHandleZeroSizeConstrainedSize
                                                                    avoidTailTruncationSet:nil];
   XCTAssertNoThrow([tailTruncater truncate]);
   XCTAssert(tailTruncater.visibleRanges.size() == 0);
-  NSEqualRanges(NSMakeRange(NSNotFound, 0), tailTruncater.firstVisibleRange);
+  NSEqualRanges(NSMakeRange(0, 0), tailTruncater.firstVisibleRange);
 }
 
 - (void)testHandleZeroHeightConstrainedSize

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ - (NSRange)firstVisibleRange`
`272`	`272`	`return visibleRanges[0];`
`273`	`273`	`}`
`274`	`274`
`275`		`- return NSMakeRange(NSNotFound, 0);`
	`275`	`+ return NSMakeRange(0, 0);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ - (void)testHandleZeroSizeConstrainedSize`
`152`	`152`	`avoidTailTruncationSet:nil];`
`153`	`153`	`XCTAssertNoThrow([tailTruncater truncate]);`
`154`	`154`	`XCTAssert(tailTruncater.visibleRanges.size() == 0);`
`155`		`- NSEqualRanges(NSMakeRange(NSNotFound, 0), tailTruncater.firstVisibleRange);`
	`155`	`+ NSEqualRanges(NSMakeRange(0, 0), tailTruncater.firstVisibleRange);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`- (void)testHandleZeroHeightConstrainedSize`