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

Merge branch 'master' into issue/239-antialiasing

Browse Source
This commit is contained in:
Tae Won Ha 2016-10-24 23:36:17 +02:00
commit 9f4edb8a89
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
7 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@ -1,4 +1,4 @@
github "ReactiveX/RxSwift" "3.0.0-rc.1"
github "ReactiveX/RxSwift" == 3.0.0
github "PureLayout/PureLayout" == 3.0.2
github "eonil/FileSystemEvents" "master"
github "sparkle-project/Sparkle" == 1.14.0

2
Cartfile.resolved
View File

@ -1,5 +1,5 @@
github "eonil/FileSystemEvents" "aa5c6af1fd35939f9aca3b9eba3b672bfa549b3a"
github "Quick/Nimble" "v5.0.0"
github "PureLayout/PureLayout" "v3.0.2"
github "ReactiveX/RxSwift" "3.0.0-rc.1"
github "ReactiveX/RxSwift" "3.0.0"
github "sparkle-project/Sparkle" "1.14.0"

8
SwiftNeoVim/CellAttributes.swift
View File

@ -7,7 +7,7 @@ import Cocoa
// The definition can be found in NeoVimUiBridgeProtocol.h
func == (left: CellAttributes, right: CellAttributes) -> Bool {
public func == (left: CellAttributes, right: CellAttributes) -> Bool {
if left.foreground != right.foreground { return false }
if left.fontTrait != right.fontTrait { return false }
@ -17,11 +17,7 @@ func == (left: CellAttributes, right: CellAttributes) -> Bool {
return true
}
func != (left: CellAttributes, right: CellAttributes) -> Bool {
return !(left == right)
}
extension CellAttributes: CustomStringConvertible {
extension CellAttributes: CustomStringConvertible, Equatable {
public var description: String {
return "CellAttributes<fg: \(String(format: "%x", self.foreground)), bg: \(String(format: "%x", self.background)))"

2
VimR/OpenQuicklyWindowComponent.swift
View File

@ -47,7 +47,7 @@ class OpenQuicklyWindowComponent: WindowComponent,
init(source: Observable<Any>, fileItemService: FileItemService) {
self.fileItemService = fileItemService
self.searchStream = self.searchField.rx.textInput.text
self.searchStream = self.searchField.rx.textInput.text.orEmpty
.throttle(0.2, scheduler: MainScheduler.instance)
.distinctUntilChanged()

2
bin/build.sh
View File

@ -42,7 +42,7 @@ echo "### Tag: ${TAG}"
echo "### VimR archive file name: ${VIMR_FILE_NAME}"
./bin/commit_and_push_tags.sh "${BRANCH}" "${TAG}"
./bin/create_github_release.sh "${COMPOUND_VERSION}" "${TAG}" "${VIMR_FILE_NAME}" "${RELEASE_NOTES}"
./bin/create_github_release.sh "${COMPOUND_VERSION}" "${TAG}" "${VIMR_FILE_NAME}" "${RELEASE_NOTES}" ${IS_SNAPSHOT}
./bin/set_appcast.py "build/Release/${VIMR_FILE_NAME}" "${BUNDLE_VERSION}" "${MARKETING_VERSION}" "${TAG}" ${IS_SNAPSHOT}
./bin/commit_and_push_appcast.sh "${BRANCH}" "${COMPOUND_VERSION}" ${IS_SNAPSHOT}

8
bin/create_github_release.sh
View File

@ -6,11 +6,17 @@ COMPOUND_VERSION=$1
TAG=$2
VIMR_FILE_NAME=$3
RELEASE_NOTES=$4
IS_SNAPSHOT=$5
pushd build/Release
tar cjf ${VIMR_FILE_NAME} VimR.app
PRERELEASE=""
if [ "${IS_SNAPSHOT}" = true ] ; then
PRERELEASE="--pre-release"
fi
echo "### Creating release"
GITHUB_TOKEN=$(cat ~/.config/github.qvacua.release.token) github-release release \
--user qvacua \
@ -18,7 +24,7 @@ GITHUB_TOKEN=$(cat ~/.config/github.qvacua.release.token) github-release release
--tag "${TAG}" \
--name "${COMPOUND_VERSION}" \
--description "${RELEASE_NOTES}" \
--pre-release
"${PRERELEASE}"
echo "### Uploading build"
GITHUB_TOKEN=$(cat ~/.config/github.qvacua.release.token) github-release upload \

5
resources/release-notes.md Normal file
View File

@ -0,0 +1,5 @@
* GH-309: When opening a file via a GUI action, check whether the file is already open.
- Open in a tab or split: select the tab/split
- Open in another (GUI) window: let NeoVim handle it.
* Update RxSwift from `3.0.0-rc.1` to `3.0.0`.