From 109f498291ecd55bd24b2c3b6b85d3e73e4d32d0 Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Tue, 27 Sep 2016 00:17:53 +0200
Subject: [PATCH] GH-286 Rename and use Any?

---
 SwiftNeoVim/NeoVimView.swift         |  4 +--
 SwiftNeoVim/NeoVimViewDelegate.swift |  4 +--
 VimR/MainWindowComponent.swift       | 41 ++++++++++++++++------------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/SwiftNeoVim/NeoVimView.swift b/SwiftNeoVim/NeoVimView.swift
index 05ccaa0e..abcd4d79 100644
--- a/SwiftNeoVim/NeoVimView.swift
+++ b/SwiftNeoVim/NeoVimView.swift
@@ -1232,7 +1232,7 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
   
   public func setTitle(_ title: String) {
     DispatchUtils.gui {
-      self.delegate?.setTitle(title)
+      self.delegate?.set(title: title)
     }
   }
   
@@ -1241,7 +1241,7 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
 
   public func setDirtyStatus(_ dirty: Bool) {
     DispatchUtils.gui {
-      self.delegate?.setDirtyStatus(dirty)
+      self.delegate?.set(dirtyStatus: dirty)
     }
   }
 
diff --git a/SwiftNeoVim/NeoVimViewDelegate.swift b/SwiftNeoVim/NeoVimViewDelegate.swift
index 0d2f77af..2e180a47 100644
--- a/SwiftNeoVim/NeoVimViewDelegate.swift
+++ b/SwiftNeoVim/NeoVimViewDelegate.swift
@@ -8,8 +8,8 @@ import Cocoa
 // See http://stackoverflow.com/a/24104371 for class
 public protocol NeoVimViewDelegate: class {
   
-  func setTitle(_ title: String)
-  func setDirtyStatus(_ dirty: Bool)
+  func set(title: String)
+  func set(dirtyStatus: Bool)
   func cwdChanged()
   func neoVimStopped()
 }
diff --git a/VimR/MainWindowComponent.swift b/VimR/MainWindowComponent.swift
index 8264a9d8..cca26e51 100644
--- a/VimR/MainWindowComponent.swift
+++ b/VimR/MainWindowComponent.swift
@@ -15,16 +15,24 @@ enum MainWindowAction {
 
 class MainWindowComponent: WindowComponent, NSWindowDelegate {
 
-  fileprivate let fontManager = NSFontManager.shared()
+  fileprivate static let nibName = "MainWindow"
 
   fileprivate var defaultEditorFont: NSFont
   fileprivate var usesLigatures: Bool
 
+  fileprivate var _cwd: URL = URL(fileURLWithPath: NSHomeDirectory(), isDirectory: true)
+
+  fileprivate let fontManager = NSFontManager.shared()
+  fileprivate let fileItemService: FileItemService
+
+  fileprivate let workspace: Workspace
+  fileprivate let neoVimView: NeoVimView
+
+  // MARK: - API
   var uuid: String {
     return self.neoVimView.uuid
   }
 
-  fileprivate var _cwd: URL = URL(fileURLWithPath: NSHomeDirectory(), isDirectory: true)
   var cwd: URL {
     get {
       self._cwd = self.neoVimView.cwd
@@ -43,10 +51,6 @@ class MainWindowComponent: WindowComponent, NSWindowDelegate {
       self.fileItemService.monitor(url: newValue)
     }
   }
-  fileprivate let fileItemService: FileItemService
-
-  fileprivate let workspace: Workspace
-  fileprivate let neoVimView: NeoVimView
 
   // TODO: Consider an option object for cwd, urls, etc...
   init(source: Observable<Any>,
@@ -66,7 +70,7 @@ class MainWindowComponent: WindowComponent, NSWindowDelegate {
     self.fileItemService = fileItemService
     self._cwd = cwd
 
-    super.init(source: source, nibName: "MainWindow")
+    super.init(source: source, nibName: MainWindowComponent.nibName)
 
     self.window.delegate = self
 
@@ -99,6 +103,7 @@ class MainWindowComponent: WindowComponent, NSWindowDelegate {
     self.neoVimView.closeAllWindowsWithoutSaving()
   }
 
+  // MARK: - WindowComponent
   override func addViews() {
     self.window.contentView?.addSubview(self.workspace)
     self.workspace.autoPinEdgesToSuperviewEdges()
@@ -122,11 +127,11 @@ class MainWindowComponent: WindowComponent, NSWindowDelegate {
 // MARK: - File Menu Items
 extension MainWindowComponent {
   
-  @IBAction func newTab(_ sender: AnyObject!) {
+  @IBAction func newTab(_ sender: Any?) {
     self.neoVimView.newTab()
   }
 
-  @IBAction func openDocument(_ sender: AnyObject!) {
+  @IBAction func openDocument(_ sender: Any?) {
     let panel = NSOpenPanel()
     panel.canChooseDirectories = true
     panel.beginSheetModal(for: self.window) { result in
@@ -139,11 +144,11 @@ extension MainWindowComponent {
     }
   }
 
-  @IBAction func openQuickly(_ sender: AnyObject!) {
+  @IBAction func openQuickly(_ sender: Any?) {
     self.publish(event: MainWindowAction.openQuickly(mainWindow: self))
   }
 
-  @IBAction func saveDocument(_ sender: AnyObject!) {
+  @IBAction func saveDocument(_ sender: Any?) {
     let curBuf = self.neoVimView.currentBuffer()
     
     if curBuf.fileName == nil {
@@ -154,7 +159,7 @@ extension MainWindowComponent {
     self.neoVimView.saveCurrentTab()
   }
   
-  @IBAction func saveDocumentAs(_ sender: AnyObject!) {
+  @IBAction func saveDocumentAs(_ sender: Any?) {
     self.savePanelSheet { url in
       self.neoVimView.saveCurrentTab(url: url)
       
@@ -196,18 +201,18 @@ extension MainWindowComponent {
 // MARK: - Font Menu Items
 extension MainWindowComponent {
 
-  @IBAction func resetFontSize(_ sender: AnyObject!) {
+  @IBAction func resetFontSize(_ sender: Any?) {
     self.neoVimView.font = self.defaultEditorFont
   }
 
-  @IBAction func makeFontBigger(_ sender: AnyObject!) {
+  @IBAction func makeFontBigger(_ sender: Any?) {
     let curFont = self.neoVimView.font
     let font = self.fontManager.convert(curFont,
                                             toSize: min(curFont.pointSize + 1, PrefStore.maximumEditorFontSize))
     self.neoVimView.font = font
   }
 
-  @IBAction func makeFontSmaller(_ sender: AnyObject!) {
+  @IBAction func makeFontSmaller(_ sender: Any?) {
     let curFont = self.neoVimView.font
     let font = self.fontManager.convert(curFont,
                                             toSize: max(curFont.pointSize - 1, PrefStore.minimumEditorFontSize))
@@ -218,12 +223,12 @@ extension MainWindowComponent {
 // MARK: - NeoVimViewDelegate
 extension MainWindowComponent: NeoVimViewDelegate {
 
-  func setTitle(_ title: String) {
+  func set(title: String) {
     self.window.title = title
   }
 
-  func setDirtyStatus(_ dirty: Bool) {
-    self.windowController.setDocumentEdited(dirty)
+  func set(dirtyStatus: Bool) {
+    self.windowController.setDocumentEdited(dirtyStatus)
   }
 
   func cwdChanged() {