qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-23 19:21:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into update-neovim

Browse Source 
Conflicts:
	NvimServer
This commit is contained in:
Tae Won Ha 2022-07-03 10:20:57 +02:00
commit 2d31876e3e
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
4 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NvimView/Sources/NvimView/NvimView+UiBridge.swift
View File

@ -9,9 +9,9 @@ import Foundation
import MessagePack import MessagePack
import NvimServerTypes import NvimServerTypes
import os import os
import RxNeovim
import RxPack import RxPack
import RxSwift import RxSwift
import RxNeovim
extension NvimView { extension NvimView {
final func initVimError() { final func initVimError() {
@ -400,9 +400,10 @@ extension NvimView {
// Visual -> Insert // Visual -> Insert
// Normal -> Insert // Normal -> Insert
// avoid insert -> insert // avoid insert -> insert
if case self.mode = CursorModeShape.insert, self.lastMode != self.mode, self.activateAsciiImInNormalMode { if case self.mode = CursorModeShape.insert,
TISSelectInputSource(self.lastImSource) self.lastMode != self.mode,
} self.activateAsciiImInNormalMode
{ TISSelectInputSource(self.lastImSource) }
} }
} }

10
NvimView/Sources/NvimView/NvimView.swift
View File

@ -8,11 +8,11 @@ import Cocoa
import Commons import Commons
import MessagePack import MessagePack
import os import os
import RxPack
import RxNeovim import RxNeovim
import RxPack
import RxSwift import RxSwift
import Tabs
import SpriteKit import SpriteKit
import Tabs
public enum FontSmoothing: String, Codable, CaseIterable { public enum FontSmoothing: String, Codable, CaseIterable {
case systemSetting case systemSetting
@ -25,11 +25,7 @@ public protocol NvimViewDelegate: AnyObject {
func isMenuItemKeyEquivalent(_: NSEvent) -> Bool func isMenuItemKeyEquivalent(_: NSEvent) -> Bool
} }
public final class NvimView: NSView, public final class NvimView: NSView, NSUserInterfaceValidations, NSTextInputClient {
UiBridgeConsumer,
NSUserInterfaceValidations,
NSTextInputClient
{
// MARK: - Public // MARK: - Public
public static let rpcEventName = "com.qvacua.NvimView" public static let rpcEventName = "com.qvacua.NvimView"

32
NvimView/Sources/NvimView/UiBridge.swift
View File

@ -11,38 +11,8 @@ import os
import RxPack import RxPack
import RxSwift 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 { final class UiBridge {
weak var consumer: UiBridgeConsumer? weak var consumer: NvimView?
init(uuid: UUID, config: NvimView.Config) { init(uuid: UUID, config: NvimView.Config) {
self.uuid = uuid self.uuid = uuid

1
resources/release-notes.md
View File

@ -1,6 +1,7 @@
# Next # Next
* Add `VimRRefreshFileBrowser` and `VimRRevealCurrentBufferInFileBrowser` functions. Thanks @jaanauati for the PR! * Add `VimRRefreshFileBrowser` and `VimRRevealCurrentBufferInFileBrowser` functions. Thanks @jaanauati for the PR!
* Include `libintl` again.
# 0.41.2-20220628.220813 # 0.41.2-20220628.220813