qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-01 01:32:04 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tae Won Ha 2017-08-13 07:50:58 +02:00
commit 424e19b9ea
17 changed files with 113 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MacNeovim/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.17.0</string>
<string>0.18.0</string>
<key>CFBundleVersion</key>
<string>213</string>
<string>217</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

4
SwiftNeoVim/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.17.0</string>
<string>0.18.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>213</string>
<string>217</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

1
SwiftNeoVim/KeyUtils.swift
View File

@ -77,5 +77,6 @@ fileprivate let specialKeys = [
NSF33FunctionKey: "F33",
NSF34FunctionKey: "F34",
NSF35FunctionKey: "F35",
0x09: "Tab",
0x19: "Tab",
]

26
SwiftNeoVim/NeoVimView+Dragging.swift
View File

@ -16,22 +16,20 @@ extension NeoVimView {
}
override public func performDragOperation(_ sender: NSDraggingInfo) -> Bool {
if !isFile(sender: sender) {
return false;
guard isFile(sender: sender) else {
return false
}
let paths = sender
.draggingPasteboard()
.propertyList(forType: NSFilenamesPboardType)
as? [String]
let urls = paths?
.map { URL(fileURLWithPath: $0) }
?? []
self.open(urls: urls)
return true;
guard let paths = sender.draggingPasteboard().propertyList(forType: NSFilenamesPboardType) as? [String] else {
return false
}
self.open(urls: paths.map { URL(fileURLWithPath: $0) })
return true
}
}
fileprivate func isFile(sender: NSDraggingInfo?) -> Bool {
return (sender?.draggingPasteboard().types?.contains(String(kUTTypeFileURL))) ?? false
fileprivate func isFile(sender: NSDraggingInfo) -> Bool {
return (sender.draggingPasteboard().types?.contains(String(kUTTypeFileURL))) ?? false
}

30
SwiftNeoVim/NeoVimView+Key.swift
View File

@ -9,9 +9,10 @@ extension NeoVimView {
override public func keyDown(with event: NSEvent) {
self.keyDownDone = false
NSCursor.setHiddenUntilMouseMoves(true)
let context = NSTextInputContext.current()!
let cocoaHandledEvent = context.handleEvent(event)
let context = NSTextInputContext.current()
let cocoaHandledEvent = context?.handleEvent(event) ?? false
if self.keyDownDone && cocoaHandledEvent {
return
}
@ -80,6 +81,23 @@ extension NeoVimView {
self.keyDownDone = false
}
override public func performKeyEquivalent(with event: NSEvent) -> Bool {
let type = event.type
let flags = event.modifierFlags
/* <C-Tab> & <C-S-Tab> do not trigger keyDown events.
Catch the key event here and pass it to keyDown.
(By rogual in NeoVim dot app
https://github.com/rogual/neovim-dot-app/pull/248/files )
*/
if .keyDown == type && flags.contains(.control) && 48 == event.keyCode {
self.keyDown(with: event)
return true
}
return false
}
public func setMarkedText(_ aString: Any, selectedRange: NSRange, replacementRange: NSRange) {
if self.markedText == nil {
self.markedPosition = self.grid.position
@ -229,4 +247,12 @@ extension NeoVimView {
return nil
}
public func didBecomeMain() {
self.agent.vimInput("<FocusGained>")
}
public func didResignMain() {
self.agent.vimInput("<FocusLost>")
}
}

4
SwiftNeoVimTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.17.0</string>
<string>0.18.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>213</string>
<string>217</string>
</dict>
</plist>

4
VimR-Workspace-Demo/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.17.0</string>
<string>0.18.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>213</string>
<string>217</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
VimR.xcodeproj/project.pbxproj
View File

@ -1803,7 +1803,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 213;
DYLIB_CURRENT_VERSION = 217;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1828,7 +1828,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 213;
DYLIB_CURRENT_VERSION = 217;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -2065,7 +2065,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 213;
CURRENT_PROJECT_VERSION = 217;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -2115,7 +2115,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 213;
CURRENT_PROJECT_VERSION = 217;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

4
VimR/Info.plist
View File

@ -32,7 +32,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.17.0</string>
<string>0.18.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -49,7 +49,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>213</string>
<string>217</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

8
VimR/MainWindow.swift
View File

@ -491,6 +491,14 @@ extension MainWindow {
self.emit(self.uuidAction(for: .becomeKey))
}
func windowDidBecomeMain(_ notification: Notification) {
self.neoVimView.didBecomeMain()
}
func windowDidResignMain(_ notification: Notification) {
self.neoVimView.didResignMain()
}
func windowShouldClose(_: Any) -> Bool {
guard self.neoVimView.isCurrentBufferDirty() else {
self.neoVimView.closeCurrentTab()

4
VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.17.0</string>
<string>0.18.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>213</string>
<string>217</string>
</dict>
</plist>

27
appcast.xml
View File

@ -7,27 +7,26 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.17.0-213</title>
<title>v0.18.0-217</title>
<description><![CDATA[
<ul>
<li>GH-436: Use colors from the selected <code>colorscheme</code> for tools, e.g. the file browser:<ul>
<li>Use the <code>directory</code> color for folders in the file browser.</li>
<li>Use slightly darker version of the <code>background</code> color for the window title bar.</li>
<li>Add an option to turn off file icons in the file browser and in the buffer list in case the <code>colorscheme</code> does not play well with them, cf. GH-479.</li>
</ul>
</li>
<li>GH-481: Bugfix: Quiting with <code>:qa!</code> warns about buffers that are already gone. (thanks @nhtzr for the PR)</li>
<li>GH-458: Drag &amp; Drop of files onto the main window works. (thanks @nhtzr for the PR)</li>
<li>GH-487: Hide the mouse cursor when typing. (thanks @nhtzr for the PR)</li>
<li>GH-315: Enable mapping of <code>&lt;C-Tab&gt;</code> and <code>&lt;C-S-Tab&gt;</code>. (thanks @nhtzr for the PR)</li>
<li>GH-368: Send <code>FocusGained</code> and <code>FocusLost</code> event to neovim backend. (thanks @nhtzr for the PR)</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.17.0-213
https://github.com/qvacua/vimr/releases/tag/v0.18.0-217
</releaseNotesLink>
<pubDate>2017-06-30T20:21:47.223329</pubDate>
<pubDate>2017-08-13T07:46:01.861985</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.17.0-213/VimR-v0.17.0-213.tar.bz2"
sparkle:version="213"
sparkle:shortVersionString="0.17.0"
sparkle:dsaSignature="MC4CFQDqNma3SXdeCptQiYm7Ll4YbSfjbQIVAMbpdfCwpKEUQAip/fTCThMRsVAx"
length="10696081"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.18.0-217/VimR-v0.18.0-217.tar.bz2"
sparkle:version="217"
sparkle:shortVersionString="0.18.0"
sparkle:dsaSignature="MC0CFQCxuuyXimvYXATNukOdPtHOE1TV/wIUL5MchH/pqdc/WnZaDekiaverBGA="
length="10703208"
type="application/octet-stream"/>
</item>
</channel>

27
appcast_snapshot.xml
View File

@ -7,27 +7,26 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.17.0-213</title>
<title>v0.18.0-217</title>
<description><![CDATA[
<ul>
<li>GH-436: Use colors from the selected <code>colorscheme</code> for tools, e.g. the file browser:<ul>
<li>Use the <code>directory</code> color for folders in the file browser.</li>
<li>Use slightly darker version of the <code>background</code> color for the window title bar.</li>
<li>Add an option to turn off file icons in the file browser and in the buffer list in case the <code>colorscheme</code> does not play well with them, cf. GH-479.</li>
</ul>
</li>
<li>GH-481: Bugfix: Quiting with <code>:qa!</code> warns about buffers that are already gone. (thanks @nhtzr for the PR)</li>
<li>GH-458: Drag &amp; Drop of files onto the main window works. (thanks @nhtzr for the PR)</li>
<li>GH-487: Hide the mouse cursor when typing. (thanks @nhtzr for the PR)</li>
<li>GH-315: Enable mapping of <code>&lt;C-Tab&gt;</code> and <code>&lt;C-S-Tab&gt;</code>. (thanks @nhtzr for the PR)</li>
<li>GH-368: Send <code>FocusGained</code> and <code>FocusLost</code> event to neovim backend. (thanks @nhtzr for the PR)</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.17.0-213
https://github.com/qvacua/vimr/releases/tag/v0.18.0-217
</releaseNotesLink>
<pubDate>2017-06-30T20:21:47.223329</pubDate>
<pubDate>2017-08-13T07:46:01.861985</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.17.0-213/VimR-v0.17.0-213.tar.bz2"
sparkle:version="213"
sparkle:shortVersionString="0.17.0"
sparkle:dsaSignature="MC4CFQDqNma3SXdeCptQiYm7Ll4YbSfjbQIVAMbpdfCwpKEUQAip/fTCThMRsVAx"
length="10696081"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.18.0-217/VimR-v0.18.0-217.tar.bz2"
sparkle:version="217"
sparkle:shortVersionString="0.18.0"
sparkle:dsaSignature="MC0CFQCxuuyXimvYXATNukOdPtHOE1TV/wIUL5MchH/pqdc/WnZaDekiaverBGA="
length="10703208"
type="application/octet-stream"/>
</item>
</channel>

4
bin/build.sh
View File

@ -42,8 +42,8 @@ fi
echo "### Installing some python packages"
pip install requests
pip install Markdown
pip2 install requests
pip2 install Markdown
echo "### Building VimR"

4
bin/commit_and_push_appcast.sh
View File

@ -13,13 +13,15 @@ else
cp ./build/Release/appcast.xml .
fi
echo "### Commiting and pushing appcast"
echo "### Commiting and pushing appcast to ${BRANCH}"
git commit -S -am "Bump appcast to ${COMPOUND_VERSION}"
git push origin HEAD:"${BRANCH}"
if [ "${IS_SNAPSHOT}" = false ] && [ "${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}" = true ] ; then
echo "### Committing and pushing release appcast to develop"
git reset --hard @
git fetch origin
git checkout -b for_appcast origin/develop
git merge --ff-only for_build
cp appcast.xml appcast_snapshot.xml

8
bin/set_appcast.py
View File

@ -1,7 +1,9 @@
#!/usr/bin/env python
#!/usr/local/bin/python2
# pip install requests
# pip install Markdown
# pip2 install requests
# pip2 install Markdown
# We use python2 of brew due to some pip packages.
import os
import io

12
resources/release-notes.md
View File

@ -1,5 +1,17 @@
# next
* ...
# 0.18.0-217
* GH-481: Bugfix: Quiting with `:qa!` warns about buffers that are already gone. (thanks @nhtzr for the PR)
* GH-458: Drag & Drop of files onto the main window works. (thanks @nhtzr for the PR)
* GH-487: Hide the mouse cursor when typing. (thanks @nhtzr for the PR)
* GH-315: Enable mapping of `<C-Tab>` and `<C-S-Tab>`. (thanks @nhtzr for the PR)
* GH-368: Send `FocusGained` and `FocusLost` event to neovim backend. (thanks @nhtzr for the PR)
# 0.17.0-213
* GH-436: Use colors from the selected `colorscheme` for tools, e.g. the file browser:
- Use the `directory` color for folders in the file browser.
- Use slightly darker version of the `background` color for the window title bar.