Sequenceのextensionを分離

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 3a898b7..7300b4c 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -31,6 +31,7 @@
                F421850A1DF44AA900256590 /* AirBaseWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F421850C1DF44AA900256590 /* AirBaseWindowController.xib */; };
                F421850F1DF4518000256590 /* BroswerTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F421850E1DF4518000256590 /* BroswerTouchBar.xib */; };
                F42185111DF461A600256590 /* ScreenshotTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F42185101DF461A600256590 /* ScreenshotTouchBar.xib */; };
+               F421D46B2116A083006F33E0 /* SequenceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F421D46A2116A083006F33E0 /* SequenceExtensions.swift */; };
                F422D64C1FED474100183199 /* EnhancementListItemDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F422D64B1FED474100183199 /* EnhancementListItemDownloader.swift */; };
                F422D64E1FEE14D500183199 /* ViewAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F422D64D1FEE14D500183199 /* ViewAnimation.swift */; };
                F422D6521FEF584100183199 /* SakutekiTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F422D6511FEF584100183199 /* SakutekiTest.swift */; };
@@ -415,6 +416,7 @@
                F421850D1DF44AEA00256590 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AirBaseWindowController.xib; sourceTree = "<group>"; };
                F421850E1DF4518000256590 /* BroswerTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BroswerTouchBar.xib; sourceTree = "<group>"; };
                F42185101DF461A600256590 /* ScreenshotTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ScreenshotTouchBar.xib; sourceTree = "<group>"; };
+               F421D46A2116A083006F33E0 /* SequenceExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SequenceExtensions.swift; sourceTree = "<group>"; };
                F422D64B1FED474100183199 /* EnhancementListItemDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnhancementListItemDownloader.swift; sourceTree = "<group>"; };
                F422D64D1FEE14D500183199 /* ViewAnimation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewAnimation.swift; sourceTree = "<group>"; };
                F422D6511FEF584100183199 /* SakutekiTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SakutekiTest.swift; sourceTree = "<group>"; };
@@ -810,6 +812,7 @@
                                F455DDC01FA4A6CD00CDE64D /* Logger.swift */,
                                F455DDC21FA4A9E400CDE64D /* LoggerExtension.swift */,
                                F40F976E1E67092600AE81BB /* ArrayExtensions.swift */,
+                               F421D46A2116A083006F33E0 /* SequenceExtensions.swift */,
                                F404AF561F2CDD1C00A006B8 /* DefaultKey.swift */,
                                F404AF611F2D8CAE00A006B8 /* DefaultKeys.swift */,
                                F48883461F2E2E9A0069E0C3 /* DefaultKeyExtendedValues.swift */,
@@ -1675,6 +1678,7 @@
                                F44BC71B1E29DCB4004644E3 /* MemberKDockCommand.swift in Sources */,
                                F46FEA3F1F81285D00E2427C /* Localizable.swift in Sources */,
                                F4AC136F1E0963DB00851147 /* ProgressPanel.swift in Sources */,
+                               F421D46B2116A083006F33E0 /* SequenceExtensions.swift in Sources */,
                                F481D63F1F9105CB007E2CBE /* Entities.swift in Sources */,
                                F4AA592A1E1D1387001667AF /* IgnoreZeroTransformer.swift in Sources */,
                                F4AC136D1E0802C000851147 /* PreferencePanelController.swift in Sources */,

diff --git a/KCD/ArrayExtensions.swift b/KCD/ArrayExtensions.swift
index 95b2209..4b44338 100644 (file)
--- a/KCD/ArrayExtensions.swift
+++ b/KCD/ArrayExtensions.swift
@@ -8,27 +8,6 @@
 
 import Foundation
 
-// powered by http://stackoverflow.com/questions/40579554/how-to-display-unique-elements-of-an-array-using-swift
-extension Sequence where Iterator.Element: Hashable {
-    
-    func unique() -> [Iterator.Element] {
-        
-        var alreadyAdded = Set<Iterator.Element>()
-        
-        return filter {
-            
-            if alreadyAdded.contains($0) {
-                
-                return false
-            }
-            
-            alreadyAdded.insert($0)
-            
-            return true
-        }
-    }
-}
-
 extension Array {
     
     func appended(_ elem: () -> Element) -> Array {

diff --git a/KCD/SequenceExtensions.swift b/KCD/SequenceExtensions.swift
new file mode 100644 (file)
index 0000000..2bb7882
--- /dev/null
+++ b/KCD/SequenceExtensions.swift
@@ -0,0 +1,40 @@
+//
+//  SequenceExtensions.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2018/08/05.
+//  Copyright © 2018年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+
+// powered by http://stackoverflow.com/questions/40579554/how-to-display-unique-elements-of-an-array-using-swift
+extension Sequence where Element: Hashable {
+    
+    func unique() -> [Element] {
+        
+        var alreadyAdded = Set<Element>()
+        
+        return filter {
+            
+            if alreadyAdded.contains($0) {
+                
+                return false
+            }
+            
+            alreadyAdded.insert($0)
+            
+            return true
+        }
+    }
+}
+
+extension Sequence {
+    
+    func noneOp(_ f: (Self) -> Void) -> Self {
+        
+        f(self)
+        
+        return self
+    }
+}