Merge pull request #30 from hyperoslo/improve/truncate

zenangst · zenangst · commit 985e2d5d3823 · 2016-01-07T19:47:09.000+01:00
Refactor String.truncate
diff --git a/Source/Shared/Extensions/String+CoreFoundation.swift b/Source/Shared/Extensions/String+CoreFoundation.swift
@@ -9,9 +9,9 @@ public extension String {
   }
 
   func truncate(length: Int, suffix: String = "...") -> String {
-    guard self.characters.count > length else { return self }
-
-    return self.substringToIndex(self.startIndex.advancedBy(length)) + suffix
+    return self.characters.count > length
+      ? self.substringToIndex(self.startIndex.advancedBy(length)) + suffix
+      : self
   }
 
   func split(delimiter: String) -> [String] {

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ public extension String {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`func truncate(length: Int, suffix: String = "...") -> String {`
`12`		`- guard self.characters.count > length else { return self }`
`13`		`-`
`14`		`- return self.substringToIndex(self.startIndex.advancedBy(length)) + suffix`
	`12`	`+ return self.characters.count > length`
	`13`	`+ ? self.substringToIndex(self.startIndex.advancedBy(length)) + suffix`
	`14`	`+ : self`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func split(delimiter: String) -> [String] {`