qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-25 06:43:24 +03:00
Code Issues Projects Releases Wiki Activity

GH-603 (Re-) Fix paste bug

Browse Source
This commit is contained in:
Tae Won Ha 2018-07-16 18:26:09 +02:00
parent 5d0f0c9f42
commit 18050756e5
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
NvimView/NvimView/NvimView+MenuItems.swift
View File

@ -5,6 +5,7 @@
import Cocoa
import RxSwift
import RxNeovimApi
// MARK: - NSUserInterfaceValidationsProtocol
extension NvimView {
@ -126,32 +127,39 @@ extension NvimView {
return
}
self.api
.getOption(name: "paste")
.flatMap { curPasteMode -> Single<Bool> in
if curPasteMode == false {
return self.api
.setOption(name: "paste", value: .bool(true))
.andThen(Single.just(true))
} else {
return Single.just(false)
}
}
.flatMap { pasteModeSet -> Single<Bool> in
Single.zip(
self.api
.getCurrentWin()
.flatMap { win in self.api.winGetCursor(window: win) },
self.api
.getOption(name: "paste")
.flatMap { curPasteMode -> Single<Bool> in
if curPasteMode == false {
return self.api
.setOption(name: "paste", value: .bool(true))
.andThen(Single.just(true))
} else {
return Single.just(false)
}
}
)
.map { result in (column: result.0[1], pasteModeSet: result.1) }
.flatMap { element -> Single<Bool> in
switch self.mode {
case .insert:
let cmd = element.column == 0 ? "<ESC>\"+Pa" : "<ESC>\"+pa"
return self.bridge
.vimInput("<ESC>\"+Pa")
.andThen(Single.just(pasteModeSet))
.vimInput(cmd)
.andThen(Single.just(element.pasteModeSet))
case .normal, .visual:
return self.bridge
.vimInput("\"+p")
.andThen(Single.just(pasteModeSet))
.andThen(Single.just(element.pasteModeSet))
default:
return Single.just(pasteModeSet)
return Single.just(element.pasteModeSet)
}
}