From 380d8f3d435d26d09a217acee3a3872a6bf3c10e Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Wed, 13 Mar 2019 15:44:05 +0100 Subject: [PATCH 01/13] Refactor slightly --- NvimView/NvimView/RxSwiftCommons.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NvimView/NvimView/RxSwiftCommons.swift b/NvimView/NvimView/RxSwiftCommons.swift index f7f491c6..74633edc 100644 --- a/NvimView/NvimView/RxSwiftCommons.swift +++ b/NvimView/NvimView/RxSwiftCommons.swift @@ -87,6 +87,6 @@ extension PrimitiveSequence where TraitType == SingleTrait { } private func broadcast(_ condition: NSCondition) { - defer { condition.unlock() } condition.broadcast() + condition.unlock() } From 7d8d6ca36335335f9f3e6820446864d993ee07a4 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Wed, 13 Mar 2019 15:51:11 +0100 Subject: [PATCH 02/13] Refactor slightly --- NvimView/NvimView/RxSwiftCommons.swift | 4 ++-- VimR/VimR/RxSwiftCommons.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NvimView/NvimView/RxSwiftCommons.swift b/NvimView/NvimView/RxSwiftCommons.swift index 74633edc..90060ca4 100644 --- a/NvimView/NvimView/RxSwiftCommons.swift +++ b/NvimView/NvimView/RxSwiftCommons.swift @@ -33,7 +33,7 @@ extension PrimitiveSequence where Element == Never, TraitType == CompletableTrai broadcast(condition) }) - while !trigger && condition.wait(until: Date(timeIntervalSinceNow: 5)) {} + while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) } disposable.dispose() if let e = err { @@ -68,7 +68,7 @@ extension PrimitiveSequence where TraitType == SingleTrait { broadcast(condition) }) - while !trigger && condition.wait(until: Date(timeIntervalSinceNow: 5)) {} + while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) } disposable.dispose() return value diff --git a/VimR/VimR/RxSwiftCommons.swift b/VimR/VimR/RxSwiftCommons.swift index 08a6c84a..ce8da29b 100644 --- a/VimR/VimR/RxSwiftCommons.swift +++ b/VimR/VimR/RxSwiftCommons.swift @@ -45,7 +45,7 @@ extension PrimitiveSequence where Element == Never, TraitType == CompletableTrai broadcast(condition) }) - while !trigger && condition.wait(until: Date(timeIntervalSinceNow: 5)) {} + while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) } disposable.dispose() if let e = err { @@ -87,7 +87,7 @@ extension PrimitiveSequence where TraitType == SingleTrait { broadcast(condition) }) - while !trigger && condition.wait(until: Date(timeIntervalSinceNow: 5)) {} + while !trigger { condition.wait(until: Date(timeIntervalSinceNow: 5)) } disposable.dispose() return value From 38fb91f6c0ef61cbe8809f9315d25df9de688dfb Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Wed, 13 Mar 2019 22:52:52 +0100 Subject: [PATCH 03/13] Update deps --- Cartfile | 4 ++-- Cartfile.resolved | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cartfile b/Cartfile index bdf52807..c44f06e9 100644 --- a/Cartfile +++ b/Cartfile @@ -4,8 +4,8 @@ github "eonil/FileSystemEvents" == 1.0.0 github "sparkle-project/Sparkle" == 1.21.3 github "qvacua/CocoaFontAwesome" "master" github "qvacua/CocoaMarkdown" "master" -github "qvacua/RxMessagePort" == 0.0.6 -github "qvacua/RxNeovimApi" == 0.3.4-1 +github "qvacua/RxMessagePort" == 0.0.7 +github "qvacua/RxNeovimApi" == 0.3.4-2 github "sindresorhus/github-markdown-css" == 3.0.1 github "qvacua/swifter" "nonpublic" github "a2/MessagePack.swift" == 3.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index f464a457..e2169525 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -7,9 +7,9 @@ github "elegantchaos/DictionaryCoding" "1.0.6" github "eonil/FileSystemEvents" "1.0.0" github "qvacua/CocoaFontAwesome" "fc2a08babd676525ced68061b19ad8ff3dd1d0b3" github "qvacua/CocoaMarkdown" "c58166490a71ad4d8466f7e7b9faf7cb0917c42f" -github "qvacua/RxMessagePort" "v0.0.6" -github "qvacua/RxMsgpackRpc" "v0.0.8" -github "qvacua/RxNeovimApi" "v0.3.4-1" +github "qvacua/RxMessagePort" "v0.0.7" +github "qvacua/RxMsgpackRpc" "v0.0.9" +github "qvacua/RxNeovimApi" "v0.3.4-2" github "qvacua/ShortcutRecorder" "71baf522a1e57b5f130055e33dcd800687f6ea80" github "qvacua/swifter" "1905655ceedec5b5768f2089ceccf31621f6230a" github "sindresorhus/github-markdown-css" "v3.0.1" From c9facb60eaf72f880ed96b877a494321f868e4c9 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Wed, 13 Mar 2019 23:07:33 +0100 Subject: [PATCH 04/13] Refactor slightly --- NvimView/NvimView/SwiftCommons.swift | 17 +++++++++++++++++ NvimView/NvimView/UiBridge.swift | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NvimView/NvimView/SwiftCommons.swift b/NvimView/NvimView/SwiftCommons.swift index 0b0e8024..e25995db 100644 --- a/NvimView/NvimView/SwiftCommons.swift +++ b/NvimView/NvimView/SwiftCommons.swift @@ -14,6 +14,23 @@ extension Array where Element: Hashable { } } +extension Array { + + func data() -> Data { + return self.withUnsafeBytes { pointer in + if let baseAddr = pointer.baseAddress { + return Data(bytes: baseAddr, count: pointer.count) + } + + let newPointer = UnsafeMutablePointer.allocate(capacity: self.count) + for (index, element) in self.enumerated() { + newPointer[index] = element + } + return Data(bytesNoCopy: newPointer, count: self.count, deallocator: .free) + } + } +} + extension RandomAccessCollection where Index == Int { func parallelMap( diff --git a/NvimView/NvimView/UiBridge.swift b/NvimView/NvimView/UiBridge.swift index a445dcc5..917b8262 100644 --- a/NvimView/NvimView/UiBridge.swift +++ b/NvimView/NvimView/UiBridge.swift @@ -364,20 +364,3 @@ class UiBridge { } private let timeout = CFTimeInterval(5) - -private extension Array { - - func data() -> Data { - return self.withUnsafeBytes { pointer in - if let baseAddr = pointer.baseAddress { - return Data(bytes: baseAddr, count: pointer.count) - } - - let newPointer = UnsafeMutablePointer.allocate(capacity: self.count) - for (index, element) in self.enumerated() { - newPointer[index] = element - } - return Data(bytesNoCopy: newPointer, count: self.count, deallocator: .free) - } - } -} From 2561f541a1548218aac9d72948255fde5d590c8f Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 08:46:41 +0100 Subject: [PATCH 05/13] Refactor slightly --- NvimView/NvimView/SwiftCommons.swift | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/NvimView/NvimView/SwiftCommons.swift b/NvimView/NvimView/SwiftCommons.swift index e25995db..8a80b451 100644 --- a/NvimView/NvimView/SwiftCommons.swift +++ b/NvimView/NvimView/SwiftCommons.swift @@ -17,17 +17,7 @@ extension Array where Element: Hashable { extension Array { func data() -> Data { - return self.withUnsafeBytes { pointer in - if let baseAddr = pointer.baseAddress { - return Data(bytes: baseAddr, count: pointer.count) - } - - let newPointer = UnsafeMutablePointer.allocate(capacity: self.count) - for (index, element) in self.enumerated() { - newPointer[index] = element - } - return Data(bytesNoCopy: newPointer, count: self.count, deallocator: .free) - } + return self.withUnsafeBufferPointer(Data.init) } } From eab44dc03d2562efcec13feb6abe2afe407ff56d Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 08:48:28 +0100 Subject: [PATCH 06/13] Refactor slightly --- VimR/VimR/FileOutlineView.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/VimR/VimR/FileOutlineView.swift b/VimR/VimR/FileOutlineView.swift index 0f8e891f..cdcc8e4b 100644 --- a/VimR/VimR/FileOutlineView.swift +++ b/VimR/VimR/FileOutlineView.swift @@ -273,7 +273,7 @@ class FileOutlineView: NSOutlineView, .compactMap { $0.node?.url } ?? [] let newNodes = newChildUrls .subtracting(existingUrls) - .map { Node(url: $0) } + .map(Node.init) let newIndexPaths = (0.. Date: Thu, 14 Mar 2019 09:56:23 +0100 Subject: [PATCH 07/13] Add a dev target --- .gitignore | 1 + VimR/VimR.dev.Info.plist | 1285 +++++++++++++++++ VimR/VimR.xcodeproj/project.pbxproj | 481 ++++++ .../xcshareddata/xcschemes/VimR.dev.xcscheme | 91 ++ 4 files changed, 1858 insertions(+) create mode 100644 VimR/VimR.dev.Info.plist create mode 100644 VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme diff --git a/.gitignore b/.gitignore index 90fcb884..b55cc475 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,4 @@ Temporary Items .apdisk .deps +tags.* diff --git a/VimR/VimR.dev.Info.plist b/VimR/VimR.dev.Info.plist new file mode 100644 index 00000000..936019c3 --- /dev/null +++ b/VimR/VimR.dev.Info.plist @@ -0,0 +1,1285 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDocumentTypes + + + CFBundleTypeName + Document + CFBundleTypeRole + Editor + LSItemContentTypes + + public.data + + LSTypeIsPackage + 0 + + + CFBundleTypeExtensions + + vim + + CFBundleTypeIconFile + MacVim-vim + CFBundleTypeName + Vim Script File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + txt + text + utf8 + + CFBundleTypeIconFile + MacVim-txt + CFBundleTypeMIMETypes + + text/plain + + CFBundleTypeName + Plain Text File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + tex + sty + cls + ltx + ins + dtx + + CFBundleTypeIconFile + MacVim-tex + CFBundleTypeName + TeX File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + h + + CFBundleTypeIconFile + MacVim-h + CFBundleTypeName + C Header Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.c-header + + + + CFBundleTypeExtensions + + pch + + CFBundleTypeIconFile + MacVim-h + CFBundleTypeName + C Precompiled Header Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.precompiled-c-header + + + + CFBundleTypeExtensions + + hh + hp + hpp + hxx + h++ + + CFBundleTypeIconFile + MacVim-h + CFBundleTypeName + C++ Header Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + pch++ + + CFBundleTypeIconFile + MacVim-h + CFBundleTypeName + C++ Precompiled Header Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.precompiled-c-plus-plus-header + + + + CFBundleTypeExtensions + + c + + CFBundleTypeIconFile + MacVim-c + CFBundleTypeName + C Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.c-source + + + + CFBundleTypeExtensions + + m + + CFBundleTypeIconFile + MacVim-m + CFBundleTypeName + Objective-C Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.objective-c-source + + + + CFBundleTypeExtensions + + mm + + CFBundleTypeIconFile + MacVim-mm + CFBundleTypeName + Objective-C++ Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.objective-c-plus-plus-source + + + + CFBundleTypeExtensions + + cc + cp + cpp + cxx + c++ + + CFBundleTypeIconFile + MacVim-cpp + CFBundleTypeName + C++ Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.c-plus-plus-source + + + + CFBundleTypeExtensions + + s + asm + + CFBundleTypeName + Assembly Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.assembler-source + + + + CFBundleTypeExtensions + + r + + CFBundleTypeName + Rez Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.rez-source + + + + CFBundleTypeExtensions + + java + jav + + CFBundleTypeIconFile + MacVim-java + CFBundleTypeName + Java Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + com.sun.java-source + + + + CFBundleTypeExtensions + + l + lm + lmm + lpp + lxx + + CFBundleTypeName + Lex Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.lex-source + + + + CFBundleTypeExtensions + + y + ym + ymm + ypp + yxx + + CFBundleTypeName + Yacc Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.yacc-source + + + + CFBundleTypeExtensions + + defs + + CFBundleTypeName + Mig Definition File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + exp + + CFBundleTypeName + Symbol Export File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.symbol-export + + + + CFBundleTypeExtensions + + f + for + fpp + f77 + f90 + f95 + + CFBundleTypeIconFile + MacVim-f + CFBundleTypeName + Fortran Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.fortran-source + + + + CFBundleTypeExtensions + + pas + + CFBundleTypeName + Pascal Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.pascal-source + + + + CFBundleTypeExtensions + + ada + adb + ads + + CFBundleTypeName + Ada Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.ada-source + + + + CFBundleTypeExtensions + + html + phtml + shtml + xhtml + htm + pht + sht + xht + phtm + shtm + xhtm + + CFBundleTypeIconFile + MacVim-html + CFBundleTypeMIMETypes + + text/html + + CFBundleTypeName + HTML Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.html + + + + CFBundleTypeExtensions + + xml + rss + tld + pt + cpt + dtml + + CFBundleTypeIconFile + MacVim-xml + CFBundleTypeMIMETypes + + text/xml + + CFBundleTypeName + XML Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + public.xml + + + + CFBundleTypeExtensions + + js + htc + jscript + javascript + + CFBundleTypeIconFile + MacVim-js + CFBundleTypeMIMETypes + + text/javascript + + CFBundleTypeName + JavaScript Source File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + LSItemContentTypes + + com.netscape.javascript-source + + + + CFBundleTypeExtensions + + pl + pm + pod + perl + + CFBundleTypeIconFile + MacVim-perl + CFBundleTypeMIMETypes + + text/x-perl-script + + CFBundleTypeName + Perl Source File + CFBundleTypeRole + Editor + LSItemContentTypes + + public.perl-script + + + + CFBundleTypeExtensions + + py + rpy + cpy + python + + CFBundleTypeIconFile + MacVim-py + CFBundleTypeMIMETypes + + text/x-python-script + + CFBundleTypeName + Python Source File + CFBundleTypeRole + Editor + LSItemContentTypes + + public.python-script + + + + CFBundleTypeExtensions + + php + php3 + php4 + php5 + ph3 + ph4 + phtml + + CFBundleTypeIconFile + MacVim-php + CFBundleTypeMIMETypes + + text/php + + CFBundleTypeName + PHP Source File + CFBundleTypeRole + Editor + LSItemContentTypes + + public.php-script + + + + CFBundleTypeExtensions + + rb + rbw + rbx + rjs + rxml + + CFBundleTypeIconFile + MacVim-rb + CFBundleTypeMIMETypes + + text/ruby-script + + CFBundleTypeName + Ruby Source File + CFBundleTypeRole + Editor + LSItemContentTypes + + public.ruby-script + + + + CFBundleTypeExtensions + + sh + csh + command + ss + bashrc + bash_profile + bash_login + profile + bash_logout + + CFBundleTypeIconFile + MacVim-bash + CFBundleTypeName + Shell script + CFBundleTypeRole + Editor + LSItemContentTypes + + public.shell-script + + + + CFBundleTypeExtensions + + class + + CFBundleTypeName + Java Class File + CFBundleTypeRole + Viewer + LSIsAppleDefaultForType + + LSItemContentTypes + + com.sun.java-class + + + + CFBundleTypeExtensions + + patch + diff + + CFBundleTypeIconFile + MacVim-patch + CFBundleTypeName + Patch File + CFBundleTypeRole + Editor + LSIsAppleDefaultForType + + + + CFBundleTypeExtensions + + strings + + CFBundleTypeName + Strings File + CFBundleTypeRole + Editor + LSItemContentTypes + + public.strings-text + + + + CFBundleTypeExtensions + + * + + CFBundleTypeName + Text File + CFBundleTypeOSTypes + + **** + + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + applescript + + CFBundleTypeIconFile + MacVim-applescript + CFBundleTypeName + AppleScript Source File + CFBundleTypeRole + Editor + LSItemContentTypes + + com.apple.applescript.text + + + + CFBundleTypeExtensions + + as + + CFBundleTypeIconFile + MacVim-as + CFBundleTypeName + ActionScript Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + asp + asa + + CFBundleTypeIconFile + MacVim-asp + CFBundleTypeName + ASP document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + aspx + ascx + asmx + ashx + + CFBundleTypeIconFile + MacVim-asp + CFBundleTypeName + ASP.NET document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + bib + + CFBundleTypeIconFile + MacVim-bib + CFBundleTypeName + BibTeX bibliography + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + cs + + CFBundleTypeIconFile + MacVim-cs + CFBundleTypeName + C# Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + cfdg + + CFBundleTypeIconFile + MacVim-csfg + CFBundleTypeName + Context Free Design Grammar + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + csv + + CFBundleTypeIconFile + MacVim-csv + CFBundleTypeName + Comma separated values + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + tsv + + CFBundleTypeIconFile + MacVim-tsv + CFBundleTypeName + Tab separated values + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + cgi + fcgi + + CFBundleTypeIconFile + MacVim-cgi + CFBundleTypeName + CGI script + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + cfg + conf + config + htaccess + + CFBundleTypeIconFile + MacVim-cfg + CFBundleTypeName + Configuration file + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + css + + CFBundleTypeIconFile + MacVim-css + CFBundleTypeName + Cascading style sheet + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + dtd + + CFBundleTypeIconFile + MacVim-dtd + CFBundleTypeName + Document Type Definition + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + dylan + + CFBundleTypeIconFile + MacVim-dylan + CFBundleTypeName + Dylan Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + erl + hrl + + CFBundleTypeIconFile + MacVim-erl + CFBundleTypeName + Erlang Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + fscript + + CFBundleTypeIconFile + MacVim-fscript + CFBundleTypeName + F-Script Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hs + lhs + + CFBundleTypeIconFile + MacVim-hs + CFBundleTypeName + Haskell Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + inc + + CFBundleTypeIconFile + MacVim-inc + CFBundleTypeName + Include file + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + ics + + CFBundleTypeIconFile + MacVim-ics + CFBundleTypeName + iCalendar schedule + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + ini + + CFBundleTypeIconFile + MacVim-ini + CFBundleTypeName + MS Windows initialization file + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + io + + CFBundleTypeIconFile + MacVim-io + CFBundleTypeName + Io Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + bsh + + CFBundleTypeIconFile + MacVim-bsh + CFBundleTypeName + BeanShell script + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + properties + + CFBundleTypeIconFile + MacVim-properties + CFBundleTypeName + Java properties file + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + jsp + + CFBundleTypeIconFile + MacVim-jsp + CFBundleTypeName + Java Server Page + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + lisp + cl + l + lsp + mud + el + + CFBundleTypeIconFile + MacVim-lisp + CFBundleTypeName + LISP Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + log + + CFBundleTypeIconFile + MacVim-log + CFBundleTypeName + Log file + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + wiki + wikipedia + mediawiki + + CFBundleTypeIconFile + MacVim-wiki + CFBundleTypeName + Mediawiki document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + ps + eps + + CFBundleTypeIconFile + MacVim-ps + CFBundleTypeName + PostScript Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + scm + sch + + CFBundleTypeIconFile + MacVim-sch + CFBundleTypeName + Scheme Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + sql + + CFBundleTypeIconFile + MacVim-sql + CFBundleTypeName + SQL Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + tcl + + CFBundleTypeIconFile + MacVim-tcl + CFBundleTypeName + Tcl Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + xsl + xslt + + CFBundleTypeIconFile + MacVim-xsl + CFBundleTypeName + XSL stylesheet + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + vcf + vcard + + CFBundleTypeIconFile + MacVim-vcf + CFBundleTypeName + Electronic business card + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + vb + + CFBundleTypeIconFile + MacVim-vb + CFBundleTypeName + Visual Basic Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + yaml + yml + + CFBundleTypeIconFile + MacVim-yaml + CFBundleTypeName + YAML document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + gtd + gtdlog + + CFBundleTypeIconFile + MacVim-gtd + CFBundleTypeName + GTD document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + markdown + markd + mdown + md + + CFBundleTypeIconFile + MacVim-markdown + CFBundleTypeName + Markdown document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + rst + + CFBundleTypeIconFile + MacVim-rst + CFBundleTypeName + reStructuredText document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + vba + + CFBundleTypeIconFile + MacVim-vba + CFBundleTypeName + Vimball Archive + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + vhd + vhdl + + CFBundleTypeIconFile + MacVim-generic + CFBundleTypeName + VHDL Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + lua + + CFBundleTypeIconFile + MacVim-generic + CFBundleTypeMIMETypes + + text/x-lua-script + + CFBundleTypeName + Lua Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + v + + CFBundleTypeIconFile + MacVim-generic + CFBundleTypeName + Verilog HDL Source File + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + vh + + CFBundleTypeIconFile + MacVim-generic + CFBundleTypeName + Verilog HDL Header Source File + CFBundleTypeRole + Editor + + + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.26.5 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + com.qvacua.vimr.url + CFBundleURLSchemes + + vimr + + + + CFBundleVersion + 308 + LSApplicationCategoryType + public.app-category.productivity + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSAppTransportSecurity + + NSExceptionDomains + + localhost + + NSExceptionAllowsInsecureHTTPLoads + + NSExceptionMinimumTLSVersion + TLSv1.2 + NSExceptionRequiresForwardSecrecy + + NSIncludesSubdomains + + NSRequiresCertificateTransparency + + NSThirdPartyExceptionAllowsInsecureHTTPLoads + + NSThirdPartyExceptionMinimumTLSVersion + TLSv1.2 + NSThirdPartyExceptionRequiresForwardSecrecy + + + + + NSHumanReadableCopyright + Copyright © 2016 Tae Won Ha. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + VimR.Application + SUFeedURL + https://raw.githubusercontent.com/qvacua/vimr/master/appcast.xml + SUPublicDSAKeyFile + sparkle_pub.pem + + diff --git a/VimR/VimR.xcodeproj/project.pbxproj b/VimR/VimR.xcodeproj/project.pbxproj index 5d0df51d..96a0b413 100644 --- a/VimR/VimR.xcodeproj/project.pbxproj +++ b/VimR/VimR.xcodeproj/project.pbxproj @@ -105,6 +105,189 @@ 4B19BEFC1E110183007E823C /* markdown in Resources */ = {isa = PBXBuildFile; fileRef = 4B19BEFA1E110183007E823C /* markdown */; }; 4B19BEFD1E110183007E823C /* preview in Resources */ = {isa = PBXBuildFile; fileRef = 4B19BEFB1E110183007E823C /* preview */; }; 4B238BE11D3BF24200CBDD98 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B238BE01D3BF24200CBDD98 /* Application.swift */; }; + 4B2636AA223A487B00021586 /* WorkspaceToolButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB489411D952CF6005BB0E8 /* WorkspaceToolButton.swift */; }; + 4B2636AB223A487B00021586 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B238BE01D3BF24200CBDD98 /* Application.swift */; }; + 4B2636AC223A487B00021586 /* Workspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423951D8EFD7100FC78C8 /* Workspace.swift */; }; + 4B2636AD223A487B00021586 /* AppKitCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70931D60E04200E12030 /* AppKitCommons.swift */; }; + 4B2636AE223A487B00021586 /* InnterToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3965351DEB21300082D3C1 /* InnterToolBar.swift */; }; + 4B2636AF223A487B00021586 /* WorkspaceBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423971D8EFDE000FC78C8 /* WorkspaceBar.swift */; }; + 4B2636B0223A487B00021586 /* RxSwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB1BEA81D48773200463C29 /* RxSwiftCommons.swift */; }; + 4B2636B1223A487B00021586 /* SwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70951D6100E300E12030 /* SwiftCommons.swift */; }; + 4B2636B2223A487B00021586 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEBA5081CFF374B00673FDF /* AppDelegate.swift */; }; + 4B2636B3223A487B00021586 /* WorkspaceTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423991D8EFE3000FC78C8 /* WorkspaceTool.swift */; }; + 4B2636B4223A487B00021586 /* FileItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7CB4863F80230C32D3C /* FileItem.swift */; }; + 4B2636B5223A487B00021586 /* FileItemIgnorePattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B69499B2569793350CEC /* FileItemIgnorePattern.swift */; }; + 4B2636B6223A487B00021586 /* DictionaryErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCE21063B600043A396 /* DictionaryErrors.swift */; }; + 4B2636B7223A487B00021586 /* FileUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA8AC40B901B20F20B71 /* FileUtils.swift */; }; + 4B2636B8223A487B00021586 /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEEB33113B0E33C3830F /* Matcher.swift */; }; + 4B2636B9223A487B00021586 /* ScoredFileItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */; }; + 4B2636BA223A487B00021586 /* Scorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9D510177918080BE39B /* Scorer.swift */; }; + 4B2636BB223A487B00021586 /* ProxyWorkspaceBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB409ED1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift */; }; + 4B2636BC223A487B00021586 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; }; + 4B2636BD223A487B00021586 /* NetUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B02440BC99C42F9EBD45 /* NetUtils.m */; }; + 4B2636BE223A487B00021586 /* States.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6608B4F0E037CA0F4C /* States.swift */; }; + 4B2636BF223A487B00021586 /* Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B34FC23D805A8B29E8F7 /* Context.swift */; }; + 4B2636C0223A487B00021586 /* AppDelegateReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7A68B7109CEFAF105E8 /* AppDelegateReducer.swift */; }; + 4B2636C1223A487B00021586 /* UiRoot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD4149D5A25C82064DD8 /* UiRoot.swift */; }; + 4B2636C2223A487B00021586 /* UiRootReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B457B9D0FA4D21F3751E /* UiRootReducer.swift */; }; + 4B2636C3223A487B00021586 /* MainWindowReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD83A13BF133741766CC /* MainWindowReducer.swift */; }; + 4B2636C4223A487B00021586 /* PreviewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6C6C7792B05164B0216 /* PreviewTool.swift */; }; + 4B2636C5223A487B00021586 /* PreviewReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE37AA2843779CAFA76F /* PreviewReducer.swift */; }; + 4B2636C6223A487B00021586 /* PreviewMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B617C229B19DB3E987B8 /* PreviewMiddleware.swift */; }; + 4B2636C7223A487B00021586 /* HttpServerMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B1DC584C89C477E83FA2 /* HttpServerMiddleware.swift */; }; + 4B2636C8223A487B00021586 /* DictionaryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCD21063B600043A396 /* DictionaryEncoder.swift */; }; + 4B2636C9223A487B00021586 /* PreviewToolReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BFB0F294F3714D5E095F /* PreviewToolReducer.swift */; }; + 4B2636CA223A487B00021586 /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BFC0A5A9C6DB09BE1368 /* Types.swift */; }; + 4B2636CB223A487B00021586 /* OpenQuicklyReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B12CE56A9B36980288A4 /* OpenQuicklyReducer.swift */; }; + 4B2636CC223A487B00021586 /* FileMonitorReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B04EC69F616EEFAF5F96 /* FileMonitorReducer.swift */; }; + 4B2636CD223A487B00021586 /* FileMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B365A6434354B568B04F /* FileMonitor.swift */; }; + 4B2636CE223A487B00021586 /* FileBrowserReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */; }; + 4B2636CF223A487B00021586 /* BufferList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA43449BA41666CD55ED /* BufferList.swift */; }; + 4B2636D0223A487B00021586 /* BufferListReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B67A10E6BB2986B2416E /* BufferListReducer.swift */; }; + 4B2636D1223A487B00021586 /* PrefWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE168F31344B69E61B62 /* PrefWindow.swift */; }; + 4B2636D2223A487B00021586 /* PrefPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B07A4A9209C88380E015 /* PrefPane.swift */; }; + 4B2636D3223A487B00021586 /* GeneralPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB55946DAEBF55D24048 /* GeneralPref.swift */; }; + 4B2636D4223A487B00021586 /* PrefWindowReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B49E6924847AD085C8C9 /* PrefWindowReducer.swift */; }; + 4B2636D5223A487B00021586 /* GeneralPrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B0EB3F49C42A57D083AF /* GeneralPrefReducer.swift */; }; + 4B2636D6223A487B00021586 /* FileOutlineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BCE3E156C06EDF1F2806 /* FileOutlineView.swift */; }; + 4B2636D7223A487B00021586 /* FileBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA5C7099CDEB04B76BA4 /* FileBrowser.swift */; }; + 4B2636D8223A487B00021586 /* AppearancePref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B0FBFB766042CF06E463 /* AppearancePref.swift */; }; + 4B2636D9223A487B00021586 /* AdvencedPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BBE0A534F2F6009D31BE /* AdvencedPref.swift */; }; + 4B2636DA223A487B00021586 /* AppearancePrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BED01F5D94BFCA4CF80F /* AppearancePrefReducer.swift */; }; + 4B2636DB223A487B00021586 /* OpenQuicklyWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B71A92C24FEFE79A851E /* OpenQuicklyWindow.swift */; }; + 4B2636DC223A487B00021586 /* OpenQuicklyFilterOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEDE7F92BC7B49E802AF /* OpenQuicklyFilterOperation.swift */; }; + 4B2636DD223A487B00021586 /* OpenQuicklyFileViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B1558455B3A74D93EF2A /* OpenQuicklyFileViewRow.swift */; }; + 4B2636DE223A487B00021586 /* PrefMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B364460D86F17E80943C /* PrefMiddleware.swift */; }; + 4B2636DF223A487B00021586 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6AD3396160AA2C46919 /* Debouncer.swift */; }; + 4B2636E0223A487B00021586 /* PreviewUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B8EF9A9F5ACC175452BD /* PreviewUtils.swift */; }; + 4B2636E1223A487B00021586 /* FileItemUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B56C8ED31834BA9D8543 /* FileItemUtils.swift */; }; + 4B2636E2223A487B00021586 /* HtmlPreviewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B85023B042C485409CE1 /* HtmlPreviewTool.swift */; }; + 4B2636E3223A487B00021586 /* HtmlPreviewToolReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE5AEA3D0980860EED50 /* HtmlPreviewToolReducer.swift */; }; + 4B2636E4223A487B00021586 /* AdvancedPrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7039C5689CE45F53888 /* AdvancedPrefReducer.swift */; }; + 4B2636E5223A487B00021586 /* ToolsPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB2AD21A10A0ECA66A5E /* ToolsPref.swift */; }; + 4B2636E6223A487B00021586 /* ToolsPrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B694508FB5FDE607513A /* ToolsPrefReducer.swift */; }; + 4B2636E7223A487B00021586 /* PrefUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B8241CDE58F7AAF89AE4 /* PrefUtils.swift */; }; + 4B2636E8223A487B00021586 /* ThemedTableSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD2CA8DD198A6BCDBCB7 /* ThemedTableSubviews.swift */; }; + 4B2636E9223A487B00021586 /* ImageAndTextTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDC3F82CB4CB4FE56D1B /* ImageAndTextTableCell.swift */; }; + 4B2636EA223A487B00021586 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BC2F05E9A5C0DB039739 /* Theme.swift */; }; + 4B2636EB223A487B00021586 /* DictionaryCodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCC21063B600043A396 /* DictionaryCodingKey.swift */; }; + 4B2636EC223A487B00021586 /* MainWindow+CustomTitle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B71B4BB6550F5BC6D4CF /* MainWindow+CustomTitle.swift */; }; + 4B2636ED223A487B00021586 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6E01216D49BB9F3B6A3 /* MainWindow.swift */; }; + 4B2636EE223A487B00021586 /* DictionaryDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCB21063B600043A396 /* DictionaryDecoder.swift */; }; + 4B2636EF223A487B00021586 /* MainWindow+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B067B3247675BCD09218 /* MainWindow+Actions.swift */; }; + 4B2636F0223A487B00021586 /* MainWindow+Delegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B714EB137AE448CE8ABD /* MainWindow+Delegates.swift */; }; + 4B2636F1223A487B00021586 /* KeysPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B14A5949FB64C4B2646F /* KeysPref.swift */; }; + 4B2636F2223A487B00021586 /* KeysPrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B88B5FA08E897A3C2168 /* KeysPrefReducer.swift */; }; + 4B2636F3223A487B00021586 /* RxRedux.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B66A5E2D00EA143AFD86 /* RxRedux.swift */; }; + 4B2636F4223A487B00021586 /* ShortcutsPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B0E9B2F018D3E31D4B0B /* ShortcutsPref.swift */; }; + 4B2636F5223A487B00021586 /* ShortcutsTableSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B07F0085B7AE10413346 /* ShortcutsTableSubviews.swift */; }; + 4B2636F6223A487B00021586 /* DefaultShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B93256AF7F9137223E36 /* DefaultShortcuts.swift */; }; + 4B2636F7223A487B00021586 /* ShortcutItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BF230875DED6CD7AB3EB /* ShortcutItem.swift */; }; + 4B2636F8223A487B00021586 /* RpcEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BBF0944940845485A512 /* RpcEvents.swift */; }; + 4B2636F9223A487B00021586 /* RpcAppearanceEpic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B230EE8F1428980988F0 /* RpcAppearanceEpic.swift */; }; + 4B2636FA223A487B00021586 /* OSLogCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE867BD8F0ED0246CC94 /* OSLogCommons.swift */; }; + 4B2636FB223A487B00021586 /* Defs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7F7A4B3FD52263D211D /* Defs.swift */; }; + 4B2636FD223A487B00021586 /* MessagePack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5D02097705E00EC394A /* MessagePack.framework */; }; + 4B2636FE223A487B00021586 /* RxMsgpackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5CC20976F8900EC394A /* RxMsgpackRpc.framework */; }; + 4B2636FF223A487B00021586 /* EonilFileSystemEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C311FD2E2AA00DF95D1 /* EonilFileSystemEvents.framework */; }; + 4B263700223A487B00021586 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C321FD2E2AA00DF95D1 /* PureLayout.framework */; }; + 4B263701223A487B00021586 /* Socket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B0A1AA72120C35100F1E02F /* Socket.framework */; }; + 4B263702223A487B00021586 /* CocoaMarkdown.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */; }; + 4B263703223A487B00021586 /* CocoaFontAwesome.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C341FD2E2AA00DF95D1 /* CocoaFontAwesome.framework */; }; + 4B263704223A487B00021586 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */; }; + 4B263705223A487B00021586 /* RxMessagePort.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9E5E1D20990E08006455C3 /* RxMessagePort.framework */; }; + 4B263706223A487B00021586 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; }; + 4B263707223A487B00021586 /* RxNeovimApi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B17E54C209E3EA400265C1D /* RxNeovimApi.framework */; }; + 4B263708223A487B00021586 /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9DF285209C8A8B00DF2AAD /* Swifter.framework */; }; + 4B263709223A487B00021586 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C381FD2E2AB00DF95D1 /* RxCocoa.framework */; }; + 4B26370A223A487B00021586 /* ShortcutRecorder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BE34B822225BAC7002F57D3 /* ShortcutRecorder.framework */; }; + 4B26370B223A487B00021586 /* NvimView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; }; + 4B26370D223A487B00021586 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4BF07EE61D51326A009BECEB /* Credits.rtf */; }; + 4B26370E223A487B00021586 /* MacVim-xml.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433CE20B95EC5005807BA /* MacVim-xml.icns */; }; + 4B26370F223A487B00021586 /* MacVim-applescript.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433AA20B95EC2005807BA /* MacVim-applescript.icns */; }; + 4B263710223A487B00021586 /* MacVim-wiki.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D320B95EC6005807BA /* MacVim-wiki.icns */; }; + 4B263711223A487B00021586 /* MacVim-java.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D420B95EC6005807BA /* MacVim-java.icns */; }; + 4B263712223A487B00021586 /* MacVim-rst.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D720B95EC6005807BA /* MacVim-rst.icns */; }; + 4B263713223A487B00021586 /* MacVim-cfg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D020B95EC5005807BA /* MacVim-cfg.icns */; }; + 4B263714223A487B00021586 /* MacVim-inc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C920B95EC5005807BA /* MacVim-inc.icns */; }; + 4B263715223A487B00021586 /* MacVim-bsh.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A120B95EC1005807BA /* MacVim-bsh.icns */; }; + 4B263716223A487B00021586 /* MacVim-perl.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D520B95EC6005807BA /* MacVim-perl.icns */; }; + 4B263717223A487B00021586 /* MacVim-vcf.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433AF20B95EC2005807BA /* MacVim-vcf.icns */; }; + 4B263718223A487B00021586 /* MacVim-markdown.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C020B95EC4005807BA /* MacVim-markdown.icns */; }; + 4B263719223A487B00021586 /* MacVim-vba.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C120B95EC4005807BA /* MacVim-vba.icns */; }; + 4B26371A223A487B00021586 /* MacVim-cs.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B820B95EC3005807BA /* MacVim-cs.icns */; }; + 4B26371B223A487B00021586 /* MacVim-gtd.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433BE20B95EC3005807BA /* MacVim-gtd.icns */; }; + 4B26371C223A487B00021586 /* MacVim-js.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B120B95EC2005807BA /* MacVim-js.icns */; }; + 4B26371D223A487B00021586 /* MacVim-tex.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A820B95EC1005807BA /* MacVim-tex.icns */; }; + 4B26371E223A487B00021586 /* MacVim-css.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433DB20B95EC6005807BA /* MacVim-css.icns */; }; + 4B26371F223A487B00021586 /* MacVim-tsv.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B420B95EC2005807BA /* MacVim-tsv.icns */; }; + 4B263720223A487B00021586 /* MacVim-asp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433BA20B95EC3005807BA /* MacVim-asp.icns */; }; + 4B263721223A487B00021586 /* MacVim-plist.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A520B95EC1005807BA /* MacVim-plist.icns */; }; + 4B263722223A487B00021586 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA50A1CFF374B00673FDF /* Assets.xcassets */; }; + 4B263723223A487B00021586 /* MacVim-rb.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C420B95EC4005807BA /* MacVim-rb.icns */; }; + 4B263724223A487B00021586 /* MacVim-ini.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433CB20B95EC5005807BA /* MacVim-ini.icns */; }; + 4B263725223A487B00021586 /* MacVim-yaml.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A720B95EC1005807BA /* MacVim-yaml.icns */; }; + 4B263726223A487B00021586 /* MacVim-vb.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B920B95EC3005807BA /* MacVim-vb.icns */; }; + 4B263727223A487B00021586 /* MacVim-jsp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433CC20B95EC5005807BA /* MacVim-jsp.icns */; }; + 4B263728223A487B00021586 /* MacVim-html.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B620B95EC3005807BA /* MacVim-html.icns */; }; + 4B263729223A487B00021586 /* MacVim-tcl.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433BF20B95EC4005807BA /* MacVim-tcl.icns */; }; + 4B26372A223A487B00021586 /* MacVim-io.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C720B95EC4005807BA /* MacVim-io.icns */; }; + 4B26372B223A487B00021586 /* OpenQuicklyWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDF50191D77540900D8FBC3 /* OpenQuicklyWindow.xib */; }; + 4B26372C223A487B00021586 /* MacVim-csv.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433AD20B95EC2005807BA /* MacVim-csv.icns */; }; + 4B26372D223A487B00021586 /* MacVim-mm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433BC20B95EC3005807BA /* MacVim-mm.icns */; }; + 4B26372E223A487B00021586 /* MacVim-bib.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433CF20B95EC5005807BA /* MacVim-bib.icns */; }; + 4B26372F223A487B00021586 /* MacVim-cpp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B020B95EC2005807BA /* MacVim-cpp.icns */; }; + 4B263730223A487B00021586 /* MacVim-ps.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433DA20B95EC6005807BA /* MacVim-ps.icns */; }; + 4B263731223A487B00021586 /* MacVim-sch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D920B95EC6005807BA /* MacVim-sch.icns */; }; + 4B263732223A487B00021586 /* MacVim-dylan.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A320B95EC1005807BA /* MacVim-dylan.icns */; }; + 4B263733223A487B00021586 /* MacVim-sql.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A920B95EC2005807BA /* MacVim-sql.icns */; }; + 4B263734223A487B00021586 /* MacVim-m.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C620B95EC4005807BA /* MacVim-m.icns */; }; + 4B263735223A487B00021586 /* MacVim-hs.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B720B95EC3005807BA /* MacVim-hs.icns */; }; + 4B263736223A487B00021586 /* vimr in Resources */ = {isa = PBXBuildFile; fileRef = 4B37ADB81D6E471B00970D55 /* vimr */; }; + 4B263737223A487B00021586 /* MacVim-c.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433CA20B95EC5005807BA /* MacVim-c.icns */; }; + 4B263738223A487B00021586 /* MacVim-cgi.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433AC20B95EC2005807BA /* MacVim-cgi.icns */; }; + 4B263739223A487B00021586 /* MacVim-generic.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A220B95EC1005807BA /* MacVim-generic.icns */; }; + 4B26373A223A487B00021586 /* MacVim-properties.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433BD20B95EC3005807BA /* MacVim-properties.icns */; }; + 4B26373B223A487B00021586 /* MacVim-ics.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D620B95EC6005807BA /* MacVim-ics.icns */; }; + 4B26373C223A487B00021586 /* MacVim-php.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433CD20B95EC5005807BA /* MacVim-php.icns */; }; + 4B26373D223A487B00021586 /* MacVim-h.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C820B95EC4005807BA /* MacVim-h.icns */; }; + 4B26373E223A487B00021586 /* MacVim-as.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433BB20B95EC3005807BA /* MacVim-as.icns */; }; + 4B26373F223A487B00021586 /* FileBrowserMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB409E71DD68CCC005F39A2 /* FileBrowserMenu.xib */; }; + 4B263740223A487B00021586 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA50C1CFF374B00673FDF /* MainMenu.xib */; }; + 4B263741223A487B00021586 /* MacVim-txt.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C320B95EC4005807BA /* MacVim-txt.icns */; }; + 4B263742223A487B00021586 /* MacVim-csfg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A620B95EC1005807BA /* MacVim-csfg.icns */; }; + 4B263743223A487B00021586 /* MacVim-fscript.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C520B95EC4005807BA /* MacVim-fscript.icns */; }; + 4B263744223A487B00021586 /* MacVim-erl.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D120B95EC5005807BA /* MacVim-erl.icns */; }; + 4B263745223A487B00021586 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B97E2CE1D33F53D00FC0660 /* MainWindow.xib */; }; + 4B263746223A487B00021586 /* markdown in Resources */ = {isa = PBXBuildFile; fileRef = 4B19BEFA1E110183007E823C /* markdown */; }; + 4B263747223A487B00021586 /* MacVim-patch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433C220B95EC4005807BA /* MacVim-patch.icns */; }; + 4B263748223A487B00021586 /* MacVim-xsl.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D820B95EC6005807BA /* MacVim-xsl.icns */; }; + 4B263749223A487B00021586 /* MacVim-f.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B220B95EC2005807BA /* MacVim-f.icns */; }; + 4B26374A223A487B00021586 /* MacVim-bash.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433AE20B95EC2005807BA /* MacVim-bash.icns */; }; + 4B26374B223A487B00021586 /* PrefWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B029F1C1D45E349004EE0D3 /* PrefWindow.xib */; }; + 4B26374C223A487B00021586 /* preview in Resources */ = {isa = PBXBuildFile; fileRef = 4B19BEFB1E110183007E823C /* preview */; }; + 4B26374D223A487B00021586 /* MacVim-vim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B320B95EC2005807BA /* MacVim-vim.icns */; }; + 4B26374E223A487B00021586 /* MacVim-py.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433B520B95EC3005807BA /* MacVim-py.icns */; }; + 4B26374F223A487B00021586 /* sparkle_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 4B3AC8931DB031C600AC5823 /* sparkle_pub.pem */; }; + 4B263750223A487B00021586 /* MacVim-log.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433AB20B95EC2005807BA /* MacVim-log.icns */; }; + 4B263751223A487B00021586 /* MacVim-dtd.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433D220B95EC5005807BA /* MacVim-dtd.icns */; }; + 4B263752223A487B00021586 /* MacVim-lisp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A420B95EC1005807BA /* MacVim-lisp.icns */; }; + 4B263753223A487B00021586 /* com.qvacua.VimR.vim in Resources */ = {isa = PBXBuildFile; fileRef = 1929BC6D45B7E14D4D75D4E6 /* com.qvacua.VimR.vim */; }; + 4B263755223A487B00021586 /* ShortcutRecorder.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BE34B822225BAC7002F57D3 /* ShortcutRecorder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263756223A487B00021586 /* MessagePack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5D02097705E00EC394A /* MessagePack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263757223A487B00021586 /* RxMsgpackRpc.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5CC20976F8900EC394A /* RxMsgpackRpc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263758223A487B00021586 /* CocoaFontAwesome.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C341FD2E2AA00DF95D1 /* CocoaFontAwesome.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263759223A487B00021586 /* CocoaMarkdown.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B26375A223A487B00021586 /* EonilFileSystemEvents.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C311FD2E2AA00DF95D1 /* EonilFileSystemEvents.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B26375B223A487B00021586 /* Socket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B0A1AA72120C35100F1E02F /* Socket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B26375C223A487B00021586 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C321FD2E2AA00DF95D1 /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B26375D223A487B00021586 /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C381FD2E2AB00DF95D1 /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B26375E223A487B00021586 /* RxMessagePort.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9E5E1D20990E08006455C3 /* RxMessagePort.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B26375F223A487B00021586 /* RxNeovimApi.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B17E54C209E3EA400265C1D /* RxNeovimApi.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263760223A487B00021586 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263761223A487B00021586 /* Swifter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9DF285209C8A8B00DF2AAD /* Swifter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263762223A487B00021586 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4B263763223A487B00021586 /* NvimView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4B37ADB91D6E471B00970D55 /* vimr in Resources */ = {isa = PBXBuildFile; fileRef = 4B37ADB81D6E471B00970D55 /* vimr */; }; 4B3965361DEB21300082D3C1 /* InnterToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3965351DEB21300082D3C1 /* InnterToolBar.swift */; }; 4B3AC8941DB031C600AC5823 /* sparkle_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 4B3AC8931DB031C600AC5823 /* sparkle_pub.pem */; }; @@ -250,6 +433,31 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 4B263754223A487B00021586 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 4B263755223A487B00021586 /* ShortcutRecorder.framework in Embed Frameworks */, + 4B263756223A487B00021586 /* MessagePack.framework in Embed Frameworks */, + 4B263757223A487B00021586 /* RxMsgpackRpc.framework in Embed Frameworks */, + 4B263758223A487B00021586 /* CocoaFontAwesome.framework in Embed Frameworks */, + 4B263759223A487B00021586 /* CocoaMarkdown.framework in Embed Frameworks */, + 4B26375A223A487B00021586 /* EonilFileSystemEvents.framework in Embed Frameworks */, + 4B26375B223A487B00021586 /* Socket.framework in Embed Frameworks */, + 4B26375C223A487B00021586 /* PureLayout.framework in Embed Frameworks */, + 4B26375D223A487B00021586 /* RxCocoa.framework in Embed Frameworks */, + 4B26375E223A487B00021586 /* RxMessagePort.framework in Embed Frameworks */, + 4B26375F223A487B00021586 /* RxNeovimApi.framework in Embed Frameworks */, + 4B263760223A487B00021586 /* RxSwift.framework in Embed Frameworks */, + 4B263761223A487B00021586 /* Swifter.framework in Embed Frameworks */, + 4B263762223A487B00021586 /* Sparkle.framework in Embed Frameworks */, + 4B263763223A487B00021586 /* NvimView.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 4B2A2BF01D02261F0074CE9A /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -388,6 +596,8 @@ 4B19BEFA1E110183007E823C /* markdown */ = {isa = PBXFileReference; lastKnownFileType = folder; path = markdown; sourceTree = ""; }; 4B19BEFB1E110183007E823C /* preview */ = {isa = PBXFileReference; lastKnownFileType = folder; path = preview; sourceTree = ""; }; 4B238BE01D3BF24200CBDD98 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; + 4B263767223A487B00021586 /* VimR-dev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VimR-dev.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B263768223A487B00021586 /* VimR.dev.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = VimR.dev.Info.plist; path = /Users/hat/Projects/vimr/VimR/VimR.dev.Info.plist; sourceTree = ""; }; 4B2A2C0D1D0353750074CE9A /* Bridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = ""; }; 4B37ADB81D6E471B00970D55 /* vimr */ = {isa = PBXFileReference; fileEncoding = 1; lastKnownFileType = text.script.python; path = vimr; sourceTree = ""; }; 4B3965351DEB21300082D3C1 /* InnterToolBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = InnterToolBar.swift; path = Workspace/InnterToolBar.swift; sourceTree = ""; }; @@ -490,6 +700,28 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 4B2636FC223A487B00021586 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 4B2636FD223A487B00021586 /* MessagePack.framework in Frameworks */, + 4B2636FE223A487B00021586 /* RxMsgpackRpc.framework in Frameworks */, + 4B2636FF223A487B00021586 /* EonilFileSystemEvents.framework in Frameworks */, + 4B263700223A487B00021586 /* PureLayout.framework in Frameworks */, + 4B263701223A487B00021586 /* Socket.framework in Frameworks */, + 4B263702223A487B00021586 /* CocoaMarkdown.framework in Frameworks */, + 4B263703223A487B00021586 /* CocoaFontAwesome.framework in Frameworks */, + 4B263704223A487B00021586 /* RxSwift.framework in Frameworks */, + 4B263705223A487B00021586 /* RxMessagePort.framework in Frameworks */, + 4B263706223A487B00021586 /* Sparkle.framework in Frameworks */, + 4B263707223A487B00021586 /* RxNeovimApi.framework in Frameworks */, + 4B263708223A487B00021586 /* Swifter.framework in Frameworks */, + 4B263709223A487B00021586 /* RxCocoa.framework in Frameworks */, + 4B26370A223A487B00021586 /* ShortcutRecorder.framework in Frameworks */, + 4B26370B223A487B00021586 /* NvimView.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4BEBA5021CFF374B00673FDF /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -865,6 +1097,7 @@ 4BEBA5171CFF374B00673FDF /* VimRTests */, 4B5012001EBA791000F76C46 /* Frameworks */, 4BEBA5061CFF374B00673FDF /* Products */, + 4B263768223A487B00021586 /* VimR.dev.Info.plist */, ); indentWidth = 2; sourceTree = ""; @@ -875,6 +1108,7 @@ children = ( 4BEBA5051CFF374B00673FDF /* VimR.app */, 4BEBA5141CFF374B00673FDF /* VimRTests.xctest */, + 4B263767223A487B00021586 /* VimR-dev.app */, ); name = Products; sourceTree = ""; @@ -930,6 +1164,25 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 4B2636A7223A487B00021586 /* VimR.dev */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4B263764223A487B00021586 /* Build configuration list for PBXNativeTarget "VimR.dev" */; + buildPhases = ( + 4B2636A8223A487B00021586 /* ShellScript */, + 4B2636A9223A487B00021586 /* Sources */, + 4B2636FC223A487B00021586 /* Frameworks */, + 4B26370C223A487B00021586 /* Resources */, + 4B263754223A487B00021586 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = VimR.dev; + productName = VimR; + productReference = 4B263767223A487B00021586 /* VimR-dev.app */; + productType = "com.apple.product-type.application"; + }; 4BEBA5041CFF374B00673FDF /* VimR */ = { isa = PBXNativeTarget; buildConfigurationList = 4BEBA51D1CFF374B00673FDF /* Build configuration list for PBXNativeTarget "VimR" */; @@ -1004,11 +1257,90 @@ targets = ( 4BEBA5041CFF374B00673FDF /* VimR */, 4BEBA5131CFF374B00673FDF /* VimRTests */, + 4B2636A7223A487B00021586 /* VimR.dev */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 4B26370C223A487B00021586 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4B26370D223A487B00021586 /* Credits.rtf in Resources */, + 4B26370E223A487B00021586 /* MacVim-xml.icns in Resources */, + 4B26370F223A487B00021586 /* MacVim-applescript.icns in Resources */, + 4B263710223A487B00021586 /* MacVim-wiki.icns in Resources */, + 4B263711223A487B00021586 /* MacVim-java.icns in Resources */, + 4B263712223A487B00021586 /* MacVim-rst.icns in Resources */, + 4B263713223A487B00021586 /* MacVim-cfg.icns in Resources */, + 4B263714223A487B00021586 /* MacVim-inc.icns in Resources */, + 4B263715223A487B00021586 /* MacVim-bsh.icns in Resources */, + 4B263716223A487B00021586 /* MacVim-perl.icns in Resources */, + 4B263717223A487B00021586 /* MacVim-vcf.icns in Resources */, + 4B263718223A487B00021586 /* MacVim-markdown.icns in Resources */, + 4B263719223A487B00021586 /* MacVim-vba.icns in Resources */, + 4B26371A223A487B00021586 /* MacVim-cs.icns in Resources */, + 4B26371B223A487B00021586 /* MacVim-gtd.icns in Resources */, + 4B26371C223A487B00021586 /* MacVim-js.icns in Resources */, + 4B26371D223A487B00021586 /* MacVim-tex.icns in Resources */, + 4B26371E223A487B00021586 /* MacVim-css.icns in Resources */, + 4B26371F223A487B00021586 /* MacVim-tsv.icns in Resources */, + 4B263720223A487B00021586 /* MacVim-asp.icns in Resources */, + 4B263721223A487B00021586 /* MacVim-plist.icns in Resources */, + 4B263722223A487B00021586 /* Assets.xcassets in Resources */, + 4B263723223A487B00021586 /* MacVim-rb.icns in Resources */, + 4B263724223A487B00021586 /* MacVim-ini.icns in Resources */, + 4B263725223A487B00021586 /* MacVim-yaml.icns in Resources */, + 4B263726223A487B00021586 /* MacVim-vb.icns in Resources */, + 4B263727223A487B00021586 /* MacVim-jsp.icns in Resources */, + 4B263728223A487B00021586 /* MacVim-html.icns in Resources */, + 4B263729223A487B00021586 /* MacVim-tcl.icns in Resources */, + 4B26372A223A487B00021586 /* MacVim-io.icns in Resources */, + 4B26372B223A487B00021586 /* OpenQuicklyWindow.xib in Resources */, + 4B26372C223A487B00021586 /* MacVim-csv.icns in Resources */, + 4B26372D223A487B00021586 /* MacVim-mm.icns in Resources */, + 4B26372E223A487B00021586 /* MacVim-bib.icns in Resources */, + 4B26372F223A487B00021586 /* MacVim-cpp.icns in Resources */, + 4B263730223A487B00021586 /* MacVim-ps.icns in Resources */, + 4B263731223A487B00021586 /* MacVim-sch.icns in Resources */, + 4B263732223A487B00021586 /* MacVim-dylan.icns in Resources */, + 4B263733223A487B00021586 /* MacVim-sql.icns in Resources */, + 4B263734223A487B00021586 /* MacVim-m.icns in Resources */, + 4B263735223A487B00021586 /* MacVim-hs.icns in Resources */, + 4B263736223A487B00021586 /* vimr in Resources */, + 4B263737223A487B00021586 /* MacVim-c.icns in Resources */, + 4B263738223A487B00021586 /* MacVim-cgi.icns in Resources */, + 4B263739223A487B00021586 /* MacVim-generic.icns in Resources */, + 4B26373A223A487B00021586 /* MacVim-properties.icns in Resources */, + 4B26373B223A487B00021586 /* MacVim-ics.icns in Resources */, + 4B26373C223A487B00021586 /* MacVim-php.icns in Resources */, + 4B26373D223A487B00021586 /* MacVim-h.icns in Resources */, + 4B26373E223A487B00021586 /* MacVim-as.icns in Resources */, + 4B26373F223A487B00021586 /* FileBrowserMenu.xib in Resources */, + 4B263740223A487B00021586 /* MainMenu.xib in Resources */, + 4B263741223A487B00021586 /* MacVim-txt.icns in Resources */, + 4B263742223A487B00021586 /* MacVim-csfg.icns in Resources */, + 4B263743223A487B00021586 /* MacVim-fscript.icns in Resources */, + 4B263744223A487B00021586 /* MacVim-erl.icns in Resources */, + 4B263745223A487B00021586 /* MainWindow.xib in Resources */, + 4B263746223A487B00021586 /* markdown in Resources */, + 4B263747223A487B00021586 /* MacVim-patch.icns in Resources */, + 4B263748223A487B00021586 /* MacVim-xsl.icns in Resources */, + 4B263749223A487B00021586 /* MacVim-f.icns in Resources */, + 4B26374A223A487B00021586 /* MacVim-bash.icns in Resources */, + 4B26374B223A487B00021586 /* PrefWindow.xib in Resources */, + 4B26374C223A487B00021586 /* preview in Resources */, + 4B26374D223A487B00021586 /* MacVim-vim.icns in Resources */, + 4B26374E223A487B00021586 /* MacVim-py.icns in Resources */, + 4B26374F223A487B00021586 /* sparkle_pub.pem in Resources */, + 4B263750223A487B00021586 /* MacVim-log.icns in Resources */, + 4B263751223A487B00021586 /* MacVim-dtd.icns in Resources */, + 4B263752223A487B00021586 /* MacVim-lisp.icns in Resources */, + 4B263753223A487B00021586 /* com.qvacua.VimR.vim in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4BEBA5031CFF374B00673FDF /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1112,9 +1444,111 @@ shellPath = /bin/sh; shellScript = "cp ${SRCROOT}/../Carthage/Checkouts/github-markdown-css/github-markdown.css ${SRCROOT}/VimR/markdown/"; }; + 4B2636A8223A487B00021586 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cp ${SRCROOT}/../Carthage/Checkouts/github-markdown-css/github-markdown.css ${SRCROOT}/VimR/markdown/"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 4B2636A9223A487B00021586 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4B2636AA223A487B00021586 /* WorkspaceToolButton.swift in Sources */, + 4B2636AB223A487B00021586 /* Application.swift in Sources */, + 4B2636AC223A487B00021586 /* Workspace.swift in Sources */, + 4B2636AD223A487B00021586 /* AppKitCommons.swift in Sources */, + 4B2636AE223A487B00021586 /* InnterToolBar.swift in Sources */, + 4B2636AF223A487B00021586 /* WorkspaceBar.swift in Sources */, + 4B2636B0223A487B00021586 /* RxSwiftCommons.swift in Sources */, + 4B2636B1223A487B00021586 /* SwiftCommons.swift in Sources */, + 4B2636B2223A487B00021586 /* AppDelegate.swift in Sources */, + 4B2636B3223A487B00021586 /* WorkspaceTool.swift in Sources */, + 4B2636B4223A487B00021586 /* FileItem.swift in Sources */, + 4B2636B5223A487B00021586 /* FileItemIgnorePattern.swift in Sources */, + 4B2636B6223A487B00021586 /* DictionaryErrors.swift in Sources */, + 4B2636B7223A487B00021586 /* FileUtils.swift in Sources */, + 4B2636B8223A487B00021586 /* Matcher.swift in Sources */, + 4B2636B9223A487B00021586 /* ScoredFileItem.swift in Sources */, + 4B2636BA223A487B00021586 /* Scorer.swift in Sources */, + 4B2636BB223A487B00021586 /* ProxyWorkspaceBar.swift in Sources */, + 4B2636BC223A487B00021586 /* FoundationCommons.swift in Sources */, + 4B2636BD223A487B00021586 /* NetUtils.m in Sources */, + 4B2636BE223A487B00021586 /* States.swift in Sources */, + 4B2636BF223A487B00021586 /* Context.swift in Sources */, + 4B2636C0223A487B00021586 /* AppDelegateReducer.swift in Sources */, + 4B2636C1223A487B00021586 /* UiRoot.swift in Sources */, + 4B2636C2223A487B00021586 /* UiRootReducer.swift in Sources */, + 4B2636C3223A487B00021586 /* MainWindowReducer.swift in Sources */, + 4B2636C4223A487B00021586 /* PreviewTool.swift in Sources */, + 4B2636C5223A487B00021586 /* PreviewReducer.swift in Sources */, + 4B2636C6223A487B00021586 /* PreviewMiddleware.swift in Sources */, + 4B2636C7223A487B00021586 /* HttpServerMiddleware.swift in Sources */, + 4B2636C8223A487B00021586 /* DictionaryEncoder.swift in Sources */, + 4B2636C9223A487B00021586 /* PreviewToolReducer.swift in Sources */, + 4B2636CA223A487B00021586 /* Types.swift in Sources */, + 4B2636CB223A487B00021586 /* OpenQuicklyReducer.swift in Sources */, + 4B2636CC223A487B00021586 /* FileMonitorReducer.swift in Sources */, + 4B2636CD223A487B00021586 /* FileMonitor.swift in Sources */, + 4B2636CE223A487B00021586 /* FileBrowserReducer.swift in Sources */, + 4B2636CF223A487B00021586 /* BufferList.swift in Sources */, + 4B2636D0223A487B00021586 /* BufferListReducer.swift in Sources */, + 4B2636D1223A487B00021586 /* PrefWindow.swift in Sources */, + 4B2636D2223A487B00021586 /* PrefPane.swift in Sources */, + 4B2636D3223A487B00021586 /* GeneralPref.swift in Sources */, + 4B2636D4223A487B00021586 /* PrefWindowReducer.swift in Sources */, + 4B2636D5223A487B00021586 /* GeneralPrefReducer.swift in Sources */, + 4B2636D6223A487B00021586 /* FileOutlineView.swift in Sources */, + 4B2636D7223A487B00021586 /* FileBrowser.swift in Sources */, + 4B2636D8223A487B00021586 /* AppearancePref.swift in Sources */, + 4B2636D9223A487B00021586 /* AdvencedPref.swift in Sources */, + 4B2636DA223A487B00021586 /* AppearancePrefReducer.swift in Sources */, + 4B2636DB223A487B00021586 /* OpenQuicklyWindow.swift in Sources */, + 4B2636DC223A487B00021586 /* OpenQuicklyFilterOperation.swift in Sources */, + 4B2636DD223A487B00021586 /* OpenQuicklyFileViewRow.swift in Sources */, + 4B2636DE223A487B00021586 /* PrefMiddleware.swift in Sources */, + 4B2636DF223A487B00021586 /* Debouncer.swift in Sources */, + 4B2636E0223A487B00021586 /* PreviewUtils.swift in Sources */, + 4B2636E1223A487B00021586 /* FileItemUtils.swift in Sources */, + 4B2636E2223A487B00021586 /* HtmlPreviewTool.swift in Sources */, + 4B2636E3223A487B00021586 /* HtmlPreviewToolReducer.swift in Sources */, + 4B2636E4223A487B00021586 /* AdvancedPrefReducer.swift in Sources */, + 4B2636E5223A487B00021586 /* ToolsPref.swift in Sources */, + 4B2636E6223A487B00021586 /* ToolsPrefReducer.swift in Sources */, + 4B2636E7223A487B00021586 /* PrefUtils.swift in Sources */, + 4B2636E8223A487B00021586 /* ThemedTableSubviews.swift in Sources */, + 4B2636E9223A487B00021586 /* ImageAndTextTableCell.swift in Sources */, + 4B2636EA223A487B00021586 /* Theme.swift in Sources */, + 4B2636EB223A487B00021586 /* DictionaryCodingKey.swift in Sources */, + 4B2636EC223A487B00021586 /* MainWindow+CustomTitle.swift in Sources */, + 4B2636ED223A487B00021586 /* MainWindow.swift in Sources */, + 4B2636EE223A487B00021586 /* DictionaryDecoder.swift in Sources */, + 4B2636EF223A487B00021586 /* MainWindow+Actions.swift in Sources */, + 4B2636F0223A487B00021586 /* MainWindow+Delegates.swift in Sources */, + 4B2636F1223A487B00021586 /* KeysPref.swift in Sources */, + 4B2636F2223A487B00021586 /* KeysPrefReducer.swift in Sources */, + 4B2636F3223A487B00021586 /* RxRedux.swift in Sources */, + 4B2636F4223A487B00021586 /* ShortcutsPref.swift in Sources */, + 4B2636F5223A487B00021586 /* ShortcutsTableSubviews.swift in Sources */, + 4B2636F6223A487B00021586 /* DefaultShortcuts.swift in Sources */, + 4B2636F7223A487B00021586 /* ShortcutItem.swift in Sources */, + 4B2636F8223A487B00021586 /* RpcEvents.swift in Sources */, + 4B2636F9223A487B00021586 /* RpcAppearanceEpic.swift in Sources */, + 4B2636FA223A487B00021586 /* OSLogCommons.swift in Sources */, + 4B2636FB223A487B00021586 /* Defs.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 4BEBA5011CFF374B00673FDF /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1299,6 +1733,44 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 4B263765223A487B00021586 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/../Carthage/Build/Mac", + ); + INFOPLIST_FILE = "$(SRCROOT)/VimR.dev.Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.VimR.dev; + PRODUCT_MODULE_NAME = VimR; + PRODUCT_NAME = "VimR-dev"; + SWIFT_OBJC_BRIDGING_HEADER = VimR/Bridge.h; + }; + name = Debug; + }; + 4B263766223A487B00021586 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/../Carthage/Build/Mac", + ); + INFOPLIST_FILE = "$(SRCROOT)/VimR.dev.Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.VimR.dev; + PRODUCT_MODULE_NAME = VimR; + PRODUCT_NAME = "VimR-dev"; + SWIFT_OBJC_BRIDGING_HEADER = VimR/Bridge.h; + }; + name = Release; + }; 4BEBA51B1CFF374B00673FDF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1476,6 +1948,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 4B263764223A487B00021586 /* Build configuration list for PBXNativeTarget "VimR.dev" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4B263765223A487B00021586 /* Debug */, + 4B263766223A487B00021586 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 4BEBA5001CFF374B00673FDF /* Build configuration list for PBXProject "VimR" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme new file mode 100644 index 00000000..fc0ff521 --- /dev/null +++ b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.dev.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c4d2eee44586781fc69d7ce670ebb487084c46ca Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 14:54:56 +0100 Subject: [PATCH 08/13] Correctly set the state of the draws parallel checkbox --- VimR/VimR/AdvencedPref.swift | 4 +++- resources/release-notes.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VimR/VimR/AdvencedPref.swift b/VimR/VimR/AdvencedPref.swift index 26165812..c1967eea 100644 --- a/VimR/VimR/AdvencedPref.swift +++ b/VimR/VimR/AdvencedPref.swift @@ -48,10 +48,12 @@ class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate { if self.useInteractiveZsh != state.mainWindowTemplate.useInteractiveZsh || self.useSnapshotUpdate != state.useSnapshotUpdate || self.useLiveResize != state.mainWindowTemplate.useLiveResize - { + || self.drawsParallel != state.mainWindowTemplate.drawsParallel { + self.useInteractiveZsh = state.mainWindowTemplate.useInteractiveZsh self.useSnapshotUpdate = state.useSnapshotUpdate self.useLiveResize = state.mainWindowTemplate.useLiveResize + self.drawsParallel = state.mainWindowTemplate.drawsParallel self.updateViews() } diff --git a/resources/release-notes.md b/resources/release-notes.md index e91b8b76..84600de2 100644 --- a/resources/release-notes.md +++ b/resources/release-notes.md @@ -1,6 +1,6 @@ # next -* ... +* Bugfix: The state of the "Use Concurrent Rendering" checkbox is not set correctly. # 0.26.5-308 From 51e1d366702aa77132269484c2023d54150c0316 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 15:21:00 +0100 Subject: [PATCH 09/13] Use a WKProcessPool --- VimR/VimR/Defs.swift | 3 +++ VimR/VimR/HtmlPreviewTool.swift | 1 + VimR/VimR/PreviewTool.swift | 1 + resources/release-notes.md | 1 + 4 files changed, 6 insertions(+) diff --git a/VimR/VimR/Defs.swift b/VimR/VimR/Defs.swift index ffa7c26b..0ea79b9f 100644 --- a/VimR/VimR/Defs.swift +++ b/VimR/VimR/Defs.swift @@ -4,6 +4,7 @@ */ import Foundation +import WebKit struct Defs { @@ -16,4 +17,6 @@ struct Defs { static let uiComponents = "ui-components" static let middleware = "middleware" } + + static let webViewProcessPool = WKProcessPool() } diff --git a/VimR/VimR/HtmlPreviewTool.swift b/VimR/VimR/HtmlPreviewTool.swift index 055f9451..432e1161 100644 --- a/VimR/VimR/HtmlPreviewTool.swift +++ b/VimR/VimR/HtmlPreviewTool.swift @@ -28,6 +28,7 @@ class HtmlPreviewTool: NSView, UiComponent, WKNavigationDelegate { self.uuid = state.uuid let configuration = WKWebViewConfiguration() + configuration.processPool = Defs.webViewProcessPool self.webview = WKWebView(frame: CGRect.zero, configuration: configuration) super.init(frame: .zero) diff --git a/VimR/VimR/PreviewTool.swift b/VimR/VimR/PreviewTool.swift index 67d33c81..6ff13e83 100644 --- a/VimR/VimR/PreviewTool.swift +++ b/VimR/VimR/PreviewTool.swift @@ -33,6 +33,7 @@ class PreviewTool: NSView, UiComponent, WKNavigationDelegate { let configuration = WKWebViewConfiguration() configuration.userContentController = self.userContentController + configuration.processPool = Defs.webViewProcessPool self.webview = WKWebView(frame: CGRect.zero, configuration: configuration) let refreshMenuItem = NSMenuItem(title: "Refresh Now", action: nil, keyEquivalent: "") diff --git a/resources/release-notes.md b/resources/release-notes.md index 84600de2..5c0fed4f 100644 --- a/resources/release-notes.md +++ b/resources/release-notes.md @@ -1,6 +1,7 @@ # next * Bugfix: The state of the "Use Concurrent Rendering" checkbox is not set correctly. +* Limit the number of "VimR Networking" processes. # 0.26.5-308 From 982d40e1865790e820feb38f875678568cda4cc1 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 16:31:35 +0100 Subject: [PATCH 10/13] Fix wrong assignment --- VimR/VimR/MainWindow.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VimR/VimR/MainWindow.swift b/VimR/VimR/MainWindow.swift index 3581b406..b542b06d 100644 --- a/VimR/VimR/MainWindow.swift +++ b/VimR/VimR/MainWindow.swift @@ -218,7 +218,7 @@ class MainWindow: NSObject, self.defaultFont = state.appearance.font self.linespacing = state.appearance.linespacing self.usesLigatures = state.appearance.usesLigatures - self.usesLigatures = state.drawsParallel + self.drawsParallel = state.drawsParallel self.editorPosition = state.preview.editorPosition self.previewPosition = state.preview.previewPosition From 1646d5059b224fa3ec14f60b806d0e188224b826 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 16:33:16 +0100 Subject: [PATCH 11/13] Turn on the ligatures by default --- VimR/VimR/MainWindow.swift | 2 +- VimR/VimR/States.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VimR/VimR/MainWindow.swift b/VimR/VimR/MainWindow.swift index b542b06d..dd87a51e 100644 --- a/VimR/VimR/MainWindow.swift +++ b/VimR/VimR/MainWindow.swift @@ -469,7 +469,7 @@ class MainWindow: NSObject, private var defaultFont = NvimView.defaultFont private var linespacing = NvimView.defaultLinespacing - private var usesLigatures = false + private var usesLigatures = true private var drawsParallel = false private var previewPosition = Marked(Position.beginning) diff --git a/VimR/VimR/States.swift b/VimR/VimR/States.swift index 10b051fa..18db2d3c 100644 --- a/VimR/VimR/States.swift +++ b/VimR/VimR/States.swift @@ -182,7 +182,7 @@ struct AppearanceState: Codable { var font = NSFont.userFixedPitchFont(ofSize: 13)! var linespacing: CGFloat = 1 - var usesLigatures = false + var usesLigatures = true var usesTheme = true var showsFileIcon = true From d226bfeff0a014e376b75c98b79ca7d43a295f36 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 16:56:42 +0100 Subject: [PATCH 12/13] Bump version: v0.26.6-309 --- NvimView/DrawerDev/Info.plist | 4 ++-- NvimView/DrawerPerf/Info.plist | 4 ++-- NvimView/NvimView.xcodeproj/project.pbxproj | 8 ++++---- NvimView/NvimView/Info.plist | 4 ++-- NvimView/NvimViewTests/Info.plist | 4 ++-- VimR/VimR.xcodeproj/project.pbxproj | 4 ++-- VimR/VimR/Info.plist | 4 ++-- VimR/VimRTests/Info.plist | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NvimView/DrawerDev/Info.plist b/NvimView/DrawerDev/Info.plist index bee28e39..ef95d63b 100644 --- a/NvimView/DrawerDev/Info.plist +++ b/NvimView/DrawerDev/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.26.5 + 0.26.6 CFBundleVersion - 308 + 309 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/NvimView/DrawerPerf/Info.plist b/NvimView/DrawerPerf/Info.plist index cb80e834..e06db928 100644 --- a/NvimView/DrawerPerf/Info.plist +++ b/NvimView/DrawerPerf/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.26.5 + 0.26.6 CFBundleVersion - 308 + 309 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/NvimView/NvimView.xcodeproj/project.pbxproj b/NvimView/NvimView.xcodeproj/project.pbxproj index d089365f..bdf649c2 100644 --- a/NvimView/NvimView.xcodeproj/project.pbxproj +++ b/NvimView/NvimView.xcodeproj/project.pbxproj @@ -940,7 +940,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 308; + CURRENT_PROJECT_VERSION = 309; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1002,7 +1002,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 308; + CURRENT_PROJECT_VERSION = 309; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1031,7 +1031,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 308; + DYLIB_CURRENT_VERSION = 309; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; FRAMEWORK_VERSION = A; @@ -1053,7 +1053,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 308; + DYLIB_CURRENT_VERSION = 309; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; FRAMEWORK_VERSION = A; diff --git a/NvimView/NvimView/Info.plist b/NvimView/NvimView/Info.plist index 0d33dc68..36cbffcb 100644 --- a/NvimView/NvimView/Info.plist +++ b/NvimView/NvimView/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.26.5 + 0.26.6 CFBundleVersion - 308 + 309 NSHumanReadableCopyright Copyright © 2017 Tae Won Ha. All rights reserved. NSPrincipalClass diff --git a/NvimView/NvimViewTests/Info.plist b/NvimView/NvimViewTests/Info.plist index a554c7dd..e0535634 100644 --- a/NvimView/NvimViewTests/Info.plist +++ b/NvimView/NvimViewTests/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.26.5 + 0.26.6 CFBundleVersion - 308 + 309 diff --git a/VimR/VimR.xcodeproj/project.pbxproj b/VimR/VimR.xcodeproj/project.pbxproj index 96a0b413..5f128140 100644 --- a/VimR/VimR.xcodeproj/project.pbxproj +++ b/VimR/VimR.xcodeproj/project.pbxproj @@ -1800,7 +1800,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 308; + CURRENT_PROJECT_VERSION = 309; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1858,7 +1858,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 308; + CURRENT_PROJECT_VERSION = 309; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/VimR/VimR/Info.plist b/VimR/VimR/Info.plist index ed17297e..2459b3ab 100644 --- a/VimR/VimR/Info.plist +++ b/VimR/VimR/Info.plist @@ -1224,7 +1224,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.26.5 + 0.26.6 CFBundleSignature ???? CFBundleURLTypes @@ -1241,7 +1241,7 @@ CFBundleVersion - 308 + 309 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/VimR/VimRTests/Info.plist b/VimR/VimRTests/Info.plist index 19470135..0583ef28 100644 --- a/VimR/VimRTests/Info.plist +++ b/VimR/VimRTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.26.5 + 0.26.6 CFBundleSignature ???? CFBundleVersion - 308 + 309 From 4dc34fa983db7b97b6ff82a356efeaccd4e8ed7d Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Thu, 14 Mar 2019 17:05:00 +0100 Subject: [PATCH 13/13] Bump appcast(s) to v0.26.6-309 --- appcast.xml | 20 ++++++++++---------- appcast_snapshot.xml | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/appcast.xml b/appcast.xml index 5d75dde3..0f4de8cf 100644 --- a/appcast.xml +++ b/appcast.xml @@ -7,23 +7,23 @@ Most recent changes with links to updates for VimR. en - v0.26.5-308 + v0.26.6-309 -
  • GH-458: Bugfix: Opening files by drag-n-dropping on VimR window does not work.
    • -
  • Bugfix: Crashes when some files are deleted in the cwd when closing.
    • +
  • Bugfix: The state of the "Use Concurrent Rendering" checkbox is not set correctly.
    • +
  • Limit the number of "VimR Networking" processes.
    • ]]>     - https://github.com/qvacua/vimr/releases/tag/v0.26.5-308 + https://github.com/qvacua/vimr/releases/tag/v0.26.6-309 - 2019-03-13T14:41:04.565089 + 2019-03-14T17:05:00.892722 10.10.0 -     diff --git a/appcast_snapshot.xml b/appcast_snapshot.xml index 5d75dde3..0f4de8cf 100644 --- a/appcast_snapshot.xml +++ b/appcast_snapshot.xml @@ -7,23 +7,23 @@ Most recent changes with links to updates for VimR. en - v0.26.5-308 + v0.26.6-309 -
  • GH-458: Bugfix: Opening files by drag-n-dropping on VimR window does not work.
    • -
  • Bugfix: Crashes when some files are deleted in the cwd when closing.
    • +
  • Bugfix: The state of the "Use Concurrent Rendering" checkbox is not set correctly.
    • +
  • Limit the number of "VimR Networking" processes.
    • ]]>     - https://github.com/qvacua/vimr/releases/tag/v0.26.5-308 + https://github.com/qvacua/vimr/releases/tag/v0.26.6-309 - 2019-03-13T14:41:04.565089 + 2019-03-14T17:05:00.892722 10.10.0 -