Skip to content

Commit 3f392e9

Browse files
committed
Revert "Fix String.deletingPathExtension Inconsistency"
This reverts commit c171fed.
1 parent c171fed commit 3f392e9

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Foundation/NSPathUtilities.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ internal extension String {
6868
} else if char == "." {
6969
if lastCompStartPos == prevPos {
7070
return nil
71-
} else if case let prevPrevPos = index(before: prevPos), prevPos == index(before: endIndex) && prevPrevPos == lastCompStartPos && self[prevPrevPos] == "." {
72-
return nil
7371
} else {
7472
return curPos
7573
}
@@ -264,7 +262,7 @@ public extension NSString {
264262
if fixedSelf.length <= 1 {
265263
return fixedSelf
266264
}
267-
if let extensionPos = fixedSelf._startOfPathExtension {
265+
if let extensionPos = (fixedSelf._startOfPathExtension) {
268266
return String(fixedSelf.prefix(upTo: fixedSelf.index(before: extensionPos)))
269267
} else {
270268
return fixedSelf

TestFoundation/TestNSString.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,6 @@ class TestNSString : XCTestCase {
10781078
NSString(string: "scratch..tiff") : "scratch.",
10791079
NSString(string: ".tiff") : ".tiff",
10801080
NSString(string: "/") : "/",
1081-
NSString(string: "..") : "..",
10821081
]
10831082
for (fileName, expectedResult) in values {
10841083
let result = fileName.deletingPathExtension

0 commit comments

Comments
 (0)