Merge pull request #109 from jpsim/jp-fix-stringByTrimmingTrailingCha…

…ractersInSet fix stringByTrimmingTrailingCharactersInSet
jpsim · Nov 28, 2015 · 3fe3f93 · 3fe3f93
2 parents 8889da5 + a8ae71d
commit 3fe3f93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@ None.
   [JP Simard](https://github.com/jpsim)
   [#65](https://github.com/jpsim/SourceKitten/issues/65)
 
+* Fix `String.stringByTrimmingTrailingCharactersInSet(_:)` returning full string
+  when all characters matched character set.  
+  [JP Simard](https://github.com/jpsim)
+
 
 ## 0.6.2
 

diff --git a/Source/SourceKittenFramework/String+SourceKitten.swift b/Source/SourceKittenFramework/String+SourceKitten.swift
@@ -89,7 +89,7 @@ extension NSString {
                 return substringWithRange(NSRange(location: 0, length: newLength))
             }
         }
-        return self as String
+        return ""
     }
 
     /**

diff --git a/Source/SourceKittenFrameworkTests/StringTests.swift b/Source/SourceKittenFrameworkTests/StringTests.swift
@@ -23,6 +23,8 @@ class StringTests: XCTestCase {
     func testStringByTrimmingTrailingCharactersInSet() {
         XCTAssertEqual("".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), "")
         XCTAssertEqual(" a ".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), " a")
+        XCTAssertEqual(" ".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), "")
+        XCTAssertEqual("a".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), "a")
     }
 
     func testCommentBody() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ extension NSString { @@
                     return substringWithRange(NSRange(location: 0, length: newLength))
                 }
             }
-            return self as String
+            return ""
         }
         /**
@@ Expand Down @@