From dcdee489da8f4ec3d2c18fea19c68e50f2d8e7ae Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Sat, 11 Mar 2017 17:08:50 +0100 Subject: [PATCH] Rename transformers to reducers... --- VimR.xcodeproj/project.pbxproj | 96 +++++++++---------- VimR/AdvancedPrefTransformer.swift | 2 +- ...sformer.swift => AppDelegateReducer.swift} | 2 +- ...rmer.swift => AppearancePrefReducer.swift} | 2 +- VimR/Context.swift | 2 +- ...sformer.swift => FileBrowserReducer.swift} | 2 +- ...sformer.swift => FileMonitorReducer.swift} | 2 +- ...sformer.swift => GeneralPrefReducer.swift} | 2 +- ...nsformer.swift => MainWindowReducer.swift} | 2 +- ...sformer.swift => OpenQuicklyReducer.swift} | 4 +- ...rmer.swift => OpenedFileListReducer.swift} | 2 +- VimR/PrefService.swift | 3 +- ...nsformer.swift => PrefWindowReducer.swift} | 2 +- ...Transformer.swift => PreviewReducer.swift} | 4 +- ...sformer.swift => PreviewToolReducer.swift} | 2 +- VimR/Types.swift | 2 +- ...tTransformer.swift => UiRootReducer.swift} | 2 +- 17 files changed, 66 insertions(+), 67 deletions(-) rename VimR/{AppDelegateTransformer.swift => AppDelegateReducer.swift} (97%) rename VimR/{AppearancePrefTransformer.swift => AppearancePrefReducer.swift} (95%) rename VimR/{FileBrowserTransformer.swift => FileBrowserReducer.swift} (94%) rename VimR/{FileMonitorTransformer.swift => FileMonitorReducer.swift} (95%) rename VimR/{GeneralPrefTransformer.swift => GeneralPrefReducer.swift} (94%) rename VimR/{MainWindowTransformer.swift => MainWindowReducer.swift} (98%) rename VimR/{OpenQuicklyTransformer.swift => OpenQuicklyReducer.swift} (95%) rename VimR/{OpenedFileListTransformer.swift => OpenedFileListReducer.swift} (92%) rename VimR/{PrefWindowTransformer.swift => PrefWindowReducer.swift} (91%) rename VimR/{PreviewTransformer.swift => PreviewReducer.swift} (95%) rename VimR/{PreviewToolTransformer.swift => PreviewToolReducer.swift} (97%) rename VimR/{UiRootTransformer.swift => UiRootReducer.swift} (97%) diff --git a/VimR.xcodeproj/project.pbxproj b/VimR.xcodeproj/project.pbxproj index 341ce267..367cba42 100644 --- a/VimR.xcodeproj/project.pbxproj +++ b/VimR.xcodeproj/project.pbxproj @@ -17,30 +17,30 @@ 1929B1837C750CADB3A5BCB9 /* OpenQuicklyFileViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B1558455B3A74D93EF2A /* OpenQuicklyFileViewRow.swift */; }; 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */; }; 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */; }; - 1929B29B95AD176D57942E08 /* UiRootTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B457B9D0FA4D21F3751E /* UiRootTransformer.swift */; }; - 1929B3217A7A3D79E28C80DB /* PrefWindowTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B49E6924847AD085C8C9 /* PrefWindowTransformer.swift */; }; + 1929B29B95AD176D57942E08 /* UiRootReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B457B9D0FA4D21F3751E /* UiRootReducer.swift */; }; + 1929B3217A7A3D79E28C80DB /* PrefWindowReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B49E6924847AD085C8C9 /* PrefWindowReducer.swift */; }; 1929B333855A5406C400DA92 /* OpenQuicklyFilterOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEDE7F92BC7B49E802AF /* OpenQuicklyFilterOperation.swift */; }; 1929B3557317755A43513B17 /* OpenQuicklyWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B71A92C24FEFE79A851E /* OpenQuicklyWindow.swift */; }; 1929B387E6B085D96945CCAB /* AdvancedPrefTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5792DE4EFE4D1FEB664 /* AdvancedPrefTransformer.swift */; }; - 1929B3AC66EFE35D68C020E3 /* PreviewToolTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BFB0F294F3714D5E095F /* PreviewToolTransformer.swift */; }; + 1929B3AC66EFE35D68C020E3 /* PreviewToolReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BFB0F294F3714D5E095F /* PreviewToolReducer.swift */; }; 1929B3CEE0C1A1850E9CCE2F /* BasicTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B2FBE11048569391E092 /* BasicTypes.swift */; }; 1929B3F5743967125F357C9F /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEEB33113B0E33C3830F /* Matcher.swift */; }; 1929B462CD4935AFF6D69457 /* FileItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7CB4863F80230C32D3C /* FileItem.swift */; }; - 1929B4B70926DE113E6BF990 /* PreviewTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE37AA2843779CAFA76F /* PreviewTransformer.swift */; }; - 1929B4E54E2F13A7F5F2B682 /* OpenedFileListTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B67A10E6BB2986B2416E /* OpenedFileListTransformer.swift */; }; + 1929B4B70926DE113E6BF990 /* PreviewReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE37AA2843779CAFA76F /* PreviewReducer.swift */; }; + 1929B4E54E2F13A7F5F2B682 /* OpenedFileListReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B67A10E6BB2986B2416E /* OpenedFileListReducer.swift */; }; 1929B4F0612224E594E89B92 /* AppearancePref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B0FBFB766042CF06E463 /* AppearancePref.swift */; }; 1929B4FEE6EB56EF3F56B805 /* Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B34FC23D805A8B29E8F7 /* Context.swift */; }; 1929B50D933A369A86A165DE /* AdvencedPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BBE0A534F2F6009D31BE /* AdvencedPref.swift */; }; 1929B53876E6952D378C2B30 /* ScoredFileItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */; }; - 1929B5543B1E31A26096E656 /* FileMonitorTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B04EC69F616EEFAF5F96 /* FileMonitorTransformer.swift */; }; + 1929B5543B1E31A26096E656 /* FileMonitorReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B04EC69F616EEFAF5F96 /* FileMonitorReducer.swift */; }; 1929B59FA5C286E010F70BEE /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BFC0A5A9C6DB09BE1368 /* Types.swift */; }; 1929B5C1BABBC0D09D97C3EF /* PreviewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B617C229B19DB3E987B8 /* PreviewService.swift */; }; 1929B5F016431A76292D1E84 /* FileMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B365A6434354B568B04F /* FileMonitor.swift */; }; 1929B6388EAF16C190B82955 /* FileItemIgnorePattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B69499B2569793350CEC /* FileItemIgnorePattern.swift */; }; 1929B67DA3EB21A631EF1DBB /* FileUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA8AC40B901B20F20B71 /* FileUtils.swift */; }; - 1929B6BE1610892E6C4C0CE6 /* GeneralPrefTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B0EB3F49C42A57D083AF /* GeneralPrefTransformer.swift */; }; - 1929B6D8F5FC723B7109031F /* OpenQuicklyTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B12CE56A9B36980288A4 /* OpenQuicklyTransformer.swift */; }; - 1929B71381946860626E5224 /* FileBrowserTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDC8F5D48578A90236E9 /* FileBrowserTransformer.swift */; }; + 1929B6BE1610892E6C4C0CE6 /* GeneralPrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B0EB3F49C42A57D083AF /* GeneralPrefReducer.swift */; }; + 1929B6D8F5FC723B7109031F /* OpenQuicklyReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B12CE56A9B36980288A4 /* OpenQuicklyReducer.swift */; }; + 1929B71381946860626E5224 /* FileBrowserReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */; }; 1929B71610FF1DC6E459BA49 /* PreviewUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B8EF9A9F5ACC175452BD /* PreviewUtils.swift */; }; 1929B728262BAA14FC93F6AC /* NeoVimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BF00B466B40629C2AABE /* NeoVimView.swift */; }; 1929B7A2F2B423AA9740FD45 /* FileUtilsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5D977261F1EBFA9E8F1 /* FileUtilsTest.swift */; }; @@ -53,12 +53,12 @@ 1929BA76A1D97D8226F7CFB1 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6AD3396160AA2C46919 /* Debouncer.swift */; }; 1929BAE4900D72A7877741B1 /* PrefWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE168F31344B69E61B62 /* PrefWindow.swift */; }; 1929BAFF1E011321D3186EE6 /* UiRoot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD4149D5A25C82064DD8 /* UiRoot.swift */; }; - 1929BB4A9B2FA42A64CCCC76 /* MainWindowTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD83A13BF133741766CC /* MainWindowTransformer.swift */; }; - 1929BCC7908DD899999B70BE /* AppearancePrefTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BED01F5D94BFCA4CF80F /* AppearancePrefTransformer.swift */; }; + 1929BB4A9B2FA42A64CCCC76 /* MainWindowReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD83A13BF133741766CC /* MainWindowReducer.swift */; }; + 1929BCC7908DD899999B70BE /* AppearancePrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BED01F5D94BFCA4CF80F /* AppearancePrefReducer.swift */; }; 1929BCC9D3604933DFF07E2E /* FileBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA5C7099CDEB04B76BA4 /* FileBrowser.swift */; }; 1929BCF444CE7F1D14D421DE /* FileItemTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B4778E20696E3AAFB69B /* FileItemTest.swift */; }; 1929BD2F41D93ADFF43C1C98 /* NetUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B02440BC99C42F9EBD45 /* NetUtils.m */; }; - 1929BD3878A3A47B8D685CD2 /* AppDelegateTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7A68B7109CEFAF105E8 /* AppDelegateTransformer.swift */; }; + 1929BD3878A3A47B8D685CD2 /* AppDelegateReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7A68B7109CEFAF105E8 /* AppDelegateReducer.swift */; }; 1929BD3F9E609BFADB27584B /* Scorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9D510177918080BE39B /* Scorer.swift */; }; 1929BD4CA2204E061A86A140 /* MatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BC19C1BC19246AFF1621 /* MatcherTests.swift */; }; 1929BE0DAEE9664C5BCFA211 /* States.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6608B4F0E037CA0F4C /* States.swift */; }; @@ -297,12 +297,12 @@ /* Begin PBXFileReference section */ 1929B015804B46789F719C01 /* ImageAndTextTableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAndTextTableCell.swift; sourceTree = ""; }; 1929B02440BC99C42F9EBD45 /* NetUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetUtils.m; sourceTree = ""; }; - 1929B04EC69F616EEFAF5F96 /* FileMonitorTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileMonitorTransformer.swift; sourceTree = ""; }; + 1929B04EC69F616EEFAF5F96 /* FileMonitorReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileMonitorReducer.swift; sourceTree = ""; }; 1929B07A4A9209C88380E015 /* PrefPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefPane.swift; sourceTree = ""; }; - 1929B0EB3F49C42A57D083AF /* GeneralPrefTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPrefTransformer.swift; sourceTree = ""; }; + 1929B0EB3F49C42A57D083AF /* GeneralPrefReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPrefReducer.swift; sourceTree = ""; }; 1929B0EEBE4A765934AF8335 /* DataWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataWrapper.h; sourceTree = ""; }; 1929B0FBFB766042CF06E463 /* AppearancePref.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearancePref.swift; sourceTree = ""; }; - 1929B12CE56A9B36980288A4 /* OpenQuicklyTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyTransformer.swift; sourceTree = ""; }; + 1929B12CE56A9B36980288A4 /* OpenQuicklyReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyReducer.swift; sourceTree = ""; }; 1929B1558455B3A74D93EF2A /* OpenQuicklyFileViewRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyFileViewRow.swift; sourceTree = ""; }; 1929B15B7EDC9B0F40E5E95C /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; 1929B1A51F076E088EF4CCA4 /* server_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_globals.h; sourceTree = ""; }; @@ -311,22 +311,22 @@ 1929B34FC23D805A8B29E8F7 /* Context.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Context.swift; sourceTree = ""; }; 1929B364460D86F17E80943C /* PrefService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefService.swift; sourceTree = ""; }; 1929B365A6434354B568B04F /* FileMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileMonitor.swift; sourceTree = ""; }; - 1929B457B9D0FA4D21F3751E /* UiRootTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UiRootTransformer.swift; sourceTree = ""; }; + 1929B457B9D0FA4D21F3751E /* UiRootReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UiRootReducer.swift; sourceTree = ""; }; 1929B4778E20696E3AAFB69B /* FileItemTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemTest.swift; sourceTree = ""; }; 1929B477E1E62433BC48E10B /* ArrayCommonsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayCommonsTest.swift; sourceTree = ""; }; - 1929B49E6924847AD085C8C9 /* PrefWindowTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefWindowTransformer.swift; sourceTree = ""; }; + 1929B49E6924847AD085C8C9 /* PrefWindowReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefWindowReducer.swift; sourceTree = ""; }; 1929B5046239709E33516F5C /* Pref128ToCurrentConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pref128ToCurrentConverter.swift; sourceTree = ""; }; 1929B56C8ED31834BA9D8543 /* FileItemUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemUtils.swift; sourceTree = ""; }; 1929B5792DE4EFE4D1FEB664 /* AdvancedPrefTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedPrefTransformer.swift; sourceTree = ""; }; 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CocoaCategories.m; sourceTree = ""; }; 1929B5D977261F1EBFA9E8F1 /* FileUtilsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileUtilsTest.swift; sourceTree = ""; }; 1929B617C229B19DB3E987B8 /* PreviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewService.swift; sourceTree = ""; }; - 1929B67A10E6BB2986B2416E /* OpenedFileListTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenedFileListTransformer.swift; sourceTree = ""; }; + 1929B67A10E6BB2986B2416E /* OpenedFileListReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenedFileListReducer.swift; sourceTree = ""; }; 1929B69499B2569793350CEC /* FileItemIgnorePattern.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemIgnorePattern.swift; sourceTree = ""; }; 1929B6AD3396160AA2C46919 /* Debouncer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Debouncer.swift; sourceTree = ""; }; 1929B6C6C7792B05164B0216 /* PreviewTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewTool.swift; sourceTree = ""; }; 1929B71A92C24FEFE79A851E /* OpenQuicklyWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyWindow.swift; sourceTree = ""; }; - 1929B7A68B7109CEFAF105E8 /* AppDelegateTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegateTransformer.swift; sourceTree = ""; }; + 1929B7A68B7109CEFAF105E8 /* AppDelegateReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegateReducer.swift; sourceTree = ""; }; 1929B7CB4863F80230C32D3C /* FileItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItem.swift; sourceTree = ""; }; 1929B8EF9A9F5ACC175452BD /* PreviewUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewUtils.swift; sourceTree = ""; }; 1929B93013228985F509C8F6 /* server_ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = server_ui.m; sourceTree = ""; }; @@ -346,18 +346,18 @@ 1929BC19C1BC19246AFF1621 /* MatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatcherTests.swift; sourceTree = ""; }; 1929BCE3E156C06EDF1F2806 /* FileOutlineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileOutlineView.swift; sourceTree = ""; }; 1929BD4149D5A25C82064DD8 /* UiRoot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UiRoot.swift; sourceTree = ""; }; - 1929BD83A13BF133741766CC /* MainWindowTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowTransformer.swift; sourceTree = ""; }; + 1929BD83A13BF133741766CC /* MainWindowReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowReducer.swift; sourceTree = ""; }; 1929BD8CBADC191CF8C85309 /* MainWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindow.swift; sourceTree = ""; }; - 1929BDC8F5D48578A90236E9 /* FileBrowserTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowserTransformer.swift; sourceTree = ""; }; + 1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowserReducer.swift; sourceTree = ""; }; 1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScoredFileItem.swift; sourceTree = ""; }; 1929BE168F31344B69E61B62 /* PrefWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefWindow.swift; sourceTree = ""; }; - 1929BE37AA2843779CAFA76F /* PreviewTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewTransformer.swift; sourceTree = ""; }; + 1929BE37AA2843779CAFA76F /* PreviewReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewReducer.swift; sourceTree = ""; }; 1929BE69CF9AB1A10D0DD4F2 /* CocoaCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaCategories.h; sourceTree = ""; }; - 1929BED01F5D94BFCA4CF80F /* AppearancePrefTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearancePrefTransformer.swift; sourceTree = ""; }; + 1929BED01F5D94BFCA4CF80F /* AppearancePrefReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearancePrefReducer.swift; sourceTree = ""; }; 1929BEDE7F92BC7B49E802AF /* OpenQuicklyFilterOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyFilterOperation.swift; sourceTree = ""; }; 1929BEEB33113B0E33C3830F /* Matcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Matcher.swift; sourceTree = ""; }; 1929BF00B466B40629C2AABE /* NeoVimView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimView.swift; sourceTree = ""; }; - 1929BFB0F294F3714D5E095F /* PreviewToolTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewToolTransformer.swift; sourceTree = ""; }; + 1929BFB0F294F3714D5E095F /* PreviewToolReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewToolReducer.swift; sourceTree = ""; }; 1929BFC0A5A9C6DB09BE1368 /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = ""; }; 4B029F1B1D45E349004EE0D3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PrefWindow.xib; sourceTree = ""; }; 4B0BCC931D70320C00D3CE65 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logger.h; path = VimR/Logger.h; sourceTree = SOURCE_ROOT; }; @@ -567,15 +567,15 @@ 1929B5E773BDB3B4EE9D00C1 /* Transformers */ = { isa = PBXGroup; children = ( - 1929B7A68B7109CEFAF105E8 /* AppDelegateTransformer.swift */, - 1929B457B9D0FA4D21F3751E /* UiRootTransformer.swift */, - 1929BD83A13BF133741766CC /* MainWindowTransformer.swift */, - 1929BE37AA2843779CAFA76F /* PreviewTransformer.swift */, - 1929BFB0F294F3714D5E095F /* PreviewToolTransformer.swift */, - 1929B12CE56A9B36980288A4 /* OpenQuicklyTransformer.swift */, - 1929B04EC69F616EEFAF5F96 /* FileMonitorTransformer.swift */, - 1929BDC8F5D48578A90236E9 /* FileBrowserTransformer.swift */, - 1929B67A10E6BB2986B2416E /* OpenedFileListTransformer.swift */, + 1929B7A68B7109CEFAF105E8 /* AppDelegateReducer.swift */, + 1929B457B9D0FA4D21F3751E /* UiRootReducer.swift */, + 1929BD83A13BF133741766CC /* MainWindowReducer.swift */, + 1929BE37AA2843779CAFA76F /* PreviewReducer.swift */, + 1929BFB0F294F3714D5E095F /* PreviewToolReducer.swift */, + 1929B12CE56A9B36980288A4 /* OpenQuicklyReducer.swift */, + 1929B04EC69F616EEFAF5F96 /* FileMonitorReducer.swift */, + 1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */, + 1929B67A10E6BB2986B2416E /* OpenedFileListReducer.swift */, 1929BB4CF1C1FFEE6CCDD6FD /* Preferences */, ); name = Transformers; @@ -598,9 +598,9 @@ 1929BB4CF1C1FFEE6CCDD6FD /* Preferences */ = { isa = PBXGroup; children = ( - 1929B49E6924847AD085C8C9 /* PrefWindowTransformer.swift */, - 1929B0EB3F49C42A57D083AF /* GeneralPrefTransformer.swift */, - 1929BED01F5D94BFCA4CF80F /* AppearancePrefTransformer.swift */, + 1929B49E6924847AD085C8C9 /* PrefWindowReducer.swift */, + 1929B0EB3F49C42A57D083AF /* GeneralPrefReducer.swift */, + 1929BED01F5D94BFCA4CF80F /* AppearancePrefReducer.swift */, ); name = Preferences; sourceTree = ""; @@ -1337,32 +1337,32 @@ 1929BE0DAEE9664C5BCFA211 /* States.swift in Sources */, 1929B4FEE6EB56EF3F56B805 /* Context.swift in Sources */, 1929B0FF696312F754BC96E2 /* MainWindow.swift in Sources */, - 1929BD3878A3A47B8D685CD2 /* AppDelegateTransformer.swift in Sources */, + 1929BD3878A3A47B8D685CD2 /* AppDelegateReducer.swift in Sources */, 1929BAFF1E011321D3186EE6 /* UiRoot.swift in Sources */, - 1929B29B95AD176D57942E08 /* UiRootTransformer.swift in Sources */, - 1929BB4A9B2FA42A64CCCC76 /* MainWindowTransformer.swift in Sources */, + 1929B29B95AD176D57942E08 /* UiRootReducer.swift in Sources */, + 1929BB4A9B2FA42A64CCCC76 /* MainWindowReducer.swift in Sources */, 1929B8FB248D71BF88A35761 /* PreviewTool.swift in Sources */, - 1929B4B70926DE113E6BF990 /* PreviewTransformer.swift in Sources */, + 1929B4B70926DE113E6BF990 /* PreviewReducer.swift in Sources */, 1929B5C1BABBC0D09D97C3EF /* PreviewService.swift in Sources */, 1929B0F599D1F62C7BE53D2C /* HttpServerService.swift in Sources */, - 1929B3AC66EFE35D68C020E3 /* PreviewToolTransformer.swift in Sources */, + 1929B3AC66EFE35D68C020E3 /* PreviewToolReducer.swift in Sources */, 1929B59FA5C286E010F70BEE /* Types.swift in Sources */, - 1929B6D8F5FC723B7109031F /* OpenQuicklyTransformer.swift in Sources */, - 1929B5543B1E31A26096E656 /* FileMonitorTransformer.swift in Sources */, + 1929B6D8F5FC723B7109031F /* OpenQuicklyReducer.swift in Sources */, + 1929B5543B1E31A26096E656 /* FileMonitorReducer.swift in Sources */, 1929B5F016431A76292D1E84 /* FileMonitor.swift in Sources */, - 1929B71381946860626E5224 /* FileBrowserTransformer.swift in Sources */, + 1929B71381946860626E5224 /* FileBrowserReducer.swift in Sources */, 1929BA715337FE26155B2071 /* OpenedFileList.swift in Sources */, - 1929B4E54E2F13A7F5F2B682 /* OpenedFileListTransformer.swift in Sources */, + 1929B4E54E2F13A7F5F2B682 /* OpenedFileListReducer.swift in Sources */, 1929BAE4900D72A7877741B1 /* PrefWindow.swift in Sources */, 1929BEAE0592096BC1191B67 /* PrefPane.swift in Sources */, 1929BEDE1BE950EDA9497363 /* GeneralPref.swift in Sources */, - 1929B3217A7A3D79E28C80DB /* PrefWindowTransformer.swift in Sources */, - 1929B6BE1610892E6C4C0CE6 /* GeneralPrefTransformer.swift in Sources */, + 1929B3217A7A3D79E28C80DB /* PrefWindowReducer.swift in Sources */, + 1929B6BE1610892E6C4C0CE6 /* GeneralPrefReducer.swift in Sources */, 1929B05B9D664052EC2D23EF /* FileOutlineView.swift in Sources */, 1929BCC9D3604933DFF07E2E /* FileBrowser.swift in Sources */, 1929B4F0612224E594E89B92 /* AppearancePref.swift in Sources */, 1929B50D933A369A86A165DE /* AdvencedPref.swift in Sources */, - 1929BCC7908DD899999B70BE /* AppearancePrefTransformer.swift in Sources */, + 1929BCC7908DD899999B70BE /* AppearancePrefReducer.swift in Sources */, 1929B387E6B085D96945CCAB /* AdvancedPrefTransformer.swift in Sources */, 1929B00BA624DA8DC75F7E02 /* SerializableStates.swift in Sources */, 1929B3557317755A43513B17 /* OpenQuicklyWindow.swift in Sources */, diff --git a/VimR/AdvancedPrefTransformer.swift b/VimR/AdvancedPrefTransformer.swift index 2402c379..fbef55fb 100644 --- a/VimR/AdvancedPrefTransformer.swift +++ b/VimR/AdvancedPrefTransformer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class AdvancedPrefTransformer: Transformer { +class AdvancedPrefTransformer: Reducer { typealias Pair = StateActionPair diff --git a/VimR/AppDelegateTransformer.swift b/VimR/AppDelegateReducer.swift similarity index 97% rename from VimR/AppDelegateTransformer.swift rename to VimR/AppDelegateReducer.swift index 07e65a43..57bb7dd8 100644 --- a/VimR/AppDelegateTransformer.swift +++ b/VimR/AppDelegateReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class AppDelegateTransformer: Transformer { +class AppDelegateTransformer: Reducer { typealias Pair = StateActionPair diff --git a/VimR/AppearancePrefTransformer.swift b/VimR/AppearancePrefReducer.swift similarity index 95% rename from VimR/AppearancePrefTransformer.swift rename to VimR/AppearancePrefReducer.swift index 5abb98a8..f58ba804 100644 --- a/VimR/AppearancePrefTransformer.swift +++ b/VimR/AppearancePrefReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class AppearancePrefTransformer: Transformer { +class AppearancePrefTransformer: Reducer { typealias Pair = StateActionPair diff --git a/VimR/Context.swift b/VimR/Context.swift index 29483e1d..cad246bb 100644 --- a/VimR/Context.swift +++ b/VimR/Context.swift @@ -174,7 +174,7 @@ class Context { extension Observable { - fileprivate func transform(by transformer: T) -> Observable where T.Element == Element { + fileprivate func transform(by transformer: T) -> Observable where T.Element == Element { return transformer.transform(self) } diff --git a/VimR/FileBrowserTransformer.swift b/VimR/FileBrowserReducer.swift similarity index 94% rename from VimR/FileBrowserTransformer.swift rename to VimR/FileBrowserReducer.swift index 85c5fc49..87cfc606 100644 --- a/VimR/FileBrowserTransformer.swift +++ b/VimR/FileBrowserReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class FileBrowserTransformer: Transformer { +class FileBrowserTransformer: Reducer { typealias Pair = StateActionPair, FileBrowser.Action> diff --git a/VimR/FileMonitorTransformer.swift b/VimR/FileMonitorReducer.swift similarity index 95% rename from VimR/FileMonitorTransformer.swift rename to VimR/FileMonitorReducer.swift index 24f3bc82..fc343dfe 100644 --- a/VimR/FileMonitorTransformer.swift +++ b/VimR/FileMonitorReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class FileMonitorTransformer: Transformer { +class FileMonitorTransformer: Reducer { typealias Pair = StateActionPair diff --git a/VimR/GeneralPrefTransformer.swift b/VimR/GeneralPrefReducer.swift similarity index 94% rename from VimR/GeneralPrefTransformer.swift rename to VimR/GeneralPrefReducer.swift index ce47d762..e155375e 100644 --- a/VimR/GeneralPrefTransformer.swift +++ b/VimR/GeneralPrefReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class GeneralPrefTransformer: Transformer { +class GeneralPrefTransformer: Reducer { typealias Pair = StateActionPair diff --git a/VimR/MainWindowTransformer.swift b/VimR/MainWindowReducer.swift similarity index 98% rename from VimR/MainWindowTransformer.swift rename to VimR/MainWindowReducer.swift index ef21d85f..98589acd 100644 --- a/VimR/MainWindowTransformer.swift +++ b/VimR/MainWindowReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class MainWindowTransformer: Transformer { +class MainWindowTransformer: Reducer { typealias Pair = StateActionPair, MainWindow.Action> diff --git a/VimR/OpenQuicklyTransformer.swift b/VimR/OpenQuicklyReducer.swift similarity index 95% rename from VimR/OpenQuicklyTransformer.swift rename to VimR/OpenQuicklyReducer.swift index 15360f67..bf484db9 100644 --- a/VimR/OpenQuicklyTransformer.swift +++ b/VimR/OpenQuicklyReducer.swift @@ -14,7 +14,7 @@ class OpenQuicklyTransformer { extension OpenQuicklyTransformer { - class OpenQuicklyWindowTransformer: Transformer { + class OpenQuicklyWindowTransformer: Reducer { typealias Pair = StateActionPair @@ -45,7 +45,7 @@ extension OpenQuicklyTransformer { } } - class MainWindowTransformer: Transformer { + class MainWindowTransformer: Reducer { typealias Pair = StateActionPair> diff --git a/VimR/OpenedFileListTransformer.swift b/VimR/OpenedFileListReducer.swift similarity index 92% rename from VimR/OpenedFileListTransformer.swift rename to VimR/OpenedFileListReducer.swift index acfb32c0..ec3fbdc8 100644 --- a/VimR/OpenedFileListTransformer.swift +++ b/VimR/OpenedFileListReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class OpenedFileListTransformer: Transformer { +class OpenedFileListTransformer: Reducer { typealias Pair = StateActionPair, OpenedFileList.Action> diff --git a/VimR/PrefService.swift b/VimR/PrefService.swift index 62884466..d1ebc0e8 100644 --- a/VimR/PrefService.swift +++ b/VimR/PrefService.swift @@ -7,7 +7,6 @@ import Foundation import Swifter import RxSwift - fileprivate let defaults = UserDefaults.standard class PrefService: Service { @@ -22,7 +21,7 @@ class PrefService: Service { return } - NSLog("saving pref!") + NSLog("Saving pref!") defaults.setValue(pair.state.dict(), forKey: PrefService.compatibleVersion) } } diff --git a/VimR/PrefWindowTransformer.swift b/VimR/PrefWindowReducer.swift similarity index 91% rename from VimR/PrefWindowTransformer.swift rename to VimR/PrefWindowReducer.swift index c0024061..d2882692 100644 --- a/VimR/PrefWindowTransformer.swift +++ b/VimR/PrefWindowReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class PrefWindowTransformer: Transformer { +class PrefWindowTransformer: Reducer { typealias Pair = StateActionPair diff --git a/VimR/PreviewTransformer.swift b/VimR/PreviewReducer.swift similarity index 95% rename from VimR/PreviewTransformer.swift rename to VimR/PreviewReducer.swift index 7e6d1398..a37ba0d7 100644 --- a/VimR/PreviewTransformer.swift +++ b/VimR/PreviewReducer.swift @@ -29,7 +29,7 @@ class PreviewTransformer { extension PreviewTransformer { - class MainWindowPreviewTransformer: Transformer { + class MainWindowPreviewTransformer: Reducer { typealias Pair = StateActionPair, MainWindow.Action> @@ -64,7 +64,7 @@ extension PreviewTransformer { fileprivate var parentTransformer: PreviewTransformer? } - class OpenedFileListTransformer: Transformer { + class OpenedFileListTransformer: Reducer { typealias Pair = StateActionPair, OpenedFileList.Action> diff --git a/VimR/PreviewToolTransformer.swift b/VimR/PreviewToolReducer.swift similarity index 97% rename from VimR/PreviewToolTransformer.swift rename to VimR/PreviewToolReducer.swift index 3835a241..e9fcad54 100644 --- a/VimR/PreviewToolTransformer.swift +++ b/VimR/PreviewToolReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class PreviewToolTransformer: Transformer { +class PreviewToolTransformer: Reducer { typealias Pair = StateActionPair, PreviewTool.Action> diff --git a/VimR/Types.swift b/VimR/Types.swift index eeb279f8..2f9314d8 100644 --- a/VimR/Types.swift +++ b/VimR/Types.swift @@ -94,7 +94,7 @@ class Marked: CustomStringConvertible { } } -protocol Transformer { +protocol Reducer { associatedtype Element diff --git a/VimR/UiRootTransformer.swift b/VimR/UiRootReducer.swift similarity index 97% rename from VimR/UiRootTransformer.swift rename to VimR/UiRootReducer.swift index 49681c6b..9a0ed7a9 100644 --- a/VimR/UiRootTransformer.swift +++ b/VimR/UiRootReducer.swift @@ -6,7 +6,7 @@ import Foundation import RxSwift -class UiRootTransformer: Transformer { +class UiRootTransformer: Reducer { typealias Pair = StateActionPair>