qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-26 23:36:08 +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 2019-03-10 18:58:55 +01:00
commit 7107c18679
12 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NvimView/DrawerDev/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.26.2</string>
<string>0.26.3</string>
<key>CFBundleVersion</key>
<string>305</string>
<string>306</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

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

@ -809,7 +809,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 305;
CURRENT_PROJECT_VERSION = 306;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -871,7 +871,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 305;
CURRENT_PROJECT_VERSION = 306;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -900,7 +900,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 305;
DYLIB_CURRENT_VERSION = 306;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;
@ -922,7 +922,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 305;
DYLIB_CURRENT_VERSION = 306;
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>0.26.2</string>
<string>0.26.3</string>
<key>CFBundleVersion</key>
<string>305</string>
<string>306</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

4
NvimView/NvimViewTests/Info.plist
View File

@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.26.2</string>
<string>0.26.3</string>
<key>CFBundleVersion</key>
<string>305</string>
<string>306</string>
</dict>
</plist>

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

@ -1330,7 +1330,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 305;
CURRENT_PROJECT_VERSION = 306;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1388,7 +1388,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 305;
CURRENT_PROJECT_VERSION = 306;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

4
VimR/VimR/FileBrowser.swift
View File

@ -64,6 +64,10 @@ class FileBrowser: NSView,
.disposed(by: self.disposeBag)
}
deinit {
self.fileView.unbindTreeController()
}
private let emit: (UuidAction<Action>) -> Void
private let disposeBag = DisposeBag()

8
VimR/VimR/FileOutlineView.swift
View File

@ -163,6 +163,10 @@ class FileOutlineView: NSOutlineView,
}
}
func unbindTreeController() {
self.treeController.unbind(.contentArray)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@ -215,7 +219,11 @@ class FileOutlineView: NSOutlineView,
NSSortDescriptor(key: "isLeaf", ascending: true), // Folders first,
NSSortDescriptor(key: "displayName", ascending: true) // then, name
]
// The following will create a retain cycle. The superview *must* unbind
// in deinit. See deinit of FileBrowser
self.treeController.bind(.contentArray, to: self, withKeyPath: "content")
self.bind(.content, to: self.treeController, withKeyPath: "arrangedObjects")
self.bind(.selectionIndexPaths,
to: self.treeController,

4
VimR/VimR/Info.plist
View File

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

4
VimR/VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.26.2</string>
<string>0.26.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>305</string>
<string>306</string>
</dict>
</plist>

18
appcast.xml
View File

@ -7,22 +7,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.26.2-305</title>
<title>v0.26.3-306</title>
<description><![CDATA[
<ul>
<li>GH-425: Bind http server to localhost</li>
<li>Bugfix: Memory leak.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.26.2-305
https://github.com/qvacua/vimr/releases/tag/v0.26.3-306
</releaseNotesLink>
<pubDate>2019-03-09T22:21:36.462298</pubDate>
<pubDate>2019-03-10T18:58:31.542648</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.26.2-305/VimR-v0.26.2-305.tar.bz2"
sparkle:version="305"
sparkle:shortVersionString="0.26.2"
sparkle:dsaSignature="MC4CFQCW2VswltCKY74EWmBeSbAY/DuwFwIVALfdDvPuQIl0RIobGuEsgR6qBadD"
length="15168485"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.26.3-306/VimR-v0.26.3-306.tar.bz2"
sparkle:version="306"
sparkle:shortVersionString="0.26.3"
sparkle:dsaSignature="MC4CFQCcY7GI852mTSbMl/T8KbTA/efNPQIVANnhf9PuV4UsXYKtumgeKmsGQRf7"
length="15170307"
type="application/octet-stream"/>
</item>
</channel>

18
appcast_snapshot.xml
View File

@ -7,22 +7,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.26.2-305</title>
<title>v0.26.3-306</title>
<description><![CDATA[
<ul>
<li>GH-425: Bind http server to localhost</li>
<li>Bugfix: Memory leak.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.26.2-305
https://github.com/qvacua/vimr/releases/tag/v0.26.3-306
</releaseNotesLink>
<pubDate>2019-03-09T22:21:36.462298</pubDate>
<pubDate>2019-03-10T18:58:31.542648</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.26.2-305/VimR-v0.26.2-305.tar.bz2"
sparkle:version="305"
sparkle:shortVersionString="0.26.2"
sparkle:dsaSignature="MC4CFQCW2VswltCKY74EWmBeSbAY/DuwFwIVALfdDvPuQIl0RIobGuEsgR6qBadD"
length="15168485"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.26.3-306/VimR-v0.26.3-306.tar.bz2"
sparkle:version="306"
sparkle:shortVersionString="0.26.3"
sparkle:dsaSignature="MC4CFQCcY7GI852mTSbMl/T8KbTA/efNPQIVANnhf9PuV4UsXYKtumgeKmsGQRf7"
length="15170307"
type="application/octet-stream"/>
</item>
</channel>

8
resources/release-notes.md
View File

@ -2,11 +2,15 @@
* ...
# 0.26.2-???
# 0.26.3-???
* Bugfix: Memory leak.
# 0.26.2-305
* GH-425: Bind http server to localhost
# 0.26.1-???
# 0.26.1-304
* Fix broken "Navigate to the current buffer" of the file browser
* Dependencies updates: