diff --git a/NvimView/Sources/NvimView/NvimView+UiBridge.swift b/NvimView/Sources/NvimView/NvimView+UiBridge.swift index 1df78835..62c4966b 100644 --- a/NvimView/Sources/NvimView/NvimView+UiBridge.swift +++ b/NvimView/Sources/NvimView/NvimView+UiBridge.swift @@ -9,9 +9,9 @@ import Foundation import MessagePack import NvimServerTypes import os +import RxNeovim import RxPack import RxSwift -import RxNeovim extension NvimView { final func initVimError() { @@ -400,9 +400,10 @@ extension NvimView { // Visual -> Insert // Normal -> Insert // avoid insert -> insert - if case self.mode = CursorModeShape.insert, self.lastMode != self.mode, self.activateAsciiImInNormalMode { - TISSelectInputSource(self.lastImSource) - } + if case self.mode = CursorModeShape.insert, + self.lastMode != self.mode, + self.activateAsciiImInNormalMode + { TISSelectInputSource(self.lastImSource) } } } diff --git a/NvimView/Sources/NvimView/NvimView.swift b/NvimView/Sources/NvimView/NvimView.swift index 83fb26d4..3027c1cc 100644 --- a/NvimView/Sources/NvimView/NvimView.swift +++ b/NvimView/Sources/NvimView/NvimView.swift @@ -8,11 +8,11 @@ import Cocoa import Commons import MessagePack import os -import RxPack import RxNeovim +import RxPack import RxSwift -import Tabs import SpriteKit +import Tabs public enum FontSmoothing: String, Codable, CaseIterable { case systemSetting @@ -25,11 +25,7 @@ public protocol NvimViewDelegate: AnyObject { func isMenuItemKeyEquivalent(_: NSEvent) -> Bool } -public final class NvimView: NSView, - UiBridgeConsumer, - NSUserInterfaceValidations, - NSTextInputClient -{ +public final class NvimView: NSView, NSUserInterfaceValidations, NSTextInputClient { // MARK: - Public public static let rpcEventName = "com.qvacua.NvimView" diff --git a/NvimView/Sources/NvimView/UiBridge.swift b/NvimView/Sources/NvimView/UiBridge.swift index d125d044..64d9e32c 100644 --- a/NvimView/Sources/NvimView/UiBridge.swift +++ b/NvimView/Sources/NvimView/UiBridge.swift @@ -11,38 +11,8 @@ import os import RxPack import RxSwift -protocol UiBridgeConsumer: AnyObject { - func initVimError() - func resize(_ value: MessagePackValue) - func clear() - func modeChange(_ value: MessagePackValue) - func modeInfoSet(_ value: MessagePackValue) - func flush(_ renderData: [MessagePackValue]) - func setTitle(with value: MessagePackValue) - func stop() - func autoCommandEvent(_ value: MessagePackValue) - func ipcBecameInvalid(_ error: Swift.Error) - func bell() - func cwdChanged(_ value: MessagePackValue) - func colorSchemeChanged(_ value: MessagePackValue) - func defaultColorsChanged(_ value: MessagePackValue) - func optionSet(_ value: MessagePackValue) - func setDirty(with value: MessagePackValue) - func rpcEventSubscribed() - func event(_ value: MessagePackValue) - func bridgeHasFatalError(_ value: MessagePackValue?) - func setAttr(with value: MessagePackValue) - func updateMenu() - func busyStart() - func busyStop() - func mouseOn() - func mouseOff() - func visualBell() - func suspend() -} - final class UiBridge { - weak var consumer: UiBridgeConsumer? + weak var consumer: NvimView? init(uuid: UUID, config: NvimView.Config) { self.uuid = uuid diff --git a/resources/release-notes.md b/resources/release-notes.md index 32efd788..73b0ce19 100644 --- a/resources/release-notes.md +++ b/resources/release-notes.md @@ -1,6 +1,7 @@ # Next * Add `VimRRefreshFileBrowser` and `VimRRevealCurrentBufferInFileBrowser` functions. Thanks @jaanauati for the PR! +* Include `libintl` again. # 0.41.2-20220628.220813