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

Restructure Nvim target a bit

Browse Source
This commit is contained in:
Tae Won Ha 2019-03-26 09:23:02 +01:00
parent 4223e04b63
commit 0e648ef2a1
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
5 changed files with 83 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
Nvim/Nvim.xcodeproj/project.pbxproj
View File

@ -13,22 +13,22 @@
4B06F6C9224526A90069C9F2 /* Document.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B06F6C7224526A80069C9F2 /* Document.xib */; }; 4B06F6C9224526A90069C9F2 /* Document.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B06F6C7224526A80069C9F2 /* Document.xib */; };
4B06F6CB224526A90069C9F2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B06F6CA224526A90069C9F2 /* Assets.xcassets */; }; 4B06F6CB224526A90069C9F2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B06F6CA224526A90069C9F2 /* Assets.xcassets */; };
4B06F6CE224526A90069C9F2 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B06F6CC224526A90069C9F2 /* MainMenu.xib */; }; 4B06F6CE224526A90069C9F2 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B06F6CC224526A90069C9F2 /* MainMenu.xib */; };
4B06F6DD224528020069C9F2 /* RxMsgpackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D6224528010069C9F2 /* RxMsgpackRpc.framework */; }; 4BF78FB4224A17D800D5A018 /* RxMessagePort.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FAD224A17D800D5A018 /* RxMessagePort.framework */; };
4B06F6DE224528020069C9F2 /* RxMsgpackRpc.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D6224528010069C9F2 /* RxMsgpackRpc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FB5224A17D800D5A018 /* MessagePack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FAE224A17D800D5A018 /* MessagePack.framework */; };
4B06F6DF224528020069C9F2 /* MessagePack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D7224528010069C9F2 /* MessagePack.framework */; }; 4BF78FB6224A17D800D5A018 /* RxMsgpackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FAF224A17D800D5A018 /* RxMsgpackRpc.framework */; };
4B06F6E0224528020069C9F2 /* MessagePack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D7224528010069C9F2 /* MessagePack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FB7224A17D800D5A018 /* RxNeovimApi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB0224A17D800D5A018 /* RxNeovimApi.framework */; };
4B06F6E1224528020069C9F2 /* RxMessagePort.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D8224528010069C9F2 /* RxMessagePort.framework */; }; 4BF78FB8224A17D800D5A018 /* Socket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB1224A17D800D5A018 /* Socket.framework */; };
4B06F6E2224528020069C9F2 /* RxMessagePort.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D8224528010069C9F2 /* RxMessagePort.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FB9224A17D800D5A018 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB2224A17D800D5A018 /* PureLayout.framework */; };
4B06F6E3224528020069C9F2 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D9224528010069C9F2 /* PureLayout.framework */; }; 4BF78FBA224A17D800D5A018 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB3224A17D800D5A018 /* RxSwift.framework */; };
4B06F6E4224528020069C9F2 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6D9224528010069C9F2 /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FBC224A17E700D5A018 /* NvimView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FBB224A17E700D5A018 /* NvimView.framework */; };
4B06F6E5224528020069C9F2 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6DA224528010069C9F2 /* RxSwift.framework */; }; 4BF78FBD224A185600D5A018 /* NvimView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FBB224A17E700D5A018 /* NvimView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6E6224528020069C9F2 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6DA224528010069C9F2 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FBE224A185600D5A018 /* MessagePack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FAE224A17D800D5A018 /* MessagePack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6E7224528020069C9F2 /* Socket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6DB224528010069C9F2 /* Socket.framework */; }; 4BF78FBF224A185600D5A018 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB2224A17D800D5A018 /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6E8224528020069C9F2 /* Socket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6DB224528010069C9F2 /* Socket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FC0224A185600D5A018 /* RxMessagePort.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FAD224A17D800D5A018 /* RxMessagePort.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6E9224528020069C9F2 /* RxNeovimApi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6DC224528010069C9F2 /* RxNeovimApi.framework */; }; 4BF78FC1224A185600D5A018 /* RxMsgpackRpc.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FAF224A17D800D5A018 /* RxMsgpackRpc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6EA224528020069C9F2 /* RxNeovimApi.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6DC224528010069C9F2 /* RxNeovimApi.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FC2224A185600D5A018 /* RxNeovimApi.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB0224A17D800D5A018 /* RxNeovimApi.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6ED2245291B0069C9F2 /* NvimView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6EC2245291B0069C9F2 /* NvimView.framework */; }; 4BF78FC3224A185600D5A018 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB3224A17D800D5A018 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4B06F6EE2245291B0069C9F2 /* NvimView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B06F6EC2245291B0069C9F2 /* NvimView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BF78FC4224A185600D5A018 /* Socket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF78FB1224A17D800D5A018 /* Socket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
@ -38,14 +38,14 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
4B06F6E6224528020069C9F2 /* RxSwift.framework in Embed Frameworks */, 4BF78FBD224A185600D5A018 /* NvimView.framework in Embed Frameworks */,
4B06F6DE224528020069C9F2 /* RxMsgpackRpc.framework in Embed Frameworks */, 4BF78FBE224A185600D5A018 /* MessagePack.framework in Embed Frameworks */,
4B06F6EA224528020069C9F2 /* RxNeovimApi.framework in Embed Frameworks */, 4BF78FBF224A185600D5A018 /* PureLayout.framework in Embed Frameworks */,
4B06F6EE2245291B0069C9F2 /* NvimView.framework in Embed Frameworks */, 4BF78FC0224A185600D5A018 /* RxMessagePort.framework in Embed Frameworks */,
4B06F6E2224528020069C9F2 /* RxMessagePort.framework in Embed Frameworks */, 4BF78FC1224A185600D5A018 /* RxMsgpackRpc.framework in Embed Frameworks */,
4B06F6E8224528020069C9F2 /* Socket.framework in Embed Frameworks */, 4BF78FC2224A185600D5A018 /* RxNeovimApi.framework in Embed Frameworks */,
4B06F6E4224528020069C9F2 /* PureLayout.framework in Embed Frameworks */, 4BF78FC3224A185600D5A018 /* RxSwift.framework in Embed Frameworks */,
4B06F6E0224528020069C9F2 /* MessagePack.framework in Embed Frameworks */, 4BF78FC4224A185600D5A018 /* Socket.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@ -61,14 +61,14 @@
4B06F6CA224526A90069C9F2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 4B06F6CA224526A90069C9F2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4B06F6CD224526A90069C9F2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; }; 4B06F6CD224526A90069C9F2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
4B06F6CF224526A90069C9F2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 4B06F6CF224526A90069C9F2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4B06F6D6224528010069C9F2 /* RxMsgpackRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxMsgpackRpc.framework; path = ../Carthage/Build/Mac/RxMsgpackRpc.framework; sourceTree = "<group>"; }; 4BF78FAD224A17D800D5A018 /* RxMessagePort.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxMessagePort.framework; path = ../Carthage/Build/Mac/RxMessagePort.framework; sourceTree = "<group>"; };
4B06F6D7224528010069C9F2 /* MessagePack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessagePack.framework; path = ../Carthage/Build/Mac/MessagePack.framework; sourceTree = "<group>"; }; 4BF78FAE224A17D800D5A018 /* MessagePack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessagePack.framework; path = ../Carthage/Build/Mac/MessagePack.framework; sourceTree = "<group>"; };
4B06F6D8224528010069C9F2 /* RxMessagePort.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxMessagePort.framework; path = ../Carthage/Build/Mac/RxMessagePort.framework; sourceTree = "<group>"; }; 4BF78FAF224A17D800D5A018 /* RxMsgpackRpc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxMsgpackRpc.framework; path = ../Carthage/Build/Mac/RxMsgpackRpc.framework; sourceTree = "<group>"; };
4B06F6D9224528010069C9F2 /* PureLayout.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PureLayout.framework; path = ../Carthage/Build/Mac/PureLayout.framework; sourceTree = "<group>"; }; 4BF78FB0224A17D800D5A018 /* RxNeovimApi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxNeovimApi.framework; path = ../Carthage/Build/Mac/RxNeovimApi.framework; sourceTree = "<group>"; };
4B06F6DA224528010069C9F2 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = ../Carthage/Build/Mac/RxSwift.framework; sourceTree = "<group>"; }; 4BF78FB1224A17D800D5A018 /* Socket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Socket.framework; path = ../Carthage/Build/Mac/Socket.framework; sourceTree = "<group>"; };
4B06F6DB224528010069C9F2 /* Socket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Socket.framework; path = ../Carthage/Build/Mac/Socket.framework; sourceTree = "<group>"; }; 4BF78FB2224A17D800D5A018 /* PureLayout.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PureLayout.framework; path = ../Carthage/Build/Mac/PureLayout.framework; sourceTree = "<group>"; };
4B06F6DC224528010069C9F2 /* RxNeovimApi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxNeovimApi.framework; path = ../Carthage/Build/Mac/RxNeovimApi.framework; sourceTree = "<group>"; }; 4BF78FB3224A17D800D5A018 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = ../Carthage/Build/Mac/RxSwift.framework; sourceTree = "<group>"; };
4B06F6EC2245291B0069C9F2 /* NvimView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4BF78FBB224A17E700D5A018 /* NvimView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -76,14 +76,14 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
4B06F6E5224528020069C9F2 /* RxSwift.framework in Frameworks */, 4BF78FBC224A17E700D5A018 /* NvimView.framework in Frameworks */,
4B06F6DD224528020069C9F2 /* RxMsgpackRpc.framework in Frameworks */, 4BF78FB4224A17D800D5A018 /* RxMessagePort.framework in Frameworks */,
4B06F6E9224528020069C9F2 /* RxNeovimApi.framework in Frameworks */, 4BF78FB8224A17D800D5A018 /* Socket.framework in Frameworks */,
4B06F6ED2245291B0069C9F2 /* NvimView.framework in Frameworks */, 4BF78FBA224A17D800D5A018 /* RxSwift.framework in Frameworks */,
4B06F6E1224528020069C9F2 /* RxMessagePort.framework in Frameworks */, 4BF78FB6224A17D800D5A018 /* RxMsgpackRpc.framework in Frameworks */,
4B06F6E7224528020069C9F2 /* Socket.framework in Frameworks */, 4BF78FB5224A17D800D5A018 /* MessagePack.framework in Frameworks */,
4B06F6E3224528020069C9F2 /* PureLayout.framework in Frameworks */, 4BF78FB9224A17D800D5A018 /* PureLayout.framework in Frameworks */,
4B06F6DF224528020069C9F2 /* MessagePack.framework in Frameworks */, 4BF78FB7224A17D800D5A018 /* RxNeovimApi.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -93,16 +93,9 @@
4B06F6B7224526A80069C9F2 = { 4B06F6B7224526A80069C9F2 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4B06F6EC2245291B0069C9F2 /* NvimView.framework */,
4B06F6D7224528010069C9F2 /* MessagePack.framework */,
4B06F6D9224528010069C9F2 /* PureLayout.framework */,
4B06F6D8224528010069C9F2 /* RxMessagePort.framework */,
4B06F6D6224528010069C9F2 /* RxMsgpackRpc.framework */,
4B06F6DC224528010069C9F2 /* RxNeovimApi.framework */,
4B06F6DA224528010069C9F2 /* RxSwift.framework */,
4B06F6DB224528010069C9F2 /* Socket.framework */,
4B06F6C2224526A80069C9F2 /* Nvim */, 4B06F6C2224526A80069C9F2 /* Nvim */,
4B06F6C1224526A80069C9F2 /* Products */, 4B06F6C1224526A80069C9F2 /* Products */,
4BF78FAC224A17A000D5A018 /* Frameworks */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
@ -128,6 +121,21 @@
path = Nvim; path = Nvim;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
4BF78FAC224A17A000D5A018 /* Frameworks */ = {
isa = PBXGroup;
children = (
4BF78FBB224A17E700D5A018 /* NvimView.framework */,
4BF78FAE224A17D800D5A018 /* MessagePack.framework */,
4BF78FB2224A17D800D5A018 /* PureLayout.framework */,
4BF78FAD224A17D800D5A018 /* RxMessagePort.framework */,
4BF78FAF224A17D800D5A018 /* RxMsgpackRpc.framework */,
4BF78FB0224A17D800D5A018 /* RxNeovimApi.framework */,
4BF78FB3224A17D800D5A018 /* RxSwift.framework */,
4BF78FB1224A17D800D5A018 /* Socket.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */

11
Nvim/Nvim/AppDelegate.swift
View File

@ -1,10 +1,7 @@
// /**
// AppDelegate.swift * Tae Won Ha - http://taewon.de - @hataewon
// Nvim * See LICENSE
// */
// Created by Tae Won Ha on 22.03.19.
// Copyright © 2019 Tae Won Ha. All rights reserved.
//
import Cocoa import Cocoa

21
Nvim/Nvim/Document.swift
View File

@ -1,10 +1,7 @@
// /**
// Document.swift * Tae Won Ha - http://taewon.de - @hataewon
// Nvim * See LICENSE
// */
// Created by Tae Won Ha on 22.03.19.
// Copyright © 2019 Tae Won Ha. All rights reserved.
//
import Cocoa import Cocoa
import NvimView import NvimView
@ -13,8 +10,8 @@ import RxSwift
class Document: NSDocument, NSWindowDelegate { class Document: NSDocument, NSWindowDelegate {
var nvimView = NvimView(forAutoLayout: ()) private var nvimView = NvimView(forAutoLayout: ())
let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
override init() { override init() {
super.init() super.init()
@ -24,11 +21,9 @@ class Document: NSDocument, NSWindowDelegate {
.subscribe(onNext: { event in .subscribe(onNext: { event in
switch event { switch event {
case .neoVimStopped: case .neoVimStopped: DispatchQueue.main.async { self.close() }
DispatchQueue.main.async { self.close() }
default: default: Swift.print("Event received: \(event)")
break
} }
}) })

38
Nvim/Nvim/RxSwiftCommons.swift
View File

@ -6,7 +6,8 @@
import Foundation import Foundation
import RxSwift import RxSwift
extension PrimitiveSequence where Element == Never, TraitType == CompletableTrait { extension PrimitiveSequence
where Element == Never, TraitType == CompletableTrait {
func wait( func wait(
onCompleted: (() -> Void)? = nil, onCompleted: (() -> Void)? = nil,
@ -22,15 +23,19 @@ extension PrimitiveSequence where Element == Never, TraitType == CompletableTrai
let disposable = self.subscribe(onCompleted: { let disposable = self.subscribe(onCompleted: {
onCompleted?() onCompleted?()
condition.lock() condition.lock()
defer { condition.unlock() }
trigger = true trigger = true
broadcast(condition) condition.broadcast()
}, onError: { error in }, onError: { error in
onError?(error) onError?(error)
condition.lock()
trigger = true
err = error err = error
broadcast(condition)
condition.lock()
defer { condition.unlock() }
trigger = true
condition.broadcast()
}) })
while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) } while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) }
@ -44,10 +49,6 @@ extension PrimitiveSequence where Element == Never, TraitType == CompletableTrai
extension PrimitiveSequence where TraitType == SingleTrait { extension PrimitiveSequence where TraitType == SingleTrait {
static func fromSinglesToSingleOfArray(_ singles: [Single<Element>]) -> Single<[Element]> {
return Observable.merge(singles.map { $0.asObservable() }).toArray().asSingle()
}
func syncValue() -> Element? { func syncValue() -> Element? {
var trigger = false var trigger = false
var value: Element? var value: Element?
@ -59,13 +60,16 @@ extension PrimitiveSequence where TraitType == SingleTrait {
let disposable = self.subscribe(onSuccess: { result in let disposable = self.subscribe(onSuccess: { result in
value = result value = result
condition.lock() condition.lock()
defer { condition.unlock() }
trigger = true trigger = true
broadcast(condition) condition.broadcast()
}, onError: { error in }, onError: { error in
condition.lock() condition.lock()
defer { condition.unlock() }
trigger = true trigger = true
broadcast(condition) condition.broadcast()
}) })
while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) } while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) }
@ -74,19 +78,7 @@ extension PrimitiveSequence where TraitType == SingleTrait {
return value return value
} }
func flatMapCompletable(_ selector: @escaping (Element) throws -> Completable) -> Completable {
return self
.asObservable()
.flatMap { try selector($0).asObservable() }
.ignoreElements()
}
func asCompletable() -> Completable { func asCompletable() -> Completable {
return self.asObservable().ignoreElements() return self.asObservable().ignoreElements()
} }
} }
private func broadcast(_ condition: NSCondition) {
condition.broadcast()
condition.unlock()
}

10
VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme
View File

@ -62,16 +62,6 @@
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions> <AdditionalOptions>
<AdditionalOption
key = "MallocStackLogging"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "PrefersMallocStackLoggingLite"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction