custom binary option wiring

Author: georgeharker

VimR/VimR/AdvancedPrefReducer.swift

@@ -26,6 +26,9 @@ final class AdvancedPrefReducer: ReducerType {
 
     case let .setUseSnapshotUpdate(value):
       state.useSnapshotUpdate = value
+
+    case let .setNvimBinary(value):
+      state.mainWindowTemplate.nvimBinary = value
     }
 
     return (state, pair.action, true)

VimR/VimR/AdvencedPref.swift

@@ -15,6 +15,7 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
     case setUseSnapshotUpdate(Bool)
     case setUseLiveResize(Bool)
     case setDrawsParallel(Bool)
+    case setNvimBinary(String)
   }
 
   override var displayName: String {
@@ -32,6 +33,7 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
     self.useSnapshotUpdate = state.useSnapshotUpdate
     self.useLiveResize = state.mainWindowTemplate.useLiveResize
     self.drawsParallel = state.mainWindowTemplate.drawsParallel
+    self.nvimBinary = state.mainWindowTemplate.nvimBinary
 
     super.init(frame: .zero)
 
@@ -42,11 +44,13 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
       .observe(on: MainScheduler.instance)
       .subscribe(onNext: { state in
         if self.useInteractiveZsh != state.mainWindowTemplate.useInteractiveZsh
+          || self.nvimBinary != state.mainWindowTemplate.nvimBinary
           || self.useSnapshotUpdate != state.useSnapshotUpdate
           || self.useLiveResize != state.mainWindowTemplate.useLiveResize
           || self.drawsParallel != state.mainWindowTemplate.drawsParallel
         {
           self.useInteractiveZsh = state.mainWindowTemplate.useInteractiveZsh
+          self.nvimBinary = state.mainWindowTemplate.nvimBinary
           self.useSnapshotUpdate = state.useSnapshotUpdate
           self.useLiveResize = state.mainWindowTemplate.useLiveResize
           self.drawsParallel = state.mainWindowTemplate.drawsParallel
@@ -64,22 +68,29 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
   private var useSnapshotUpdate: Bool
   private var useLiveResize: Bool
   private var drawsParallel: Bool
+  private var nvimBinary: String
 
   private let useInteractiveZshCheckbox = NSButton(forAutoLayout: ())
   private let useSnapshotUpdateCheckbox = NSButton(forAutoLayout: ())
   private let useLiveResizeCheckbox = NSButton(forAutoLayout: ())
   private let drawsParallelCheckbox = NSButton(forAutoLayout: ())
+  private let nvimBinaryField = NSTextView(forAutoLayout: ())
 
   @available(*, unavailable)
   required init?(coder _: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
 
+  override func windowWillClose() {
+    self.nvimBinaryFieldAction()
+  }
+
   private func updateViews() {
     self.useSnapshotUpdateCheckbox.boolState = self.useSnapshotUpdate
     self.useInteractiveZshCheckbox.boolState = self.useInteractiveZsh
     self.useLiveResizeCheckbox.boolState = self.useLiveResize
     self.drawsParallelCheckbox.boolState = self.drawsParallel
+    self.nvimBinaryField.string = self.nvimBinary
   }
 
   private func addViews() {
@@ -136,6 +147,9 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
     when scrolling very fast.
     """#)
 
+    let nvimBinaryTitle = self.titleTextField(title: "NeoVim Binary:")
+    let nvimBinaryField = self.nvimBinaryField
+
     self.addSubview(paneTitle)
 
     self.addSubview(useSnapshotUpdate)
@@ -146,6 +160,8 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
     self.addSubview(useLiveResizeInfo)
     self.addSubview(drawsParallelBox)
     self.addSubview(drawsParallelInfo)
+    self.addSubview(nvimBinaryTitle)
+    self.addSubview(nvimBinaryField)
 
     paneTitle.autoPinEdge(toSuperviewEdge: .top, withInset: 18)
     paneTitle.autoPinEdge(toSuperviewEdge: .left, withInset: 18)
@@ -174,6 +190,21 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
 
     useInteractiveZshInfo.autoPinEdge(.top, to: .bottom, of: useInteractiveZsh, withOffset: 5)
     useInteractiveZshInfo.autoPinEdge(.left, to: .left, of: useInteractiveZsh)
+
+    nvimBinaryTitle.autoPinEdge(.top, to: .bottom, of: useInteractiveZshInfo, withOffset: 18)
+    nvimBinaryTitle.autoPinEdge(.left, to: .left, of: useLiveResize, withOffset: 5)
+    //nvimBinaryTitle.autoAlignAxis(.baseline, toSameAxisOf: nvimBinaryField)
+
+    nvimBinaryField.autoPinEdge(.top, to: .bottom, of: useInteractiveZshInfo, withOffset: 18)
+    nvimBinaryField.autoPinEdge(.left, to: .right, of: nvimBinaryTitle, withOffset: 5)
+    nvimBinaryField.autoPinEdge(toSuperviewEdge: .right, withInset: 18)
+    nvimBinaryField.autoSetDimension(.height, toSize: 20, relation: .greaterThanOrEqual)
+    NotificationCenter.default.addObserver(
+      forName: NSControl.textDidEndEditingNotification,
+      object: nvimBinaryField,
+      queue: nil
+    ) { [weak self] _ in self?.nvimBinaryFieldAction() }
+
   }
 }
 
@@ -195,4 +226,9 @@ extension AdvancedPref {
   @objc func useSnapshotUpdateChannelAction(_ sender: NSButton) {
     self.emit(.setUseSnapshotUpdate(sender.boolState))
   }
+
+  func nvimBinaryFieldAction() {
+    let newNvimBinary = self.nvimBinaryField.string
+    self.emit(.setNvimBinary(newNvimBinary))
+  }
 }

VimR/VimR/MainWindow.swift

@@ -86,6 +86,7 @@ final class MainWindow: NSObject,
       usesCustomTabBar: state.appearance.usesCustomTab,
       useInteractiveZsh: state.useInteractiveZsh,
       cwd: state.cwd,
+      nvimBinary: state.nvimBinary,
       nvimArgs: state.nvimArgs,
       envDict: state.envDict,
       sourceFiles: sourceFileUrls
@@ -259,7 +260,7 @@ final class MainWindow: NSObject,
   private var usesTheme = true
   private var lastThemeMark = Token()
 
-  private let log = OSLog(
+  internal let log = OSLog(
     subsystem: Defs.loggerSubsystem,
     category: Defs.LoggerCategory.ui
   )

VimR/VimR/PrefMiddleware.swift

@@ -11,7 +11,7 @@ final class PrefMiddleware: MiddlewareType {
   typealias StateType = AppState
   typealias ActionType = AnyAction
 
-  static let compatibleVersion = "168"
+  static let compatibleVersion = "169"
 
   let mainWindow = MainWindowMiddleware()
 
@@ -20,6 +20,7 @@ final class PrefMiddleware: MiddlewareType {
     do {
       let dictionary: [String: Any] = try dictEncoder.encode(appState)
       defaults.set(dictionary, forKey: PrefMiddleware.compatibleVersion)
+      defaults.synchronize()
     } catch {
       self.log.error("AppState could not converted to Dictionary: \(error)")
     }
@@ -59,6 +60,7 @@ final class PrefMiddleware: MiddlewareType {
       do {
         let dictionary: [String: Any] = try dictEncoder.encode(result.state)
         defaults.set(dictionary, forKey: PrefMiddleware.compatibleVersion)
+        defaults.synchronize()
       } catch {
         self.log.error("AppState could not converted to Dictionary: \(error)")
       }
@@ -86,6 +88,7 @@ final class PrefMiddleware: MiddlewareType {
         do {
           let dictionary: [String: Any] = try dictEncoder.encode(result.state)
           defaults.set(dictionary, forKey: PrefMiddleware.compatibleVersion)
+          defaults.synchronize()
         } catch {
           self.log.error("AppState could not converted to Dictionary: \(error)")
         }

VimR/VimR/States.swift

@@ -263,7 +263,9 @@ struct AppearanceState: Codable {
 
 extension MainWindow {
   struct State: Codable {
-    static let `default` = State(isAllToolsVisible: true, isToolButtonsVisible: true)
+    static let `default` = State(isAllToolsVisible: true,
+                                 isToolButtonsVisible: true,
+                                 nvimBinary: "")
 
     static let defaultTools: [MainWindow.Tools: WorkspaceToolState] = [
       .fileBrowser: WorkspaceToolState(location: .left, dimension: 200, open: true),
@@ -315,6 +317,7 @@ extension MainWindow {
 
     var appearance = AppearanceState.default
     var useInteractiveZsh = false
+    var nvimBinary: String = ""
     var nvimArgs: [String]?
     var cliPipePath: String?
     var envDict: [String: String]?
@@ -324,15 +327,17 @@ extension MainWindow {
     var isLeftOptionMeta = false
     var isRightOptionMeta = false
 
+
     // to be cleaned
     var urlsToOpen = [URL: OpenMode]()
     var currentBufferToSet: NvimView.Buffer?
     var cwdToSet: URL?
     var viewToBeFocused: FocusableView? = FocusableView.neoVimView
 
-    init(isAllToolsVisible: Bool, isToolButtonsVisible: Bool) {
+    init(isAllToolsVisible: Bool, isToolButtonsVisible: Bool, nvimBinary: String) {
       self.isAllToolsVisible = isAllToolsVisible
       self.isToolButtonsVisible = isToolButtonsVisible
+      self.nvimBinary = nvimBinary
     }
 
     enum CodingKeys: String, CodingKey {
@@ -346,6 +351,8 @@ extension MainWindow {
       case isRightOptionMeta = "is-right-option-meta"
 
       case useInteractiveZsh = "use-interactive-zsh"
+      case nvimBinary = "nvim-binary"
+
       case useLiveResize = "use-live-resize"
       case drawsParallel = "draws-parallel"
       case isShowHidden = "is-show-hidden"
@@ -370,6 +377,7 @@ extension MainWindow {
         forKey: .useInteractiveZsh,
         default: State.default.useInteractiveZsh
       )
+      self.nvimBinary = try container.decodeIfPresent(String.self, forKey: .nvimBinary) ?? State.default.nvimBinary
       self.useLiveResize = try container.decode(
         forKey: .useLiveResize,
         default: State.default.useLiveResize
@@ -450,6 +458,7 @@ extension MainWindow {
       try container.encode(self.isLeftOptionMeta, forKey: .isLeftOptionMeta)
       try container.encode(self.isRightOptionMeta, forKey: .isRightOptionMeta)
       try container.encode(self.useInteractiveZsh, forKey: .useInteractiveZsh)
+      try container.encode(self.nvimBinary, forKey: .nvimBinary)
       try container.encode(self.fileBrowserShowHidden, forKey: .isShowHidden)
 
       // See [1]