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

Merge remote-tracking branch 'origin/develop' into update-neovim

Browse Source
This commit is contained in:
Tae Won Ha 2018-07-01 11:34:36 +02:00
commit 955b0cb4c1
12 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NvimView/NvimView.xcodeproj/project.pbxproj
View File

@ -466,7 +466,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 280;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -526,7 +526,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 280;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -553,7 +553,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 280;
DYLIB_CURRENT_VERSION = 281;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;
@ -575,7 +575,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 280;
DYLIB_CURRENT_VERSION = 281;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;

4
NvimView/NvimView/Info.plist
View File

@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-280</string>
<string>SNAPSHOT-281</string>
<key>CFBundleVersion</key>
<string>280</string>
<string>281</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

4
VimR/VimR.xcodeproj/project.pbxproj
View File

@ -1224,7 +1224,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 280;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1281,7 +1281,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 280;
CURRENT_PROJECT_VERSION = 281;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

4
VimR/VimR/AppDelegate.swift
View File

@ -64,6 +64,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
self.useSnapshot = appState.useSnapshotUpdate
self.setSparkleUrl(self.useSnapshot)
}
if appState.quit {
NSApp.terminate(self)
}
})
.disposed(by: self.disposeBag)

6
VimR/VimR/Context.swift
View File

@ -25,6 +25,7 @@ class Context {
let previewService = PreviewService()
let httpService: HttpServerService = HttpServerService(port: baseServerUrl.port!)
let uiRootReducer = UiRootReducer()
// AppState
Observable
@ -33,7 +34,7 @@ class Context {
.reduce(by: AppDelegateReducer(baseServerUrl: baseServerUrl).reduce)
.filterMapPair(),
self.actionSourceForAppState()
.reduce(by: UiRootReducer().reduce)
.reduce(by: uiRootReducer.reduceMainWindow)
.reduce(by: openQuicklyReducer.reduceMainWindow)
.filter { $0.modified }
.apply(self.prefService.applyMainWindow)
@ -43,6 +44,9 @@ class Context {
.filterMapPair(),
self.actionSourceForAppState()
.reduce(by: openQuicklyReducer.reduceOpenQuicklyWindow)
.filterMapPair(),
self.actionSourceForAppState()
.reduce(by: uiRootReducer.reduceUiRoot)
.filterMapPair()
)
.merge()

4
VimR/VimR/Info.plist
View File

@ -1224,7 +1224,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-280</string>
<string>SNAPSHOT-281</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -1241,7 +1241,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>280</string>
<string>281</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

2
VimR/VimR/States.swift
View File

@ -33,6 +33,8 @@ struct AppState: SerializableState {
var openQuickly = OpenQuicklyWindow.State.default
var quit = false
init() {
}

9
VimR/VimR/UiRoot.swift
View File

@ -10,9 +10,15 @@ class UiRoot: UiComponent {
typealias StateType = AppState
enum Action {
case quit
}
required init(source: Observable<StateType>, emitter: ActionEmitter, state: StateType) {
self.source = source
self.emitter = emitter
self.emit = emitter.typedEmit()
self.fileMonitor = FileMonitor(source: source, emitter: emitter, state: state)
self.openQuicklyWindow = OpenQuicklyWindow(source: source, emitter: emitter, state: state)
@ -50,7 +56,7 @@ class UiRoot: UiComponent {
case .doNothing: return
case .hide: NSApp.hide(self)
case .quit: NSApp.terminate(self)
case .quit: self.emit(.quit)
}
})
@ -66,6 +72,7 @@ class UiRoot: UiComponent {
private let source: Observable<AppState>
private let emitter: ActionEmitter
private let emit: (Action) -> Void
private let disposeBag = DisposeBag()
private let fileMonitor: FileMonitor

18
VimR/VimR/UiRootReducer.swift
View File

@ -7,9 +7,23 @@ import Foundation
class UiRootReducer {
typealias Pair = StateActionPair<AppState, UuidAction<MainWindow.Action>>
typealias UiRootPair = StateActionPair<AppState, UiRoot.Action>
typealias MainWindowPair = StateActionPair<AppState, UuidAction<MainWindow.Action>>
func reduce(_ pair: Pair) -> Pair {
func reduceUiRoot(_ pair: UiRootPair) -> UiRootPair {
var appState = pair.state
switch pair.action {
case .quit:
appState.quit = true
}
return StateActionPair(state: appState, action: pair.action)
}
func reduceMainWindow(_ pair: MainWindowPair) -> MainWindowPair {
var appState = pair.state
let uuid = pair.action.uuid

4
VimR/VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-280</string>
<string>SNAPSHOT-281</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>280</string>
<string>281</string>
</dict>
</plist>

23
appcast_snapshot.xml
View File

@ -7,27 +7,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>SNAPSHOT-280</title>
<title>SNAPSHOT-281</title>
<description><![CDATA[
<ul>
<li>Neovim 0.3.0 🙂</li>
<li>Dependencies updates:<ul>
<li>Quick/nimble@7.1.2</li>
<li>eonil/FileSystemEvents@1.0.0</li>
</ul>
</li>
<li>GH-653: Bugfix: Crashes when closing the last window with "Quit after last window closes"-option turned on.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/snapshot/280
https://github.com/qvacua/vimr/releases/tag/snapshot/281
</releaseNotesLink>
<pubDate>2018-06-12T21:19:48.303228</pubDate>
<pubDate>2018-07-01T11:18:57.837523</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/280/VimR-SNAPSHOT-280.tar.bz2"
sparkle:version="280"
sparkle:shortVersionString="SNAPSHOT-280"
sparkle:dsaSignature="MC0CFQDRV8Yf6kGBtHQDMCh9/c17S1rGCwIUXKtRCLVPhEG3SEiukv1ymWCyOzg="
length="14133809"
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/281/VimR-SNAPSHOT-281.tar.bz2"
sparkle:version="281"
sparkle:shortVersionString="SNAPSHOT-281"
sparkle:dsaSignature="MCwCFAPe1lg0kJpok5FgsPBcbeT5RaTNAhQ2yKVtuRwwwPtVG9lBDQD7A8gl7A=="
length="14117888"
type="application/octet-stream"/>
</item>
</channel>

3
resources/release-notes.md
View File

@ -2,8 +2,9 @@
* Neovim 0.3.0
* Some refactorings for the Neovim and the UI interface.
* GH-636: Bugfix: double cursor when entering terminal
* GH-402: Add file associations; using definitions and icons from [MacVim](http://macvim.org/)
* GH-636: Bugfix: double cursor when entering terminal
* GH-653: Bugfix: Crashes when closing the last window with "Quit after last window closes"-option turned on.
* Use LuaJIT again.
* Dependencies updates:
- sparkle-project/Sparkle@1.19.0