From 4ef2fd0f155b178ab503fb63a0c6e4126a03b301 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Sun, 3 Dec 2017 09:59:15 +0100 Subject: [PATCH] Restructure the project --- .gitmodules | 2 +- Brewfile | 5 +- Cartfile | 2 + Cartfile.private | 1 - .../MsgPackRpc/UnixDomainSocketConnection.m | 5 + NvimMsgPack.playground/Contents.swift | 2 +- .../NvimMsgPack.xcodeproj/project.pbxproj | 16 +- .../xcschemes/NvimMsgPack.xcscheme | 14 - .../NvimMsgPack/{Nvim.swift => NvimApi.swift} | 30 +- ...NvimMethods.swift => NvimApiMethods.swift} | 1730 ++++++++--------- {NeoVimServer => NvimView}/NeoVimMsgIds.h | 0 .../NvimServer}/CocoaCategories.h | 0 .../NvimServer}/CocoaCategories.m | 0 .../NvimServer}/DataWrapper.h | 0 .../NvimServer}/DataWrapper.m | 0 .../NvimServer}/Logging.h | 0 .../NvimServer}/NeoVimServer.h | 0 .../NvimServer}/NeoVimServer.m | 0 {NeoVimServer => NvimView/NvimServer}/main.m | 0 .../NvimServer}/server_globals.h | 0 .../NvimServer}/server_ui.m | 0 NvimView/NvimView.xcodeproj/project.pbxproj | 714 +++++++ .../xcschemes/NvimServer.xcscheme | 34 +- .../xcshareddata/xcschemes/NvimView.xcscheme | 37 +- .../NvimView}/CellAttributes.swift | 0 .../NvimView}/CocoaExtensions.swift | 0 .../NvimView}/ColorUtils.swift | 0 {SwiftNeoVim => NvimView/NvimView}/Grid.swift | 0 {SwiftNeoVim => NvimView/NvimView}/Info.plist | 10 +- .../NvimView}/InputTestView.swift | 0 .../NvimView}/KeyUtils.swift | 0 {VimR => NvimView/NvimView}/Logger.h | 0 .../NvimView}/Logger.swift | 0 .../NvimView}/MMCoreTextView.h | 0 .../NvimView}/MMCoreTextView.m | 0 .../NvimView}/NeoVimAgent.h | 0 .../NvimView}/NeoVimAgent.m | 2 +- .../NvimView}/NeoVimBuffer.h | 0 .../NvimView}/NeoVimBuffer.m | 0 .../NvimView}/NeoVimObjectsExtensions.swift | 0 .../NvimView}/NeoVimTab.h | 0 .../NvimView}/NeoVimTab.m | 0 .../NvimView}/NeoVimUiBridgeProtocol.h | 0 .../NvimView}/NeoVimUiBridgeProtocol.m | 0 .../NvimView}/NeoVimView+Api.swift | 18 +- .../NvimView}/NeoVimView+Dragging.swift | 0 .../NvimView}/NeoVimView+Draw.swift | 0 .../NvimView}/NeoVimView+Key.swift | 0 .../NvimView}/NeoVimView+MenuItems.swift | 0 .../NvimView}/NeoVimView+Mouse.swift | 0 .../NvimView}/NeoVimView+Resize.swift | 0 .../NvimView}/NeoVimView+TouchBar.swift | 2 +- .../NvimView}/NeoVimView+UiBridge.swift | 0 .../NvimView}/NeoVimView.swift | 4 +- .../NvimView}/NeoVimViewDelegate.swift | 0 .../NvimView}/NeoVimWindow.h | 0 .../NvimView}/NeoVimWindow.m | 0 NvimView/NvimView/NvimView.h | 26 + .../NvimView}/TextDrawer.h | 0 .../NvimView}/TextDrawer.m | 0 .../NvimView}/VIM.LICENSE | 0 local-dev.mk => NvimView/local-dev.mk | 0 local.mk => NvimView/local.mk | 1 - neovim => NvimView/neovim | 0 .../third-party}/libintl/include/libintl.h | 0 .../third-party}/libintl/lib/libintl.8.dylib | Bin .../third-party}/libintl/lib/libintl.a | Bin .../third-party}/libintl/lib/libintl.dylib | 0 README.md | 29 +- SwiftNeoVim/SwiftNeoVim.h | 22 - SwiftNeoVimTests/SwiftNeoVimTests.swift | 11 - ThemedWindow/AppDelegate.swift | 26 - .../AppIcon.appiconset/Contents.json | 58 - ThemedWindow/Base.lproj/Main.storyboard | 417 ---- ThemedWindow/Info.plist | 32 - ThemedWindow/ViewController.swift | 27 - ThemedWindow/WindowController.swift | 210 -- VimR-Workspace-Demo/AppDelegate.swift | 108 - .../AppIcon.appiconset/Contents.json | 58 - VimR-Workspace-Demo/Base.lproj/MainMenu.xib | 122 -- VimR-Workspace-Demo/Info.plist | 34 - .../xcschemes/NeoVimServer.xcscheme | 110 -- .../xcschemes/SwiftNeoVim.xcscheme | 143 -- .../xcshareddata/xcschemes/VimR.xcscheme | 159 -- VimR.xcworkspace/contents.xcworkspacedata | 9 +- .../MacNeovim}/AppDelegate.swift | 0 .../MacNeovim}/Application.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../MacNeovim}/Base.lproj/MainMenu.xib | 0 .../MacNeovim}/Base.lproj/NeoVimWindow.xib | 0 {MacNeovim => VimR/MacNeovim}/Info.plist | 0 .../MacNeovim}/NeoVimWindow.swift | 0 .../VimR.xcodeproj}/project.pbxproj | 1206 +----------- .../contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/MacNeovim.xcscheme | 0 .../xcshareddata/xcschemes/VimR.xcscheme | 34 +- .../xcshareddata/xcschemes/VimRTests.xcscheme | 0 VimR/{ => VimR}/AdvancedPrefReducer.swift | 0 VimR/{ => VimR}/AdvencedPref.swift | 0 VimR/{ => VimR}/AppDelegate.swift | 0 VimR/{ => VimR}/AppDelegateReducer.swift | 0 VimR/{ => VimR}/AppKitCommons.swift | 0 VimR/{ => VimR}/AppearancePref.swift | 0 VimR/{ => VimR}/AppearancePrefReducer.swift | 0 VimR/{ => VimR}/Application.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/icon_128x128.png | Bin .../AppIcon.appiconset/icon_128x128@2x.png | Bin .../AppIcon.appiconset/icon_16x16.png | Bin .../AppIcon.appiconset/icon_16x16@2x.png | Bin .../AppIcon.appiconset/icon_256x256.png | Bin .../AppIcon.appiconset/icon_256x256@2x.png | Bin .../AppIcon.appiconset/icon_32x32.png | Bin .../AppIcon.appiconset/icon_512x512.png | Bin VimR/{ => VimR}/Base.lproj/Credits.rtf | 0 .../{ => VimR}/Base.lproj/FileBrowserMenu.xib | 0 VimR/{ => VimR}/Base.lproj/MainMenu.xib | 0 VimR/{ => VimR}/Base.lproj/MainWindow.xib | 0 .../Base.lproj/OpenQuicklyWindow.xib | 0 VimR/{ => VimR}/Base.lproj/PrefWindow.xib | 0 VimR/{ => VimR}/Bridge.h | 2 +- VimR/{ => VimR}/Context.swift | 0 VimR/{ => VimR}/Debouncer.swift | 0 VimR/{ => VimR}/FileBrowser.swift | 0 VimR/{ => VimR}/FileBrowserReducer.swift | 0 VimR/{ => VimR}/FileItem.swift | 0 VimR/{ => VimR}/FileItemIgnorePattern.swift | 0 VimR/{ => VimR}/FileItemUtils.swift | 0 VimR/{ => VimR}/FileMonitor.swift | 0 VimR/{ => VimR}/FileMonitorReducer.swift | 0 VimR/{ => VimR}/FileOutlineView.swift | 2 +- VimR/{ => VimR}/FileUtils.swift | 0 VimR/{ => VimR}/FoundationCommons.swift | 0 VimR/{ => VimR}/GeneralPref.swift | 0 VimR/{ => VimR}/GeneralPrefReducer.swift | 0 VimR/{ => VimR}/HtmlPreviewTool.swift | 0 VimR/{ => VimR}/HtmlPreviewToolReducer.swift | 0 VimR/{ => VimR}/HttpServerService.swift | 0 VimR/{ => VimR}/ImageAndTextTableCell.swift | 0 VimR/{ => VimR}/Info.plist | 0 VimR/VimR/Logger.swift | 252 +++ VimR/{ => VimR}/MainWindow+Actions.swift | 0 VimR/{ => VimR}/MainWindow+CustomTitle.swift | 0 VimR/{ => VimR}/MainWindow+Delegates.swift | 0 VimR/{ => VimR}/MainWindow.swift | 2 +- VimR/{ => VimR}/MainWindowReducer.swift | 0 VimR/{ => VimR}/Matcher.swift | 0 VimR/{ => VimR}/NetUtils.h | 0 VimR/{ => VimR}/NetUtils.m | 0 VimR/{ => VimR}/OpenQuicklyFileViewRow.swift | 0 .../OpenQuicklyFilterOperation.swift | 0 VimR/{ => VimR}/OpenQuicklyReducer.swift | 0 VimR/{ => VimR}/OpenQuicklyWindow.swift | 0 VimR/{ => VimR}/OpenedFileList.swift | 2 +- VimR/{ => VimR}/OpenedFileListReducer.swift | 0 .../Pref128ToCurrentConverter.swift | 0 VimR/{ => VimR}/PrefPane.swift | 0 VimR/{ => VimR}/PrefService.swift | 0 VimR/{ => VimR}/PrefUtils.swift | 2 +- VimR/{ => VimR}/PrefWindow.swift | 0 VimR/{ => VimR}/PrefWindowReducer.swift | 0 VimR/{ => VimR}/PreviewReducer.swift | 0 VimR/{ => VimR}/PreviewService.swift | 0 VimR/{ => VimR}/PreviewTool.swift | 0 VimR/{ => VimR}/PreviewToolReducer.swift | 0 VimR/{ => VimR}/PreviewUtils.swift | 0 VimR/{ => VimR}/RxSwiftCommons.swift | 0 VimR/{ => VimR}/ScoredFileItem.swift | 0 VimR/{ => VimR}/Scorer.swift | 0 VimR/{ => VimR}/SerializableStates.swift | 0 VimR/{ => VimR}/States.swift | 0 VimR/{ => VimR}/SwiftCommons.swift | 0 VimR/{ => VimR}/Theme.swift | 2 +- VimR/{ => VimR}/ThemedTableSubviews.swift | 2 +- VimR/{ => VimR}/ToolsPref.swift | 0 VimR/{ => VimR}/ToolsPrefReducer.swift | 0 VimR/{ => VimR}/Types.swift | 0 VimR/{ => VimR}/UiRoot.swift | 0 VimR/{ => VimR}/UiRootReducer.swift | 0 VimR/{ => VimR}/Workspace/InnterToolBar.swift | 0 .../Workspace/ProxyWorkspaceBar.swift | 0 VimR/{ => VimR}/Workspace/Workspace.swift | 0 VimR/{ => VimR}/Workspace/WorkspaceBar.swift | 0 VimR/{ => VimR}/Workspace/WorkspaceTool.swift | 0 .../Workspace/WorkspaceToolButton.swift | 0 VimR/{ => VimR}/markdown/github-markdown.css | 0 VimR/{ => VimR}/markdown/template.html | 0 VimR/{ => VimR}/preview/base.css | 0 VimR/{ => VimR}/preview/empty.html | 0 VimR/{ => VimR}/preview/error.html | 0 VimR/{ => VimR}/preview/save-first.html | 0 VimR/{ => VimR}/preview/select-first.html | 0 VimR/{ => VimR}/sparkle_pub.pem | 0 VimR/{ => VimR}/vimr | 0 .../VimRTests}/ArrayCommonsTest.swift | 0 .../VimRTests}/DictionaryCommonsTest.swift | 0 .../FileItemIgnorePatternTest.swift | 0 .../VimRTests}/FileUtilsTest.swift | 0 .../VimRTests}/Info.plist | 0 .../VimRTests}/MatcherTests.swift | 0 .../VimRTests}/PrefUtilsTest.swift | 0 .../VimRTests}/RxSwiftCommonsTest.swift | 0 .../VimRTests}/ScorerTest.swift | 0 .../VimRTests}/StringCommonsTest.swift | 0 .../VimRTests}/UrlCommonsTest.swift | 0 .../resources/FileUtilsTest/a1/a1-file1 | 0 .../resources/FileUtilsTest/a1/a2/a1-a2-file1 | 0 .../resources/FileUtilsTest/b1/b1-file1 | 0 .../resources/UrlCommonsTest/.dot-hidden-file | 0 .../UrlCommonsTest/dummy.rtfd/TXT.rtf | 0 VimRTests/Info.plist | 24 - bin/build.sh | 3 + bin/build_deps.sh | 4 + bin/build_libnvim.sh | 9 +- bin/build_travis.sh | 9 +- bin/build_vimr.sh | 10 +- bin/clean_old_builds.sh | 4 +- bin/commit_and_push_tags.sh | 4 +- bin/generate_source.py | 7 +- bin/set_new_versions.sh | 11 + 220 files changed, 2137 insertions(+), 3684 deletions(-) delete mode 100644 Cartfile.private rename NvimMsgPack/NvimMsgPack/{Nvim.swift => NvimApi.swift} (85%) rename NvimMsgPack/NvimMsgPack/{NvimMethods.swift => NvimApiMethods.swift} (67%) rename {NeoVimServer => NvimView}/NeoVimMsgIds.h (100%) rename {NeoVimServer => NvimView/NvimServer}/CocoaCategories.h (100%) rename {NeoVimServer => NvimView/NvimServer}/CocoaCategories.m (100%) rename {NeoVimServer => NvimView/NvimServer}/DataWrapper.h (100%) rename {NeoVimServer => NvimView/NvimServer}/DataWrapper.m (100%) rename {NeoVimServer => NvimView/NvimServer}/Logging.h (100%) rename {NeoVimServer => NvimView/NvimServer}/NeoVimServer.h (100%) rename {NeoVimServer => NvimView/NvimServer}/NeoVimServer.m (100%) rename {NeoVimServer => NvimView/NvimServer}/main.m (100%) rename {NeoVimServer => NvimView/NvimServer}/server_globals.h (100%) rename {NeoVimServer => NvimView/NvimServer}/server_ui.m (100%) create mode 100644 NvimView/NvimView.xcodeproj/project.pbxproj rename VimR.xcodeproj/xcshareddata/xcschemes/ThemedWindow.xcscheme => NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimServer.xcscheme (73%) rename VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVimTests.xcscheme => NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimView.xcscheme (68%) rename {SwiftNeoVim => NvimView/NvimView}/CellAttributes.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/CocoaExtensions.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/ColorUtils.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/Grid.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/Info.plist (78%) rename {SwiftNeoVim => NvimView/NvimView}/InputTestView.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/KeyUtils.swift (100%) rename {VimR => NvimView/NvimView}/Logger.h (100%) rename {SwiftNeoVim => NvimView/NvimView}/Logger.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/MMCoreTextView.h (100%) rename {SwiftNeoVim => NvimView/NvimView}/MMCoreTextView.m (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimAgent.h (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimAgent.m (99%) rename {NeoVimServer => NvimView/NvimView}/NeoVimBuffer.h (100%) rename {NeoVimServer => NvimView/NvimView}/NeoVimBuffer.m (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimObjectsExtensions.swift (100%) rename {NeoVimServer => NvimView/NvimView}/NeoVimTab.h (100%) rename {NeoVimServer => NvimView/NvimView}/NeoVimTab.m (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimUiBridgeProtocol.h (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimUiBridgeProtocol.m (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+Api.swift (90%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+Dragging.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+Draw.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+Key.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+MenuItems.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+Mouse.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+Resize.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+TouchBar.swift (97%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView+UiBridge.swift (100%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimView.swift (99%) rename {SwiftNeoVim => NvimView/NvimView}/NeoVimViewDelegate.swift (100%) rename {NeoVimServer => NvimView/NvimView}/NeoVimWindow.h (100%) rename {NeoVimServer => NvimView/NvimView}/NeoVimWindow.m (100%) create mode 100644 NvimView/NvimView/NvimView.h rename {SwiftNeoVim => NvimView/NvimView}/TextDrawer.h (100%) rename {SwiftNeoVim => NvimView/NvimView}/TextDrawer.m (100%) rename {SwiftNeoVim => NvimView/NvimView}/VIM.LICENSE (100%) rename local-dev.mk => NvimView/local-dev.mk (100%) rename local.mk => NvimView/local.mk (99%) rename neovim => NvimView/neovim (100%) rename {third-party => NvimView/third-party}/libintl/include/libintl.h (100%) rename {third-party => NvimView/third-party}/libintl/lib/libintl.8.dylib (100%) rename {third-party => NvimView/third-party}/libintl/lib/libintl.a (100%) rename {third-party => NvimView/third-party}/libintl/lib/libintl.dylib (100%) delete mode 100644 SwiftNeoVim/SwiftNeoVim.h delete mode 100644 SwiftNeoVimTests/SwiftNeoVimTests.swift delete mode 100644 ThemedWindow/AppDelegate.swift delete mode 100644 ThemedWindow/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 ThemedWindow/Base.lproj/Main.storyboard delete mode 100644 ThemedWindow/Info.plist delete mode 100644 ThemedWindow/ViewController.swift delete mode 100644 ThemedWindow/WindowController.swift delete mode 100644 VimR-Workspace-Demo/AppDelegate.swift delete mode 100644 VimR-Workspace-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 VimR-Workspace-Demo/Base.lproj/MainMenu.xib delete mode 100644 VimR-Workspace-Demo/Info.plist delete mode 100644 VimR.xcodeproj/xcshareddata/xcschemes/NeoVimServer.xcscheme delete mode 100644 VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVim.xcscheme delete mode 100644 VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme rename {MacNeovim => VimR/MacNeovim}/AppDelegate.swift (100%) rename {MacNeovim => VimR/MacNeovim}/Application.swift (100%) rename {MacNeovim => VimR/MacNeovim}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {MacNeovim => VimR/MacNeovim}/Base.lproj/MainMenu.xib (100%) rename {MacNeovim => VimR/MacNeovim}/Base.lproj/NeoVimWindow.xib (100%) rename {MacNeovim => VimR/MacNeovim}/Info.plist (100%) rename {MacNeovim => VimR/MacNeovim}/NeoVimWindow.swift (100%) rename {VimR.xcodeproj => VimR/VimR.xcodeproj}/project.pbxproj (52%) rename {VimR.xcodeproj => VimR/VimR.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {VimR.xcodeproj => VimR/VimR.xcodeproj}/xcshareddata/xcschemes/MacNeovim.xcscheme (100%) rename VimR.xcodeproj/xcshareddata/xcschemes/VimR-Workspace-Demo.xcscheme => VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme (73%) rename {VimR.xcodeproj => VimR/VimR.xcodeproj}/xcshareddata/xcschemes/VimRTests.xcscheme (100%) rename VimR/{ => VimR}/AdvancedPrefReducer.swift (100%) rename VimR/{ => VimR}/AdvencedPref.swift (100%) rename VimR/{ => VimR}/AppDelegate.swift (100%) rename VimR/{ => VimR}/AppDelegateReducer.swift (100%) rename VimR/{ => VimR}/AppKitCommons.swift (100%) rename VimR/{ => VimR}/AppearancePref.swift (100%) rename VimR/{ => VimR}/AppearancePrefReducer.swift (100%) rename VimR/{ => VimR}/Application.swift (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_128x128.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_16x16.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_256x256.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_32x32.png (100%) rename VimR/{ => VimR}/Assets.xcassets/AppIcon.appiconset/icon_512x512.png (100%) rename VimR/{ => VimR}/Base.lproj/Credits.rtf (100%) rename VimR/{ => VimR}/Base.lproj/FileBrowserMenu.xib (100%) rename VimR/{ => VimR}/Base.lproj/MainMenu.xib (100%) rename VimR/{ => VimR}/Base.lproj/MainWindow.xib (100%) rename VimR/{ => VimR}/Base.lproj/OpenQuicklyWindow.xib (100%) rename VimR/{ => VimR}/Base.lproj/PrefWindow.xib (100%) rename VimR/{ => VimR}/Bridge.h (71%) rename VimR/{ => VimR}/Context.swift (100%) rename VimR/{ => VimR}/Debouncer.swift (100%) rename VimR/{ => VimR}/FileBrowser.swift (100%) rename VimR/{ => VimR}/FileBrowserReducer.swift (100%) rename VimR/{ => VimR}/FileItem.swift (100%) rename VimR/{ => VimR}/FileItemIgnorePattern.swift (100%) rename VimR/{ => VimR}/FileItemUtils.swift (100%) rename VimR/{ => VimR}/FileMonitor.swift (100%) rename VimR/{ => VimR}/FileMonitorReducer.swift (100%) rename VimR/{ => VimR}/FileOutlineView.swift (99%) rename VimR/{ => VimR}/FileUtils.swift (100%) rename VimR/{ => VimR}/FoundationCommons.swift (100%) rename VimR/{ => VimR}/GeneralPref.swift (100%) rename VimR/{ => VimR}/GeneralPrefReducer.swift (100%) rename VimR/{ => VimR}/HtmlPreviewTool.swift (100%) rename VimR/{ => VimR}/HtmlPreviewToolReducer.swift (100%) rename VimR/{ => VimR}/HttpServerService.swift (100%) rename VimR/{ => VimR}/ImageAndTextTableCell.swift (100%) rename VimR/{ => VimR}/Info.plist (100%) create mode 100644 VimR/VimR/Logger.swift rename VimR/{ => VimR}/MainWindow+Actions.swift (100%) rename VimR/{ => VimR}/MainWindow+CustomTitle.swift (100%) rename VimR/{ => VimR}/MainWindow+Delegates.swift (100%) rename VimR/{ => VimR}/MainWindow.swift (99%) rename VimR/{ => VimR}/MainWindowReducer.swift (100%) rename VimR/{ => VimR}/Matcher.swift (100%) rename VimR/{ => VimR}/NetUtils.h (100%) rename VimR/{ => VimR}/NetUtils.m (100%) rename VimR/{ => VimR}/OpenQuicklyFileViewRow.swift (100%) rename VimR/{ => VimR}/OpenQuicklyFilterOperation.swift (100%) rename VimR/{ => VimR}/OpenQuicklyReducer.swift (100%) rename VimR/{ => VimR}/OpenQuicklyWindow.swift (100%) rename VimR/{ => VimR}/OpenedFileList.swift (99%) rename VimR/{ => VimR}/OpenedFileListReducer.swift (100%) rename VimR/{ => VimR}/Pref128ToCurrentConverter.swift (100%) rename VimR/{ => VimR}/PrefPane.swift (100%) rename VimR/{ => VimR}/PrefService.swift (100%) rename VimR/{ => VimR}/PrefUtils.swift (99%) rename VimR/{ => VimR}/PrefWindow.swift (100%) rename VimR/{ => VimR}/PrefWindowReducer.swift (100%) rename VimR/{ => VimR}/PreviewReducer.swift (100%) rename VimR/{ => VimR}/PreviewService.swift (100%) rename VimR/{ => VimR}/PreviewTool.swift (100%) rename VimR/{ => VimR}/PreviewToolReducer.swift (100%) rename VimR/{ => VimR}/PreviewUtils.swift (100%) rename VimR/{ => VimR}/RxSwiftCommons.swift (100%) rename VimR/{ => VimR}/ScoredFileItem.swift (100%) rename VimR/{ => VimR}/Scorer.swift (100%) rename VimR/{ => VimR}/SerializableStates.swift (100%) rename VimR/{ => VimR}/States.swift (100%) rename VimR/{ => VimR}/SwiftCommons.swift (100%) rename VimR/{ => VimR}/Theme.swift (98%) rename VimR/{ => VimR}/ThemedTableSubviews.swift (99%) rename VimR/{ => VimR}/ToolsPref.swift (100%) rename VimR/{ => VimR}/ToolsPrefReducer.swift (100%) rename VimR/{ => VimR}/Types.swift (100%) rename VimR/{ => VimR}/UiRoot.swift (100%) rename VimR/{ => VimR}/UiRootReducer.swift (100%) rename VimR/{ => VimR}/Workspace/InnterToolBar.swift (100%) rename VimR/{ => VimR}/Workspace/ProxyWorkspaceBar.swift (100%) rename VimR/{ => VimR}/Workspace/Workspace.swift (100%) rename VimR/{ => VimR}/Workspace/WorkspaceBar.swift (100%) rename VimR/{ => VimR}/Workspace/WorkspaceTool.swift (100%) rename VimR/{ => VimR}/Workspace/WorkspaceToolButton.swift (100%) rename VimR/{ => VimR}/markdown/github-markdown.css (100%) rename VimR/{ => VimR}/markdown/template.html (100%) rename VimR/{ => VimR}/preview/base.css (100%) rename VimR/{ => VimR}/preview/empty.html (100%) rename VimR/{ => VimR}/preview/error.html (100%) rename VimR/{ => VimR}/preview/save-first.html (100%) rename VimR/{ => VimR}/preview/select-first.html (100%) rename VimR/{ => VimR}/sparkle_pub.pem (100%) rename VimR/{ => VimR}/vimr (100%) rename {VimRTests => VimR/VimRTests}/ArrayCommonsTest.swift (100%) rename {VimRTests => VimR/VimRTests}/DictionaryCommonsTest.swift (100%) rename {VimRTests => VimR/VimRTests}/FileItemIgnorePatternTest.swift (100%) rename {VimRTests => VimR/VimRTests}/FileUtilsTest.swift (100%) rename {SwiftNeoVimTests => VimR/VimRTests}/Info.plist (100%) rename {VimRTests => VimR/VimRTests}/MatcherTests.swift (100%) rename {VimRTests => VimR/VimRTests}/PrefUtilsTest.swift (100%) rename {VimRTests => VimR/VimRTests}/RxSwiftCommonsTest.swift (100%) rename {VimRTests => VimR/VimRTests}/ScorerTest.swift (100%) rename {VimRTests => VimR/VimRTests}/StringCommonsTest.swift (100%) rename {VimRTests => VimR/VimRTests}/UrlCommonsTest.swift (100%) rename {VimRTests => VimR/VimRTests}/resources/FileUtilsTest/a1/a1-file1 (100%) rename {VimRTests => VimR/VimRTests}/resources/FileUtilsTest/a1/a2/a1-a2-file1 (100%) rename {VimRTests => VimR/VimRTests}/resources/FileUtilsTest/b1/b1-file1 (100%) rename {VimRTests => VimR/VimRTests}/resources/UrlCommonsTest/.dot-hidden-file (100%) rename {VimRTests => VimR/VimRTests}/resources/UrlCommonsTest/dummy.rtfd/TXT.rtf (100%) delete mode 100644 VimRTests/Info.plist diff --git a/.gitmodules b/.gitmodules index f9ceecf0..a9a670c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "neovim"] - path = neovim + path = NvimView/neovim url = https://github.com/qvacua/neovim.git diff --git a/Brewfile b/Brewfile index 3191eff2..0e9cb531 100644 --- a/Brewfile +++ b/Brewfile @@ -1,5 +1,8 @@ brew 'carthage' +brew 'gnu-sed' brew 'libtool' brew 'automake' +brew 'cmake' +brew 'pkg-config' +brew 'gettext' brew 'ninja' -brew 'gnu-sed' diff --git a/Cartfile b/Cartfile index c1a79f0a..3c7cc118 100644 --- a/Cartfile +++ b/Cartfile @@ -8,3 +8,5 @@ github "sindresorhus/github-markdown-css" == 2.9.0 github "httpswift/swifter" == 1.3.3 github "a2/MessagePack.swift" == 3.0.0 github "antitypical/Result" == 3.2.4 + +github "Quick/Nimble" == 7.0.1 diff --git a/Cartfile.private b/Cartfile.private deleted file mode 100644 index 82d5620c..00000000 --- a/Cartfile.private +++ /dev/null @@ -1 +0,0 @@ -github "Quick/Nimble" == 7.0.1 diff --git a/MsgPackRpc/MsgPackRpc/UnixDomainSocketConnection.m b/MsgPackRpc/MsgPackRpc/UnixDomainSocketConnection.m index 18fd9a35..8333f7ab 100644 --- a/MsgPackRpc/MsgPackRpc/UnixDomainSocketConnection.m +++ b/MsgPackRpc/MsgPackRpc/UnixDomainSocketConnection.m @@ -140,6 +140,11 @@ static void socket_call_back( } - (CFSocketError)writeData:(NSData *)data { + if (!CFSocketIsValid(_socket)) { + NSLog(@"Socket invalid, but trying to send %@", data); + return kCFSocketError; + } + return CFSocketSendData(_socket, NULL, (__bridge CFDataRef) data, _timeout); } diff --git a/NvimMsgPack.playground/Contents.swift b/NvimMsgPack.playground/Contents.swift index d282db66..317a822a 100644 --- a/NvimMsgPack.playground/Contents.swift +++ b/NvimMsgPack.playground/Contents.swift @@ -5,7 +5,7 @@ import NvimMsgPack // Start nvim as follows: // $ NVIM_LISTEN_ADDRESS=/tmp/nvim.sock nvim $SOME_FILES -guard let nvim = Nvim(at: "/tmp/nvim.sock") else { +guard let nvim = NvimApi(at: "/tmp/nvim.sock") else { preconditionFailure("Could not connect to nvim") } diff --git a/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj b/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj index 59b498e7..33568646 100644 --- a/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj +++ b/NvimMsgPack/NvimMsgPack.xcodeproj/project.pbxproj @@ -9,8 +9,8 @@ /* Begin PBXBuildFile section */ 4B9E33711FCB475600E0C4BC /* NvimMsgPack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B9E336F1FCB475600E0C4BC /* NvimMsgPack.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B9E33781FCB476D00E0C4BC /* MsgPackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9E33791FCB476D00E0C4BC /* MsgPackRpc.framework */; }; - 4B9E337C1FCB47B300E0C4BC /* Nvim.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9E337A1FCB47B300E0C4BC /* Nvim.swift */; }; - 4B9E337D1FCB47B300E0C4BC /* NvimMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9E337B1FCB47B300E0C4BC /* NvimMethods.swift */; }; + 4B9E337C1FCB47B300E0C4BC /* NvimApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9E337A1FCB47B300E0C4BC /* NvimApi.swift */; }; + 4B9E337D1FCB47B300E0C4BC /* NvimApiMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9E337B1FCB47B300E0C4BC /* NvimApiMethods.swift */; }; 4B9E33831FCB47F900E0C4BC /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B9E337F1FCB47F900E0C4BC /* Info.plist */; }; 4B9E33841FCB47F900E0C4BC /* Result.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B9E33801FCB47F900E0C4BC /* Result.h */; }; 4B9E33851FCB47F900E0C4BC /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9E33811FCB47F900E0C4BC /* Result.swift */; }; @@ -22,8 +22,8 @@ 4B9E336F1FCB475600E0C4BC /* NvimMsgPack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NvimMsgPack.h; sourceTree = ""; }; 4B9E33701FCB475600E0C4BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4B9E33791FCB476D00E0C4BC /* MsgPackRpc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MsgPackRpc.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B9E337A1FCB47B300E0C4BC /* Nvim.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Nvim.swift; sourceTree = ""; }; - 4B9E337B1FCB47B300E0C4BC /* NvimMethods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NvimMethods.swift; sourceTree = ""; }; + 4B9E337A1FCB47B300E0C4BC /* NvimApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NvimApi.swift; sourceTree = ""; }; + 4B9E337B1FCB47B300E0C4BC /* NvimApiMethods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NvimApiMethods.swift; sourceTree = ""; }; 4B9E337F1FCB47F900E0C4BC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4B9E33801FCB47F900E0C4BC /* Result.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Result.h; sourceTree = ""; }; 4B9E33811FCB47F900E0C4BC /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = ""; }; @@ -63,8 +63,8 @@ isa = PBXGroup; children = ( 4B9E336F1FCB475600E0C4BC /* NvimMsgPack.h */, - 4B9E337A1FCB47B300E0C4BC /* Nvim.swift */, - 4B9E337B1FCB47B300E0C4BC /* NvimMethods.swift */, + 4B9E337A1FCB47B300E0C4BC /* NvimApi.swift */, + 4B9E337B1FCB47B300E0C4BC /* NvimApiMethods.swift */, 4B9E337E1FCB47F900E0C4BC /* Result */, 4B9E33701FCB475600E0C4BC /* Info.plist */, ); @@ -177,8 +177,8 @@ files = ( 4B9E33861FCB47F900E0C4BC /* ResultProtocol.swift in Sources */, 4B9E33851FCB47F900E0C4BC /* Result.swift in Sources */, - 4B9E337D1FCB47B300E0C4BC /* NvimMethods.swift in Sources */, - 4B9E337C1FCB47B300E0C4BC /* Nvim.swift in Sources */, + 4B9E337D1FCB47B300E0C4BC /* NvimApiMethods.swift in Sources */, + 4B9E337C1FCB47B300E0C4BC /* NvimApi.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/NvimMsgPack/NvimMsgPack.xcodeproj/xcshareddata/xcschemes/NvimMsgPack.xcscheme b/NvimMsgPack/NvimMsgPack.xcodeproj/xcshareddata/xcschemes/NvimMsgPack.xcscheme index 09e660c9..6ef32bd2 100644 --- a/NvimMsgPack/NvimMsgPack.xcodeproj/xcshareddata/xcschemes/NvimMsgPack.xcscheme +++ b/NvimMsgPack/NvimMsgPack.xcodeproj/xcshareddata/xcschemes/NvimMsgPack.xcscheme @@ -6,20 +6,6 @@ parallelizeBuildables = "YES" buildImplicitDependencies = "YES"> - - - - = Result + public typealias Response = Result - public var notificationCallback: ((MsgPackRpc.MessageType, String, [Nvim.Value]) -> Void)? { + public var notificationCallback: ((MsgPackRpc.MessageType, String, [NvimApi.Value]) -> Void)? { get { return self.session.notificationCallback } @@ -91,7 +91,7 @@ public class Nvim { } } - public var unknownMessageCallback: (([Nvim.Value]) -> Void)? { + public var unknownMessageCallback: (([NvimApi.Value]) -> Void)? { get { return self.session.unknownMessageCallback } @@ -101,7 +101,7 @@ public class Nvim { } } - public var errorCallback: ((Nvim.Value) -> Void)? { + public var errorCallback: ((NvimApi.Value) -> Void)? { get { return self.session.errorCallback } @@ -113,7 +113,7 @@ public class Nvim { public class Session { - var notificationCallback: ((MsgPackRpc.MessageType, String, [Nvim.Value]) -> Void)? { + var notificationCallback: ((MsgPackRpc.MessageType, String, [NvimApi.Value]) -> Void)? { get { return self.connection.notificationCallback } @@ -123,7 +123,7 @@ public class Nvim { } } - var unknownMessageCallback: (([Nvim.Value]) -> Void)? { + var unknownMessageCallback: (([NvimApi.Value]) -> Void)? { get { return self.connection.unknownMessageCallback } @@ -133,7 +133,7 @@ public class Nvim { } } - var errorCallback: ((Nvim.Value) -> Void)? { + var errorCallback: ((NvimApi.Value) -> Void)? { get { return self.connection.errorCallback } @@ -161,7 +161,7 @@ public class Nvim { public func rpc(method: String, params: [MsgPackRpc.Value], - expectsReturnValue: Bool) -> Result { + expectsReturnValue: Bool) -> Result { let msgid = locked(with: self.nextMsgidLock) { () -> UInt32 in let msgid = self.nextMsgid @@ -176,7 +176,7 @@ public class Nvim { expectsReturnValue: expectsReturnValue) guard response.error.isNil else { - return .failure(Nvim.Error(response.error)) + return .failure(NvimApi.Error(response.error)) } return .success(response.result) @@ -215,17 +215,17 @@ public class Nvim { } @discardableResult - public func checkBlocked(_ fn: () -> Nvim.Response) -> Nvim.Response { + public func checkBlocked(_ fn: () -> NvimApi.Response) -> NvimApi.Response { if self.getMode().value?.dictionaryValue?[.string("blocked")] == .bool(true) { - return Nvim.Response.failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked.")) + return NvimApi.Response.failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked.")) } return fn() } public func rpc(method: String, - params: [Nvim.Value], - expectsReturnValue: Bool = true) -> Nvim.Response { + params: [NvimApi.Value], + expectsReturnValue: Bool = true) -> NvimApi.Response { return self.session.rpc(method: method, params: params, expectsReturnValue: expectsReturnValue) } diff --git a/NvimMsgPack/NvimMsgPack/NvimMethods.swift b/NvimMsgPack/NvimMsgPack/NvimApiMethods.swift similarity index 67% rename from NvimMsgPack/NvimMsgPack/NvimMethods.swift rename to NvimMsgPack/NvimMsgPack/NvimApiMethods.swift index d87c3f4e..91300a9d 100644 --- a/NvimMsgPack/NvimMsgPack/NvimMethods.swift +++ b/NvimMsgPack/NvimMsgPack/NvimApiMethods.swift @@ -3,10 +3,10 @@ import MsgPackRpc -public extension Nvim.Error { +public extension NvimApi.Error { public enum ErrorType: Int { - + case exception = 0 case validation = 1 case blocked @@ -14,80 +14,80 @@ public extension Nvim.Error { } } -public extension Nvim { +public extension NvimApi { public func bufLineCount( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), ] let response = self.rpc(method: "nvim_buf_line_count", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } public func bufGetLines( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, start: Int, end: Int, strict_indexing: Bool, checkBlocked: Bool = true - ) -> Nvim.Response<[String]> { - + ) -> NvimApi.Response<[String]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .int(Int64(start)), .int(Int64(end)), .bool(strict_indexing), ] let response = self.rpc(method: "nvim_buf_get_lines", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in v.stringValue })) else { - return .failure(Nvim.Error("Error converting result to \([String].self)")) + return .failure(NvimApi.Error("Error converting result to \([String].self)")) } - + return .success(result) } @discardableResult public func bufSetLines( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, start: Int, end: Int, strict_indexing: Bool, replacement: [String], expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .int(Int64(start)), .int(Int64(end)), @@ -95,316 +95,316 @@ public extension Nvim { .array(replacement.map { .string($0) }), ] let response = self.rpc(method: "nvim_buf_set_lines", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func bufGetVar( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), ] let response = self.rpc(method: "nvim_buf_get_var", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func bufGetChangedtick( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), ] let response = self.rpc(method: "nvim_buf_get_changedtick", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } public func bufGetKeymap( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, mode: String, checkBlocked: Bool = true - ) -> Nvim.Response<[Nvim.Value]> { - + ) -> NvimApi.Response<[NvimApi.Value]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(mode), ] let response = self.rpc(method: "nvim_buf_get_keymap", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in Optional(v) })) else { - return .failure(Nvim.Error("Error converting result to \([Nvim.Value].self)")) + return .failure(NvimApi.Error("Error converting result to \([NvimApi.Value].self)")) } - + return .success(result) } @discardableResult public func bufSetVar( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), value, ] let response = self.rpc(method: "nvim_buf_set_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @discardableResult public func bufDelVar( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), ] let response = self.rpc(method: "nvim_buf_del_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func bufGetOption( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), ] let response = self.rpc(method: "nvim_buf_get_option", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @discardableResult public func bufSetOption( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), value, ] let response = self.rpc(method: "nvim_buf_set_option", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func bufGetName( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), ] let response = self.rpc(method: "nvim_buf_get_name", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.stringValue) else { - return .failure(Nvim.Error("Error converting result to \(String.self)")) + return .failure(NvimApi.Error("Error converting result to \(String.self)")) } - + return .success(result) } @discardableResult public func bufSetName( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), ] let response = self.rpc(method: "nvim_buf_set_name", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func bufIsValid( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), ] let response = self.rpc(method: "nvim_buf_is_valid", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.boolValue) else { - return .failure(Nvim.Error("Error converting result to \(Bool.self)")) + return .failure(NvimApi.Error("Error converting result to \(Bool.self)")) } - + return .success(result) } public func bufGetMark( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, name: String, checkBlocked: Bool = true - ) -> Nvim.Response<[Int]> { - + ) -> NvimApi.Response<[Int]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .string(name), ] let response = self.rpc(method: "nvim_buf_get_mark", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in (v.integerValue == nil ? nil : Int(v.integerValue!)) })) else { - return .failure(Nvim.Error("Error converting result to \([Int].self)")) + return .failure(NvimApi.Error("Error converting result to \([Int].self)")) } - + return .success(result) } public func bufAddHighlight( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, src_id: Int, hl_group: String, line: Int, col_start: Int, col_end: Int, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .int(Int64(src_id)), .string(hl_group), @@ -413,223 +413,223 @@ public extension Nvim { .int(Int64(col_end)), ] let response = self.rpc(method: "nvim_buf_add_highlight", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } @discardableResult public func bufClearHighlight( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, src_id: Int, line_start: Int, line_end: Int, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), .int(Int64(src_id)), .int(Int64(line_start)), .int(Int64(line_end)), ] let response = self.rpc(method: "nvim_buf_clear_highlight", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func tabpageListWins( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, checkBlocked: Bool = true - ) -> Nvim.Response<[Nvim.Window]> { - + ) -> NvimApi.Response<[NvimApi.Window]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), ] let response = self.rpc(method: "nvim_tabpage_list_wins", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (value.arrayValue?.flatMap({ v in Nvim.Window(v) })) else { - return .failure(Nvim.Error("Error converting result to \([Nvim.Window].self)")) + + guard let result = (value.arrayValue?.flatMap({ v in NvimApi.Window(v) })) else { + return .failure(NvimApi.Error("Error converting result to \([NvimApi.Window].self)")) } - + return .success(result) } public func tabpageGetVar( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), .string(name), ] let response = self.rpc(method: "nvim_tabpage_get_var", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @discardableResult public func tabpageSetVar( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), .string(name), value, ] let response = self.rpc(method: "nvim_tabpage_set_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @discardableResult public func tabpageDelVar( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, name: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), .string(name), ] let response = self.rpc(method: "nvim_tabpage_del_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func tabpageGetWin( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), ] let response = self.rpc(method: "nvim_tabpage_get_win", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (Nvim.Window(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Window.self)")) + + guard let result = (NvimApi.Window(value)) else { + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Window.self)")) } - + return .success(result) } public func tabpageGetNumber( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), ] let response = self.rpc(method: "nvim_tabpage_get_number", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } public func tabpageIsValid( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), ] let response = self.rpc(method: "nvim_tabpage_is_valid", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.boolValue) else { - return .failure(Nvim.Error("Error converting result to \(Bool.self)")) + return .failure(NvimApi.Error("Error converting result to \(Bool.self)")) } - + return .success(result) } @@ -637,26 +637,26 @@ public extension Nvim { public func uiAttach( width: Int, height: Int, - options: Nvim.Value, + options: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(width)), .int(Int64(height)), options, ] let response = self.rpc(method: "nvim_ui_attach", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -664,21 +664,21 @@ public extension Nvim { public func uiDetach( expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_ui_detach", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -688,47 +688,47 @@ public extension Nvim { height: Int, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(width)), .int(Int64(height)), ] let response = self.rpc(method: "nvim_ui_try_resize", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @discardableResult public func uiSetOption( name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), value, ] let response = self.rpc(method: "nvim_ui_set_option", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -737,21 +737,21 @@ public extension Nvim { command: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(command), ] let response = self.rpc(method: "nvim_command", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -759,26 +759,26 @@ public extension Nvim { name: String, rgb: Bool, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), .bool(rgb), ] let response = self.rpc(method: "nvim_get_hl_by_name", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @@ -786,26 +786,26 @@ public extension Nvim { hl_id: Int, rgb: Bool, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(hl_id)), .bool(rgb), ] let response = self.rpc(method: "nvim_get_hl_by_id", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @@ -816,48 +816,48 @@ public extension Nvim { escape_csi: Bool, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(keys), .string(mode), .bool(escape_csi), ] let response = self.rpc(method: "nvim_feedkeys", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func input( keys: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(keys), ] let response = self.rpc(method: "nvim_input", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } @@ -867,181 +867,181 @@ public extension Nvim { do_lt: Bool, special: Bool, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(str), .bool(from_part), .bool(do_lt), .bool(special), ] let response = self.rpc(method: "nvim_replace_termcodes", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.stringValue) else { - return .failure(Nvim.Error("Error converting result to \(String.self)")) + return .failure(NvimApi.Error("Error converting result to \(String.self)")) } - + return .success(result) } public func commandOutput( str: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(str), ] let response = self.rpc(method: "nvim_command_output", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.stringValue) else { - return .failure(Nvim.Error("Error converting result to \(String.self)")) + return .failure(NvimApi.Error("Error converting result to \(String.self)")) } - + return .success(result) } public func eval( expr: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(expr), ] let response = self.rpc(method: "nvim_eval", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func callFunction( fname: String, - args: Nvim.Value, + args: NvimApi.Value, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(fname), args, ] let response = self.rpc(method: "nvim_call_function", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func executeLua( code: String, - args: Nvim.Value, + args: NvimApi.Value, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(code), args, ] let response = self.rpc(method: "nvim_execute_lua", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func strwidth( text: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(text), ] let response = self.rpc(method: "nvim_strwidth", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } public func listRuntimePaths( checkBlocked: Bool = true - ) -> Nvim.Response<[String]> { - + ) -> NvimApi.Response<[String]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_list_runtime_paths", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in v.stringValue })) else { - return .failure(Nvim.Error("Error converting result to \([String].self)")) + return .failure(NvimApi.Error("Error converting result to \([String].self)")) } - + return .success(result) } @@ -1050,45 +1050,45 @@ public extension Nvim { dir: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(dir), ] let response = self.rpc(method: "nvim_set_current_dir", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func getCurrentLine( checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_current_line", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.stringValue) else { - return .failure(Nvim.Error("Error converting result to \(String.self)")) + return .failure(NvimApi.Error("Error converting result to \(String.self)")) } - + return .success(result) } @@ -1097,21 +1097,21 @@ public extension Nvim { line: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(line), ] let response = self.rpc(method: "nvim_set_current_line", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1119,71 +1119,71 @@ public extension Nvim { public func delCurrentLine( expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_del_current_line", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func getVar( name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), ] let response = self.rpc(method: "nvim_get_var", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @discardableResult public func setVar( name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), value, ] let response = self.rpc(method: "nvim_set_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1192,96 +1192,96 @@ public extension Nvim { name: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), ] let response = self.rpc(method: "nvim_del_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func getVvar( name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), ] let response = self.rpc(method: "nvim_get_vvar", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func getOption( name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), ] let response = self.rpc(method: "nvim_get_option", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @discardableResult public func setOption( name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), value, ] let response = self.rpc(method: "nvim_set_option", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1290,21 +1290,21 @@ public extension Nvim { str: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(str), ] let response = self.rpc(method: "nvim_out_write", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1313,21 +1313,21 @@ public extension Nvim { str: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(str), ] let response = self.rpc(method: "nvim_err_write", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1336,234 +1336,234 @@ public extension Nvim { str: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(str), ] let response = self.rpc(method: "nvim_err_writeln", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func listBufs( checkBlocked: Bool = true - ) -> Nvim.Response<[Nvim.Buffer]> { - + ) -> NvimApi.Response<[NvimApi.Buffer]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_list_bufs", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (value.arrayValue?.flatMap({ v in Nvim.Buffer(v) })) else { - return .failure(Nvim.Error("Error converting result to \([Nvim.Buffer].self)")) + + guard let result = (value.arrayValue?.flatMap({ v in NvimApi.Buffer(v) })) else { + return .failure(NvimApi.Error("Error converting result to \([NvimApi.Buffer].self)")) } - + return .success(result) } public func getCurrentBuf( checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_current_buf", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (Nvim.Buffer(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Buffer.self)")) + + guard let result = (NvimApi.Buffer(value)) else { + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Buffer.self)")) } - + return .success(result) } @discardableResult public func setCurrentBuf( - buffer: Nvim.Buffer, + buffer: NvimApi.Buffer, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(buffer.handle)), ] let response = self.rpc(method: "nvim_set_current_buf", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func listWins( checkBlocked: Bool = true - ) -> Nvim.Response<[Nvim.Window]> { - + ) -> NvimApi.Response<[NvimApi.Window]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_list_wins", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (value.arrayValue?.flatMap({ v in Nvim.Window(v) })) else { - return .failure(Nvim.Error("Error converting result to \([Nvim.Window].self)")) + + guard let result = (value.arrayValue?.flatMap({ v in NvimApi.Window(v) })) else { + return .failure(NvimApi.Error("Error converting result to \([NvimApi.Window].self)")) } - + return .success(result) } public func getCurrentWin( checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_current_win", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (Nvim.Window(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Window.self)")) + + guard let result = (NvimApi.Window(value)) else { + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Window.self)")) } - + return .success(result) } @discardableResult public func setCurrentWin( - window: Nvim.Window, + window: NvimApi.Window, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_set_current_win", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func listTabpages( checkBlocked: Bool = true - ) -> Nvim.Response<[Nvim.Tabpage]> { - + ) -> NvimApi.Response<[NvimApi.Tabpage]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_list_tabpages", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (value.arrayValue?.flatMap({ v in Nvim.Tabpage(v) })) else { - return .failure(Nvim.Error("Error converting result to \([Nvim.Tabpage].self)")) + + guard let result = (value.arrayValue?.flatMap({ v in NvimApi.Tabpage(v) })) else { + return .failure(NvimApi.Error("Error converting result to \([NvimApi.Tabpage].self)")) } - + return .success(result) } public func getCurrentTabpage( checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_current_tabpage", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (Nvim.Tabpage(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Tabpage.self)")) + + guard let result = (NvimApi.Tabpage(value)) else { + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Tabpage.self)")) } - + return .success(result) } @discardableResult public func setCurrentTabpage( - tabpage: Nvim.Tabpage, + tabpage: NvimApi.Tabpage, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(tabpage.handle)), ] let response = self.rpc(method: "nvim_set_current_tabpage", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1572,21 +1572,21 @@ public extension Nvim { event: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(event), ] let response = self.rpc(method: "nvim_subscribe", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @@ -1595,579 +1595,579 @@ public extension Nvim { event: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(event), ] let response = self.rpc(method: "nvim_unsubscribe", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func getColorByName( name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(name), ] let response = self.rpc(method: "nvim_get_color_by_name", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } public func getColorMap( checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_color_map", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func getMode( - ) -> Nvim.Response { - - let params: [Nvim.Value] = [ - + ) -> NvimApi.Response { + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_mode", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func getKeymap( mode: String, checkBlocked: Bool = true - ) -> Nvim.Response<[Nvim.Value]> { - + ) -> NvimApi.Response<[NvimApi.Value]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .string(mode), ] let response = self.rpc(method: "nvim_get_keymap", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in Optional(v) })) else { - return .failure(Nvim.Error("Error converting result to \([Nvim.Value].self)")) + return .failure(NvimApi.Error("Error converting result to \([NvimApi.Value].self)")) } - + return .success(result) } public func getApiInfo( checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ - + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ + ] let response = self.rpc(method: "nvim_get_api_info", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func callAtomic( - calls: Nvim.Value, + calls: NvimApi.Value, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ calls, ] let response = self.rpc(method: "nvim_call_atomic", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } public func winGetBuf( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_buf", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (Nvim.Buffer(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Buffer.self)")) + + guard let result = (NvimApi.Buffer(value)) else { + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Buffer.self)")) } - + return .success(result) } public func winGetCursor( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response<[Int]> { - + ) -> NvimApi.Response<[Int]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_cursor", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in (v.integerValue == nil ? nil : Int(v.integerValue!)) })) else { - return .failure(Nvim.Error("Error converting result to \([Int].self)")) + return .failure(NvimApi.Error("Error converting result to \([Int].self)")) } - + return .success(result) } @discardableResult public func winSetCursor( - window: Nvim.Window, + window: NvimApi.Window, pos: [Int], expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .array(pos.map { .int(Int64($0)) }), ] let response = self.rpc(method: "nvim_win_set_cursor", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func winGetHeight( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_height", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } @discardableResult public func winSetHeight( - window: Nvim.Window, + window: NvimApi.Window, height: Int, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .int(Int64(height)), ] let response = self.rpc(method: "nvim_win_set_height", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func winGetWidth( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_width", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } @discardableResult public func winSetWidth( - window: Nvim.Window, + window: NvimApi.Window, width: Int, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .int(Int64(width)), ] let response = self.rpc(method: "nvim_win_set_width", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func winGetVar( - window: Nvim.Window, + window: NvimApi.Window, name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .string(name), ] let response = self.rpc(method: "nvim_win_get_var", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @discardableResult public func winSetVar( - window: Nvim.Window, + window: NvimApi.Window, name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .string(name), value, ] let response = self.rpc(method: "nvim_win_set_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } @discardableResult public func winDelVar( - window: Nvim.Window, + window: NvimApi.Window, name: String, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .string(name), ] let response = self.rpc(method: "nvim_win_del_var", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func winGetOption( - window: Nvim.Window, + window: NvimApi.Window, name: String, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .string(name), ] let response = self.rpc(method: "nvim_win_get_option", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (Optional(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Value.self)")) + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Value.self)")) } - + return .success(result) } @discardableResult public func winSetOption( - window: Nvim.Window, + window: NvimApi.Window, name: String, - value: Nvim.Value, + value: NvimApi.Value, expectsReturnValue: Bool = true, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if expectsReturnValue && checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), .string(name), value, ] let response = self.rpc(method: "nvim_win_set_option", params: params, expectsReturnValue: expectsReturnValue) - + if let error = response.error { return .failure(error) } - + return .success(()) } public func winGetPosition( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response<[Int]> { - + ) -> NvimApi.Response<[Int]> { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_position", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.arrayValue?.flatMap({ v in (v.integerValue == nil ? nil : Int(v.integerValue!)) })) else { - return .failure(Nvim.Error("Error converting result to \([Int].self)")) + return .failure(NvimApi.Error("Error converting result to \([Int].self)")) } - + return .success(result) } public func winGetTabpage( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_tabpage", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - - guard let result = (Nvim.Tabpage(value)) else { - return .failure(Nvim.Error("Error converting result to \(Nvim.Tabpage.self)")) + + guard let result = (NvimApi.Tabpage(value)) else { + return .failure(NvimApi.Error("Error converting result to \(NvimApi.Tabpage.self)")) } - + return .success(result) } public func winGetNumber( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_get_number", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = ((value.integerValue == nil ? nil : Int(value.integerValue!))) else { - return .failure(Nvim.Error("Error converting result to \(Int.self)")) + return .failure(NvimApi.Error("Error converting result to \(Int.self)")) } - + return .success(result) } public func winIsValid( - window: Nvim.Window, + window: NvimApi.Window, checkBlocked: Bool = true - ) -> Nvim.Response { - + ) -> NvimApi.Response { + if checkBlocked && self.getMode().value?.dictionaryValue?[.string("blocking")]?.boolValue == true { - return .failure(Nvim.Error(type: .blocked, message: "Nvim is currently blocked")) - } - - let params: [Nvim.Value] = [ + return .failure(NvimApi.Error(type: .blocked, message: "Nvim is currently blocked")) + } + + let params: [NvimApi.Value] = [ .int(Int64(window.handle)), ] let response = self.rpc(method: "nvim_win_is_valid", params: params, expectsReturnValue: true) - + guard let value = response.value else { return .failure(response.error!) } - + guard let result = (value.boolValue) else { - return .failure(Nvim.Error("Error converting result to \(Bool.self)")) + return .failure(NvimApi.Error("Error converting result to \(Bool.self)")) } - + return .success(result) } } -extension Nvim.Buffer { +extension NvimApi.Buffer { - init?(_ value: Nvim.Value) { + init?(_ value: NvimApi.Value) { guard let (type, data) = value.extendedValue else { return nil } @@ -2184,9 +2184,9 @@ extension Nvim.Buffer { } } -extension Nvim.Window { +extension NvimApi.Window { - init?(_ value: Nvim.Value) { + init?(_ value: NvimApi.Value) { guard let (type, data) = value.extendedValue else { return nil } @@ -2203,9 +2203,9 @@ extension Nvim.Window { } } -extension Nvim.Tabpage { +extension NvimApi.Tabpage { - init?(_ value: Nvim.Value) { + init?(_ value: NvimApi.Value) { guard let (type, data) = value.extendedValue else { return nil } diff --git a/NeoVimServer/NeoVimMsgIds.h b/NvimView/NeoVimMsgIds.h similarity index 100% rename from NeoVimServer/NeoVimMsgIds.h rename to NvimView/NeoVimMsgIds.h diff --git a/NeoVimServer/CocoaCategories.h b/NvimView/NvimServer/CocoaCategories.h similarity index 100% rename from NeoVimServer/CocoaCategories.h rename to NvimView/NvimServer/CocoaCategories.h diff --git a/NeoVimServer/CocoaCategories.m b/NvimView/NvimServer/CocoaCategories.m similarity index 100% rename from NeoVimServer/CocoaCategories.m rename to NvimView/NvimServer/CocoaCategories.m diff --git a/NeoVimServer/DataWrapper.h b/NvimView/NvimServer/DataWrapper.h similarity index 100% rename from NeoVimServer/DataWrapper.h rename to NvimView/NvimServer/DataWrapper.h diff --git a/NeoVimServer/DataWrapper.m b/NvimView/NvimServer/DataWrapper.m similarity index 100% rename from NeoVimServer/DataWrapper.m rename to NvimView/NvimServer/DataWrapper.m diff --git a/NeoVimServer/Logging.h b/NvimView/NvimServer/Logging.h similarity index 100% rename from NeoVimServer/Logging.h rename to NvimView/NvimServer/Logging.h diff --git a/NeoVimServer/NeoVimServer.h b/NvimView/NvimServer/NeoVimServer.h similarity index 100% rename from NeoVimServer/NeoVimServer.h rename to NvimView/NvimServer/NeoVimServer.h diff --git a/NeoVimServer/NeoVimServer.m b/NvimView/NvimServer/NeoVimServer.m similarity index 100% rename from NeoVimServer/NeoVimServer.m rename to NvimView/NvimServer/NeoVimServer.m diff --git a/NeoVimServer/main.m b/NvimView/NvimServer/main.m similarity index 100% rename from NeoVimServer/main.m rename to NvimView/NvimServer/main.m diff --git a/NeoVimServer/server_globals.h b/NvimView/NvimServer/server_globals.h similarity index 100% rename from NeoVimServer/server_globals.h rename to NvimView/NvimServer/server_globals.h diff --git a/NeoVimServer/server_ui.m b/NvimView/NvimServer/server_ui.m similarity index 100% rename from NeoVimServer/server_ui.m rename to NvimView/NvimServer/server_ui.m diff --git a/NvimView/NvimView.xcodeproj/project.pbxproj b/NvimView/NvimView.xcodeproj/project.pbxproj new file mode 100644 index 00000000..28db0330 --- /dev/null +++ b/NvimView/NvimView.xcodeproj/project.pbxproj @@ -0,0 +1,714 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 48; + objects = { + +/* Begin PBXBuildFile section */ + 4B90F02D1FD2AFAE008A39E0 /* NeoVimUiBridgeProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F00F1FD2AFAC008A39E0 /* NeoVimUiBridgeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B90F02E1FD2AFAE008A39E0 /* NeoVimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0101FD2AFAC008A39E0 /* NeoVimView.swift */; }; + 4B90F02F1FD2AFAE008A39E0 /* NeoVimView+Resize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0111FD2AFAC008A39E0 /* NeoVimView+Resize.swift */; }; + 4B90F0301FD2AFAE008A39E0 /* KeyUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0121FD2AFAC008A39E0 /* KeyUtils.swift */; }; + 4B90F0311FD2AFAE008A39E0 /* NeoVimAutoCommandEvent.generated.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0131FD2AFAC008A39E0 /* NeoVimAutoCommandEvent.generated.m */; }; + 4B90F0321FD2AFAE008A39E0 /* NeoVimView+Dragging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0141FD2AFAC008A39E0 /* NeoVimView+Dragging.swift */; }; + 4B90F0331FD2AFAE008A39E0 /* NeoVimAutoCommandEvent.generated.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F0151FD2AFAC008A39E0 /* NeoVimAutoCommandEvent.generated.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B90F0341FD2AFAE008A39E0 /* CocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0161FD2AFAC008A39E0 /* CocoaExtensions.swift */; }; + 4B90F0351FD2AFAE008A39E0 /* NeoVimView+Mouse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0171FD2AFAC008A39E0 /* NeoVimView+Mouse.swift */; }; + 4B90F0361FD2AFAE008A39E0 /* NeoVimViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0181FD2AFAC008A39E0 /* NeoVimViewDelegate.swift */; }; + 4B90F0371FD2AFAE008A39E0 /* NeoVimAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F0191FD2AFAC008A39E0 /* NeoVimAgent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B90F0381FD2AFAE008A39E0 /* ColorUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F01A1FD2AFAC008A39E0 /* ColorUtils.swift */; }; + 4B90F0391FD2AFAE008A39E0 /* NeoVimView+Api.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F01B1FD2AFAC008A39E0 /* NeoVimView+Api.swift */; }; + 4B90F03A1FD2AFAE008A39E0 /* NeoVimView+Key.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F01C1FD2AFAC008A39E0 /* NeoVimView+Key.swift */; }; + 4B90F03B1FD2AFAE008A39E0 /* NeoVimObjectsExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F01D1FD2AFAC008A39E0 /* NeoVimObjectsExtensions.swift */; }; + 4B90F03C1FD2AFAE008A39E0 /* NeoVimView+TouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F01E1FD2AFAC008A39E0 /* NeoVimView+TouchBar.swift */; }; + 4B90F03E1FD2AFAE008A39E0 /* MMCoreTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0201FD2AFAD008A39E0 /* MMCoreTextView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 4B90F03F1FD2AFAE008A39E0 /* NeoVimView+Draw.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0211FD2AFAD008A39E0 /* NeoVimView+Draw.swift */; }; + 4B90F0401FD2AFAE008A39E0 /* TextDrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0221FD2AFAD008A39E0 /* TextDrawer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 4B90F0411FD2AFAE008A39E0 /* TextDrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F0231FD2AFAD008A39E0 /* TextDrawer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4B90F0421FD2AFAE008A39E0 /* NeoVimView+UiBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0241FD2AFAD008A39E0 /* NeoVimView+UiBridge.swift */; }; + 4B90F0431FD2AFAE008A39E0 /* NeoVimView+MenuItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0251FD2AFAD008A39E0 /* NeoVimView+MenuItems.swift */; }; + 4B90F0441FD2AFAE008A39E0 /* MMCoreTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F0261FD2AFAD008A39E0 /* MMCoreTextView.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 4B90F0451FD2AFAE008A39E0 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0271FD2AFAD008A39E0 /* Logger.swift */; }; + 4B90F0461FD2AFAE008A39E0 /* Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0281FD2AFAD008A39E0 /* Grid.swift */; }; + 4B90F0481FD2AFAE008A39E0 /* NeoVimUiBridgeProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F02A1FD2AFAD008A39E0 /* NeoVimUiBridgeProtocol.m */; }; + 4B90F0491FD2AFAE008A39E0 /* CellAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F02B1FD2AFAD008A39E0 /* CellAttributes.swift */; }; + 4B90F04A1FD2AFAE008A39E0 /* NeoVimAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F02C1FD2AFAE008A39E0 /* NeoVimAgent.m */; }; + 4B90F0521FD2AFD3008A39E0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0511FD2AFD3008A39E0 /* main.m */; }; + 4B90F0661FD2AFF7008A39E0 /* server_ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0561FD2AFF7008A39E0 /* server_ui.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 4B90F0681FD2AFF7008A39E0 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F05A1FD2AFF7008A39E0 /* CocoaCategories.m */; }; + 4B90F06A1FD2AFF7008A39E0 /* DataWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0611FD2AFF7008A39E0 /* DataWrapper.m */; }; + 4B90F06B1FD2AFF7008A39E0 /* NeoVimServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0641FD2AFF7008A39E0 /* NeoVimServer.m */; }; + 4B90F0701FD2B9F1008A39E0 /* MsgPackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90F0721FD2B9F1008A39E0 /* MsgPackRpc.framework */; }; + 4B90F0711FD2B9F1008A39E0 /* NvimMsgPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90F0731FD2B9F1008A39E0 /* NvimMsgPack.framework */; }; + 4B90F0781FD2BA7B008A39E0 /* Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F0771FD2BA7B008A39E0 /* Logger.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 4B90F07B1FD30650008A39E0 /* NeoVimMsgIds.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B90F0591FD2AFF7008A39E0 /* NeoVimMsgIds.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 4BE45C081FD2D4E3005C0A95 /* NvimServer in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B90F04F1FD2AFD3008A39E0 /* NvimServer */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BE45C0C1FD2DA49005C0A95 /* runtime in Resources */ = {isa = PBXBuildFile; fileRef = 4BE45C0B1FD2DA49005C0A95 /* runtime */; }; + 4BE45C161FD2DB53005C0A95 /* NeoVimWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE45C101FD2DB52005C0A95 /* NeoVimWindow.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4BE45C171FD2DB53005C0A95 /* NeoVimWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE45C111FD2DB52005C0A95 /* NeoVimWindow.m */; }; + 4BE45C181FD2DB53005C0A95 /* NeoVimTab.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE45C121FD2DB52005C0A95 /* NeoVimTab.m */; }; + 4BE45C191FD2DB53005C0A95 /* NeoVimTab.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE45C131FD2DB52005C0A95 /* NeoVimTab.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4BE45C1A1FD2DB53005C0A95 /* NeoVimBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE45C141FD2DB53005C0A95 /* NeoVimBuffer.m */; }; + 4BE45C1B1FD2DB53005C0A95 /* NeoVimBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE45C151FD2DB53005C0A95 /* NeoVimBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4BF18C5D1FD2EEE400DF95D1 /* NvimView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF18C5C1FD2EEE400DF95D1 /* NvimView.h */; settings = {ATTRIBUTES = (Public, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 4B90F06D1FD2B9E3008A39E0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4B90EFFB1FD2AF59008A39E0 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 4B90F04E1FD2AFD3008A39E0; + remoteInfo = NvimServer; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 4B90F04D1FD2AFD3008A39E0 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; + 4BE45C071FD2D4D7005C0A95 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 13; + files = ( + 4BE45C081FD2D4E3005C0A95 /* NvimServer in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 4B90F0041FD2AF59008A39E0 /* NvimView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NvimView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B90F0081FD2AF59008A39E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 4B90F00F1FD2AFAC008A39E0 /* NeoVimUiBridgeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimUiBridgeProtocol.h; sourceTree = ""; }; + 4B90F0101FD2AFAC008A39E0 /* NeoVimView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimView.swift; sourceTree = ""; }; + 4B90F0111FD2AFAC008A39E0 /* NeoVimView+Resize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Resize.swift"; sourceTree = ""; }; + 4B90F0121FD2AFAC008A39E0 /* KeyUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyUtils.swift; sourceTree = ""; }; + 4B90F0131FD2AFAC008A39E0 /* NeoVimAutoCommandEvent.generated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimAutoCommandEvent.generated.m; sourceTree = ""; }; + 4B90F0141FD2AFAC008A39E0 /* NeoVimView+Dragging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Dragging.swift"; sourceTree = ""; }; + 4B90F0151FD2AFAC008A39E0 /* NeoVimAutoCommandEvent.generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimAutoCommandEvent.generated.h; sourceTree = ""; }; + 4B90F0161FD2AFAC008A39E0 /* CocoaExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CocoaExtensions.swift; sourceTree = ""; }; + 4B90F0171FD2AFAC008A39E0 /* NeoVimView+Mouse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Mouse.swift"; sourceTree = ""; }; + 4B90F0181FD2AFAC008A39E0 /* NeoVimViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimViewDelegate.swift; sourceTree = ""; }; + 4B90F0191FD2AFAC008A39E0 /* NeoVimAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimAgent.h; sourceTree = ""; }; + 4B90F01A1FD2AFAC008A39E0 /* ColorUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorUtils.swift; sourceTree = ""; }; + 4B90F01B1FD2AFAC008A39E0 /* NeoVimView+Api.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Api.swift"; sourceTree = ""; }; + 4B90F01C1FD2AFAC008A39E0 /* NeoVimView+Key.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Key.swift"; sourceTree = ""; }; + 4B90F01D1FD2AFAC008A39E0 /* NeoVimObjectsExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimObjectsExtensions.swift; sourceTree = ""; }; + 4B90F01E1FD2AFAC008A39E0 /* NeoVimView+TouchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+TouchBar.swift"; sourceTree = ""; }; + 4B90F01F1FD2AFAD008A39E0 /* InputTestView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputTestView.swift; sourceTree = ""; }; + 4B90F0201FD2AFAD008A39E0 /* MMCoreTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMCoreTextView.m; sourceTree = ""; }; + 4B90F0211FD2AFAD008A39E0 /* NeoVimView+Draw.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Draw.swift"; sourceTree = ""; }; + 4B90F0221FD2AFAD008A39E0 /* TextDrawer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextDrawer.m; sourceTree = ""; }; + 4B90F0231FD2AFAD008A39E0 /* TextDrawer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextDrawer.h; sourceTree = ""; }; + 4B90F0241FD2AFAD008A39E0 /* NeoVimView+UiBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+UiBridge.swift"; sourceTree = ""; }; + 4B90F0251FD2AFAD008A39E0 /* NeoVimView+MenuItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+MenuItems.swift"; sourceTree = ""; }; + 4B90F0261FD2AFAD008A39E0 /* MMCoreTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMCoreTextView.h; sourceTree = ""; }; + 4B90F0271FD2AFAD008A39E0 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; + 4B90F0281FD2AFAD008A39E0 /* Grid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Grid.swift; sourceTree = ""; }; + 4B90F02A1FD2AFAD008A39E0 /* NeoVimUiBridgeProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimUiBridgeProtocol.m; sourceTree = ""; }; + 4B90F02B1FD2AFAD008A39E0 /* CellAttributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellAttributes.swift; sourceTree = ""; }; + 4B90F02C1FD2AFAE008A39E0 /* NeoVimAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimAgent.m; sourceTree = ""; }; + 4B90F04F1FD2AFD3008A39E0 /* NvimServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = NvimServer; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B90F0511FD2AFD3008A39E0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 4B90F0561FD2AFF7008A39E0 /* server_ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = server_ui.m; sourceTree = ""; }; + 4B90F0571FD2AFF7008A39E0 /* CocoaCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaCategories.h; sourceTree = ""; }; + 4B90F0591FD2AFF7008A39E0 /* NeoVimMsgIds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimMsgIds.h; sourceTree = ""; }; + 4B90F05A1FD2AFF7008A39E0 /* CocoaCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CocoaCategories.m; sourceTree = ""; }; + 4B90F05B1FD2AFF7008A39E0 /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; + 4B90F05C1FD2AFF7008A39E0 /* DataWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataWrapper.h; sourceTree = ""; }; + 4B90F0611FD2AFF7008A39E0 /* DataWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataWrapper.m; sourceTree = ""; }; + 4B90F0621FD2AFF7008A39E0 /* NeoVimServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimServer.h; sourceTree = ""; }; + 4B90F0631FD2AFF7008A39E0 /* server_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_globals.h; sourceTree = ""; }; + 4B90F0641FD2AFF7008A39E0 /* NeoVimServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimServer.m; sourceTree = ""; }; + 4B90F0721FD2B9F1008A39E0 /* MsgPackRpc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MsgPackRpc.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B90F0731FD2B9F1008A39E0 /* NvimMsgPack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimMsgPack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B90F0771FD2BA7B008A39E0 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logger.h; path = NvimView/Logger.h; sourceTree = SOURCE_ROOT; }; + 4BE45C0B1FD2DA49005C0A95 /* runtime */ = {isa = PBXFileReference; lastKnownFileType = folder; name = runtime; path = neovim/runtime; sourceTree = ""; }; + 4BE45C101FD2DB52005C0A95 /* NeoVimWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimWindow.h; sourceTree = ""; }; + 4BE45C111FD2DB52005C0A95 /* NeoVimWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimWindow.m; sourceTree = ""; }; + 4BE45C121FD2DB52005C0A95 /* NeoVimTab.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimTab.m; sourceTree = ""; }; + 4BE45C131FD2DB52005C0A95 /* NeoVimTab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimTab.h; sourceTree = ""; }; + 4BE45C141FD2DB53005C0A95 /* NeoVimBuffer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimBuffer.m; sourceTree = ""; }; + 4BE45C151FD2DB53005C0A95 /* NeoVimBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimBuffer.h; sourceTree = ""; }; + 4BF18C5A1FD2E72D00DF95D1 /* nvim */ = {isa = PBXFileReference; lastKnownFileType = folder; name = nvim; path = neovim/src/nvim; sourceTree = ""; }; + 4BF18C5B1FD2E74800DF95D1 /* auto */ = {isa = PBXFileReference; lastKnownFileType = folder; name = auto; path = neovim/build/src/nvim/auto; sourceTree = ""; }; + 4BF18C5C1FD2EEE400DF95D1 /* NvimView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NvimView.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 4B90F0001FD2AF59008A39E0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 4B90F0701FD2B9F1008A39E0 /* MsgPackRpc.framework in Frameworks */, + 4B90F0711FD2B9F1008A39E0 /* NvimMsgPack.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 4B90F04C1FD2AFD3008A39E0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 4B90EFFA1FD2AF59008A39E0 = { + isa = PBXGroup; + children = ( + 4BF18C5B1FD2E74800DF95D1 /* auto */, + 4BF18C5A1FD2E72D00DF95D1 /* nvim */, + 4BE45C0B1FD2DA49005C0A95 /* runtime */, + 4B90F0591FD2AFF7008A39E0 /* NeoVimMsgIds.h */, + 4B90F0061FD2AF59008A39E0 /* NvimView */, + 4B90F0501FD2AFD3008A39E0 /* NvimServer */, + 4B90F0051FD2AF59008A39E0 /* Products */, + 4B90F06F1FD2B9F1008A39E0 /* Frameworks */, + ); + sourceTree = ""; + }; + 4B90F0051FD2AF59008A39E0 /* Products */ = { + isa = PBXGroup; + children = ( + 4B90F0041FD2AF59008A39E0 /* NvimView.framework */, + 4B90F04F1FD2AFD3008A39E0 /* NvimServer */, + ); + name = Products; + sourceTree = ""; + }; + 4B90F0061FD2AF59008A39E0 /* NvimView */ = { + isa = PBXGroup; + children = ( + 4B90F0081FD2AF59008A39E0 /* Info.plist */, + 4BF18C5C1FD2EEE400DF95D1 /* NvimView.h */, + 4B90F02B1FD2AFAD008A39E0 /* CellAttributes.swift */, + 4B90F0161FD2AFAC008A39E0 /* CocoaExtensions.swift */, + 4B90F01A1FD2AFAC008A39E0 /* ColorUtils.swift */, + 4B90F0281FD2AFAD008A39E0 /* Grid.swift */, + 4B90F01F1FD2AFAD008A39E0 /* InputTestView.swift */, + 4B90F0121FD2AFAC008A39E0 /* KeyUtils.swift */, + 4B90F0271FD2AFAD008A39E0 /* Logger.swift */, + 4B90F0261FD2AFAD008A39E0 /* MMCoreTextView.h */, + 4B90F0201FD2AFAD008A39E0 /* MMCoreTextView.m */, + 4B90F0191FD2AFAC008A39E0 /* NeoVimAgent.h */, + 4B90F02C1FD2AFAE008A39E0 /* NeoVimAgent.m */, + 4B90F0151FD2AFAC008A39E0 /* NeoVimAutoCommandEvent.generated.h */, + 4B90F0131FD2AFAC008A39E0 /* NeoVimAutoCommandEvent.generated.m */, + 4B90F01D1FD2AFAC008A39E0 /* NeoVimObjectsExtensions.swift */, + 4B90F00F1FD2AFAC008A39E0 /* NeoVimUiBridgeProtocol.h */, + 4B90F02A1FD2AFAD008A39E0 /* NeoVimUiBridgeProtocol.m */, + 4B90F0101FD2AFAC008A39E0 /* NeoVimView.swift */, + 4B90F01B1FD2AFAC008A39E0 /* NeoVimView+Api.swift */, + 4B90F0141FD2AFAC008A39E0 /* NeoVimView+Dragging.swift */, + 4B90F0211FD2AFAD008A39E0 /* NeoVimView+Draw.swift */, + 4B90F01C1FD2AFAC008A39E0 /* NeoVimView+Key.swift */, + 4B90F0251FD2AFAD008A39E0 /* NeoVimView+MenuItems.swift */, + 4B90F0171FD2AFAC008A39E0 /* NeoVimView+Mouse.swift */, + 4B90F0111FD2AFAC008A39E0 /* NeoVimView+Resize.swift */, + 4B90F01E1FD2AFAC008A39E0 /* NeoVimView+TouchBar.swift */, + 4B90F0241FD2AFAD008A39E0 /* NeoVimView+UiBridge.swift */, + 4B90F0181FD2AFAC008A39E0 /* NeoVimViewDelegate.swift */, + 4B90F0231FD2AFAD008A39E0 /* TextDrawer.h */, + 4B90F0221FD2AFAD008A39E0 /* TextDrawer.m */, + 4B90F0771FD2BA7B008A39E0 /* Logger.h */, + 4BE45C151FD2DB53005C0A95 /* NeoVimBuffer.h */, + 4BE45C141FD2DB53005C0A95 /* NeoVimBuffer.m */, + 4BE45C131FD2DB52005C0A95 /* NeoVimTab.h */, + 4BE45C121FD2DB52005C0A95 /* NeoVimTab.m */, + 4BE45C101FD2DB52005C0A95 /* NeoVimWindow.h */, + 4BE45C111FD2DB52005C0A95 /* NeoVimWindow.m */, + ); + path = NvimView; + sourceTree = ""; + }; + 4B90F0501FD2AFD3008A39E0 /* NvimServer */ = { + isa = PBXGroup; + children = ( + 4B90F0511FD2AFD3008A39E0 /* main.m */, + 4B90F0571FD2AFF7008A39E0 /* CocoaCategories.h */, + 4B90F05A1FD2AFF7008A39E0 /* CocoaCategories.m */, + 4B90F05C1FD2AFF7008A39E0 /* DataWrapper.h */, + 4B90F0611FD2AFF7008A39E0 /* DataWrapper.m */, + 4B90F05B1FD2AFF7008A39E0 /* Logging.h */, + 4B90F0621FD2AFF7008A39E0 /* NeoVimServer.h */, + 4B90F0641FD2AFF7008A39E0 /* NeoVimServer.m */, + 4B90F0631FD2AFF7008A39E0 /* server_globals.h */, + 4B90F0561FD2AFF7008A39E0 /* server_ui.m */, + ); + path = NvimServer; + sourceTree = ""; + }; + 4B90F06F1FD2B9F1008A39E0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 4B90F0721FD2B9F1008A39E0 /* MsgPackRpc.framework */, + 4B90F0731FD2B9F1008A39E0 /* NvimMsgPack.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 4B90F0011FD2AF59008A39E0 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 4BF18C5D1FD2EEE400DF95D1 /* NvimView.h in Headers */, + 4B90F0411FD2AFAE008A39E0 /* TextDrawer.h in Headers */, + 4B90F0371FD2AFAE008A39E0 /* NeoVimAgent.h in Headers */, + 4B90F02D1FD2AFAE008A39E0 /* NeoVimUiBridgeProtocol.h in Headers */, + 4BE45C161FD2DB53005C0A95 /* NeoVimWindow.h in Headers */, + 4BE45C1B1FD2DB53005C0A95 /* NeoVimBuffer.h in Headers */, + 4BE45C191FD2DB53005C0A95 /* NeoVimTab.h in Headers */, + 4B90F0441FD2AFAE008A39E0 /* MMCoreTextView.h in Headers */, + 4B90F0331FD2AFAE008A39E0 /* NeoVimAutoCommandEvent.generated.h in Headers */, + 4B90F0781FD2BA7B008A39E0 /* Logger.h in Headers */, + 4B90F07B1FD30650008A39E0 /* NeoVimMsgIds.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 4B90F0031FD2AF59008A39E0 /* NvimView */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4B90F00C1FD2AF59008A39E0 /* Build configuration list for PBXNativeTarget "NvimView" */; + buildPhases = ( + 4B90EFFF1FD2AF59008A39E0 /* Sources */, + 4B90F0001FD2AF59008A39E0 /* Frameworks */, + 4B90F0011FD2AF59008A39E0 /* Headers */, + 4B90F0021FD2AF59008A39E0 /* Resources */, + 4BE45C071FD2D4D7005C0A95 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 4B90F06E1FD2B9E3008A39E0 /* PBXTargetDependency */, + ); + name = NvimView; + productName = NvimView; + productReference = 4B90F0041FD2AF59008A39E0 /* NvimView.framework */; + productType = "com.apple.product-type.framework"; + }; + 4B90F04E1FD2AFD3008A39E0 /* NvimServer */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4B90F0531FD2AFD3008A39E0 /* Build configuration list for PBXNativeTarget "NvimServer" */; + buildPhases = ( + 4BE45C091FD2D92D005C0A95 /* ShellScript */, + 4BE45C0A1FD2D941005C0A95 /* ShellScript */, + 4B90F04B1FD2AFD3008A39E0 /* Sources */, + 4B90F04C1FD2AFD3008A39E0 /* Frameworks */, + 4B90F04D1FD2AFD3008A39E0 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = NvimServer; + productName = NvimServer; + productReference = 4B90F04F1FD2AFD3008A39E0 /* NvimServer */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 4B90EFFB1FD2AF59008A39E0 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0910; + ORGANIZATIONNAME = "Tae Won Ha"; + TargetAttributes = { + 4B90F0031FD2AF59008A39E0 = { + CreatedOnToolsVersion = 9.1; + LastSwiftMigration = 0910; + }; + 4B90F04E1FD2AFD3008A39E0 = { + CreatedOnToolsVersion = 9.1; + }; + }; + }; + buildConfigurationList = 4B90EFFE1FD2AF59008A39E0 /* Build configuration list for PBXProject "NvimView" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 4B90EFFA1FD2AF59008A39E0; + productRefGroup = 4B90F0051FD2AF59008A39E0 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 4B90F0031FD2AF59008A39E0 /* NvimView */, + 4B90F04E1FD2AFD3008A39E0 /* NvimServer */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 4B90F0021FD2AF59008A39E0 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4BE45C0C1FD2DA49005C0A95 /* runtime in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 4BE45C091FD2D92D005C0A95 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "pushd neovim\n../../bin/build_libnvim.sh\npopd"; + }; + 4BE45C0A1FD2D941005C0A95 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = ../bin/generate_source.py; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 4B90EFFF1FD2AF59008A39E0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4B90F0381FD2AFAE008A39E0 /* ColorUtils.swift in Sources */, + 4B90F03E1FD2AFAE008A39E0 /* MMCoreTextView.m in Sources */, + 4B90F0481FD2AFAE008A39E0 /* NeoVimUiBridgeProtocol.m in Sources */, + 4B90F03F1FD2AFAE008A39E0 /* NeoVimView+Draw.swift in Sources */, + 4B90F02F1FD2AFAE008A39E0 /* NeoVimView+Resize.swift in Sources */, + 4B90F0341FD2AFAE008A39E0 /* CocoaExtensions.swift in Sources */, + 4B90F0461FD2AFAE008A39E0 /* Grid.swift in Sources */, + 4BE45C171FD2DB53005C0A95 /* NeoVimWindow.m in Sources */, + 4B90F0421FD2AFAE008A39E0 /* NeoVimView+UiBridge.swift in Sources */, + 4B90F0401FD2AFAE008A39E0 /* TextDrawer.m in Sources */, + 4B90F02E1FD2AFAE008A39E0 /* NeoVimView.swift in Sources */, + 4B90F03C1FD2AFAE008A39E0 /* NeoVimView+TouchBar.swift in Sources */, + 4B90F03B1FD2AFAE008A39E0 /* NeoVimObjectsExtensions.swift in Sources */, + 4BE45C1A1FD2DB53005C0A95 /* NeoVimBuffer.m in Sources */, + 4B90F04A1FD2AFAE008A39E0 /* NeoVimAgent.m in Sources */, + 4B90F0351FD2AFAE008A39E0 /* NeoVimView+Mouse.swift in Sources */, + 4B90F0431FD2AFAE008A39E0 /* NeoVimView+MenuItems.swift in Sources */, + 4B90F0391FD2AFAE008A39E0 /* NeoVimView+Api.swift in Sources */, + 4B90F0311FD2AFAE008A39E0 /* NeoVimAutoCommandEvent.generated.m in Sources */, + 4B90F0451FD2AFAE008A39E0 /* Logger.swift in Sources */, + 4B90F0321FD2AFAE008A39E0 /* NeoVimView+Dragging.swift in Sources */, + 4B90F0491FD2AFAE008A39E0 /* CellAttributes.swift in Sources */, + 4B90F0301FD2AFAE008A39E0 /* KeyUtils.swift in Sources */, + 4B90F03A1FD2AFAE008A39E0 /* NeoVimView+Key.swift in Sources */, + 4B90F0361FD2AFAE008A39E0 /* NeoVimViewDelegate.swift in Sources */, + 4BE45C181FD2DB53005C0A95 /* NeoVimTab.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 4B90F04B1FD2AFD3008A39E0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4B90F06B1FD2AFF7008A39E0 /* NeoVimServer.m in Sources */, + 4B90F0661FD2AFF7008A39E0 /* server_ui.m in Sources */, + 4B90F0521FD2AFD3008A39E0 /* main.m in Sources */, + 4B90F0681FD2AFF7008A39E0 /* CocoaCategories.m in Sources */, + 4B90F06A1FD2AFF7008A39E0 /* DataWrapper.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 4B90F06E1FD2B9E3008A39E0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 4B90F04E1FD2AFD3008A39E0 /* NvimServer */; + targetProxy = 4B90F06D1FD2B9E3008A39E0 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 4B90F00A1FD2AF59008A39E0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 4B90F00B1FD2AF59008A39E0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = NO; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 4B90F00D1FD2AF59008A39E0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = NvimView/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.NvimView; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + }; + name = Debug; + }; + 4B90F00E1FD2AF59008A39E0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = NvimView/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.NvimView; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 4.0; + }; + name = Release; + }; + 4B90F0541FD2AFD3008A39E0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "INCLUDE_GENERATED_DECLARATIONS=1", + ); + HEADER_SEARCH_PATHS = ( + "$(PROJECT_DIR)/neovim/build/include", + "$(PROJECT_DIR)/neovim/src", + "$(PROJECT_DIR)/neovim/.deps/usr/include", + "$(PROJECT_DIR)/neovim/build/config", + "$(PROJECT_DIR)/third-party/libintl/include", + "$(PROJECT_DIR)/neovim/build/src/nvim/auto", + ); + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/neovim/build/lib", + "$(PROJECT_DIR)/neovim/.deps/usr/lib", + ); + OTHER_LDFLAGS = ( + "-liconv", + "-lpthread", + "-ldl", + "-lm", + "-lutil", + "$(PROJECT_DIR)/third-party/libintl/lib/libintl.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libjemalloc.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/liblua.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libvterm.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libuv.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libmsgpackc.a", + "$(PROJECT_DIR)/neovim/build/lib/libnvim.a", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 4B90F0551FD2AFD3008A39E0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREPROCESSOR_DEFINITIONS = "INCLUDE_GENERATED_DECLARATIONS=1"; + HEADER_SEARCH_PATHS = ( + "$(PROJECT_DIR)/neovim/build/include", + "$(PROJECT_DIR)/neovim/src", + "$(PROJECT_DIR)/neovim/.deps/usr/include", + "$(PROJECT_DIR)/neovim/build/config", + "$(PROJECT_DIR)/third-party/libintl/include", + "$(PROJECT_DIR)/neovim/build/src/nvim/auto", + ); + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/neovim/build/lib", + "$(PROJECT_DIR)/neovim/.deps/usr/lib", + ); + OTHER_LDFLAGS = ( + "-liconv", + "-lpthread", + "-ldl", + "-lm", + "-lutil", + "$(PROJECT_DIR)/third-party/libintl/lib/libintl.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libjemalloc.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/liblua.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libvterm.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libuv.a", + "$(PROJECT_DIR)/neovim/.deps/usr/lib/libmsgpackc.a", + "$(PROJECT_DIR)/neovim/build/lib/libnvim.a", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 4B90EFFE1FD2AF59008A39E0 /* Build configuration list for PBXProject "NvimView" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4B90F00A1FD2AF59008A39E0 /* Debug */, + 4B90F00B1FD2AF59008A39E0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 4B90F00C1FD2AF59008A39E0 /* Build configuration list for PBXNativeTarget "NvimView" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4B90F00D1FD2AF59008A39E0 /* Debug */, + 4B90F00E1FD2AF59008A39E0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 4B90F0531FD2AFD3008A39E0 /* Build configuration list for PBXNativeTarget "NvimServer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4B90F0541FD2AFD3008A39E0 /* Debug */, + 4B90F0551FD2AFD3008A39E0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 4B90EFFB1FD2AF59008A39E0 /* Project object */; +} diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/ThemedWindow.xcscheme b/NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimServer.xcscheme similarity index 73% rename from VimR.xcodeproj/xcshareddata/xcschemes/ThemedWindow.xcscheme rename to NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimServer.xcscheme index f6ae82c8..98bc7b40 100644 --- a/VimR.xcodeproj/xcshareddata/xcschemes/ThemedWindow.xcscheme +++ b/NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimServer.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "4B90F04E1FD2AFD3008A39E0" + BuildableName = "NvimServer" + BlueprintName = "NvimServer" + ReferencedContainer = "container:NvimView.xcodeproj"> @@ -33,10 +33,10 @@ + BlueprintIdentifier = "4B90F04E1FD2AFD3008A39E0" + BuildableName = "NvimServer" + BlueprintName = "NvimServer" + ReferencedContainer = "container:NvimView.xcodeproj"> @@ -57,10 +57,10 @@ runnableDebuggingMode = "0"> + BlueprintIdentifier = "4B90F04E1FD2AFD3008A39E0" + BuildableName = "NvimServer" + BlueprintName = "NvimServer" + ReferencedContainer = "container:NvimView.xcodeproj"> @@ -76,10 +76,10 @@ runnableDebuggingMode = "0"> + BlueprintIdentifier = "4B90F04E1FD2AFD3008A39E0" + BuildableName = "NvimServer" + BlueprintName = "NvimServer" + ReferencedContainer = "container:NvimView.xcodeproj"> diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVimTests.xcscheme b/NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimView.xcscheme similarity index 68% rename from VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVimTests.xcscheme rename to NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimView.xcscheme index 882bf187..882ab30b 100644 --- a/VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVimTests.xcscheme +++ b/NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/NvimView.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "4B90F0031FD2AF59008A39E0" + BuildableName = "NvimView.framework" + BlueprintName = "NvimView" + ReferencedContainer = "container:NvimView.xcodeproj"> @@ -29,16 +29,6 @@ language = "" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - @@ -57,10 +47,10 @@ + BlueprintIdentifier = "4B90F0031FD2AF59008A39E0" + BuildableName = "NvimView.framework" + BlueprintName = "NvimView" + ReferencedContainer = "container:NvimView.xcodeproj"> @@ -72,6 +62,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + diff --git a/SwiftNeoVim/CellAttributes.swift b/NvimView/NvimView/CellAttributes.swift similarity index 100% rename from SwiftNeoVim/CellAttributes.swift rename to NvimView/NvimView/CellAttributes.swift diff --git a/SwiftNeoVim/CocoaExtensions.swift b/NvimView/NvimView/CocoaExtensions.swift similarity index 100% rename from SwiftNeoVim/CocoaExtensions.swift rename to NvimView/NvimView/CocoaExtensions.swift diff --git a/SwiftNeoVim/ColorUtils.swift b/NvimView/NvimView/ColorUtils.swift similarity index 100% rename from SwiftNeoVim/ColorUtils.swift rename to NvimView/NvimView/ColorUtils.swift diff --git a/SwiftNeoVim/Grid.swift b/NvimView/NvimView/Grid.swift similarity index 100% rename from SwiftNeoVim/Grid.swift rename to NvimView/NvimView/Grid.swift diff --git a/SwiftNeoVim/Info.plist b/NvimView/NvimView/Info.plist similarity index 78% rename from SwiftNeoVim/Info.plist rename to NvimView/NvimView/Info.plist index 0cafbed8..50fbb950 100644 --- a/SwiftNeoVim/Info.plist +++ b/NvimView/NvimView/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -15,13 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - SNAPSHOT-243 - CFBundleSignature - ???? + 1.0 CFBundleVersion - 243 + $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2016 Tae Won Ha. All rights reserved. + Copyright © 2017 Tae Won Ha. All rights reserved. NSPrincipalClass diff --git a/SwiftNeoVim/InputTestView.swift b/NvimView/NvimView/InputTestView.swift similarity index 100% rename from SwiftNeoVim/InputTestView.swift rename to NvimView/NvimView/InputTestView.swift diff --git a/SwiftNeoVim/KeyUtils.swift b/NvimView/NvimView/KeyUtils.swift similarity index 100% rename from SwiftNeoVim/KeyUtils.swift rename to NvimView/NvimView/KeyUtils.swift diff --git a/VimR/Logger.h b/NvimView/NvimView/Logger.h similarity index 100% rename from VimR/Logger.h rename to NvimView/NvimView/Logger.h diff --git a/SwiftNeoVim/Logger.swift b/NvimView/NvimView/Logger.swift similarity index 100% rename from SwiftNeoVim/Logger.swift rename to NvimView/NvimView/Logger.swift diff --git a/SwiftNeoVim/MMCoreTextView.h b/NvimView/NvimView/MMCoreTextView.h similarity index 100% rename from SwiftNeoVim/MMCoreTextView.h rename to NvimView/NvimView/MMCoreTextView.h diff --git a/SwiftNeoVim/MMCoreTextView.m b/NvimView/NvimView/MMCoreTextView.m similarity index 100% rename from SwiftNeoVim/MMCoreTextView.m rename to NvimView/NvimView/MMCoreTextView.m diff --git a/SwiftNeoVim/NeoVimAgent.h b/NvimView/NvimView/NeoVimAgent.h similarity index 100% rename from SwiftNeoVim/NeoVimAgent.h rename to NvimView/NvimView/NeoVimAgent.h diff --git a/SwiftNeoVim/NeoVimAgent.m b/NvimView/NvimView/NeoVimAgent.m similarity index 99% rename from SwiftNeoVim/NeoVimAgent.m rename to NvimView/NvimView/NeoVimAgent.m index bf0b7394..dc7b422d 100644 --- a/SwiftNeoVim/NeoVimAgent.m +++ b/NvimView/NvimView/NeoVimAgent.m @@ -413,7 +413,7 @@ static CFDataRef local_server_callback(CFMessagePortRef local __unused, SInt32 m } - (NSString *)neoVimServerExecutablePath { - return [[[NSBundle bundleForClass:[self class]] builtInPlugInsPath] stringByAppendingPathComponent:@"NeoVimServer"]; + return [[[NSBundle bundleForClass:[self class]] builtInPlugInsPath] stringByAppendingPathComponent:@"NVimServer"]; } - (NSString *)localServerName { diff --git a/NeoVimServer/NeoVimBuffer.h b/NvimView/NvimView/NeoVimBuffer.h similarity index 100% rename from NeoVimServer/NeoVimBuffer.h rename to NvimView/NvimView/NeoVimBuffer.h diff --git a/NeoVimServer/NeoVimBuffer.m b/NvimView/NvimView/NeoVimBuffer.m similarity index 100% rename from NeoVimServer/NeoVimBuffer.m rename to NvimView/NvimView/NeoVimBuffer.m diff --git a/SwiftNeoVim/NeoVimObjectsExtensions.swift b/NvimView/NvimView/NeoVimObjectsExtensions.swift similarity index 100% rename from SwiftNeoVim/NeoVimObjectsExtensions.swift rename to NvimView/NvimView/NeoVimObjectsExtensions.swift diff --git a/NeoVimServer/NeoVimTab.h b/NvimView/NvimView/NeoVimTab.h similarity index 100% rename from NeoVimServer/NeoVimTab.h rename to NvimView/NvimView/NeoVimTab.h diff --git a/NeoVimServer/NeoVimTab.m b/NvimView/NvimView/NeoVimTab.m similarity index 100% rename from NeoVimServer/NeoVimTab.m rename to NvimView/NvimView/NeoVimTab.m diff --git a/SwiftNeoVim/NeoVimUiBridgeProtocol.h b/NvimView/NvimView/NeoVimUiBridgeProtocol.h similarity index 100% rename from SwiftNeoVim/NeoVimUiBridgeProtocol.h rename to NvimView/NvimView/NeoVimUiBridgeProtocol.h diff --git a/SwiftNeoVim/NeoVimUiBridgeProtocol.m b/NvimView/NvimView/NeoVimUiBridgeProtocol.m similarity index 100% rename from SwiftNeoVim/NeoVimUiBridgeProtocol.m rename to NvimView/NvimView/NeoVimUiBridgeProtocol.m diff --git a/SwiftNeoVim/NeoVimView+Api.swift b/NvimView/NvimView/NeoVimView+Api.swift similarity index 90% rename from SwiftNeoVim/NeoVimView+Api.swift rename to NvimView/NvimView/NeoVimView+Api.swift index b4c5ae39..1d482e6f 100644 --- a/SwiftNeoVim/NeoVimView+Api.swift +++ b/NvimView/NvimView/NeoVimView+Api.swift @@ -63,7 +63,7 @@ extension NeoVimView { if buffers.filter({ $0.url == url }).first != nil { for window in tabs.map({ $0.windows }).flatMap({ $0 }) { if window.buffer.url == url { - self.nvim.setCurrentWin(window: Nvim.Window(window.handle), expectsReturnValue: false) + self.nvim.setCurrentWin(window: NvimApi.Window(window.handle), expectsReturnValue: false) return } } @@ -96,7 +96,7 @@ extension NeoVimView { public func select(buffer: NeoVimBuffer) { for window in self.allTabs().map({ $0.windows }).flatMap({ $0 }) { if window.buffer.handle == buffer.handle { - self.nvim.setCurrentWin(window: Nvim.Window(window.handle), expectsReturnValue: false) + self.nvim.setCurrentWin(window: NvimApi.Window(window.handle), expectsReturnValue: false) return } } @@ -188,7 +188,7 @@ extension NeoVimView { self.exec(command: "\(cmd) \(escapedFileName)") } - private func neoVimBuffer(for buf: Nvim.Buffer, currentBuffer: Nvim.Buffer?) -> NeoVimBuffer? { + private func neoVimBuffer(for buf: NvimApi.Buffer, currentBuffer: NvimApi.Buffer?) -> NeoVimBuffer? { guard let path = self.nvim.bufGetName(buffer: buf).value else { return nil } @@ -207,9 +207,9 @@ extension NeoVimView { return NeoVimBuffer(handle: buf.handle, unescapedPath: path, dirty: dirty, readOnly: readonly, current: current) } - private func neoVimWindow(for window: Nvim.Window, - currentWindow: Nvim.Window?, - currentBuffer: Nvim.Buffer?) -> NeoVimWindow? { + private func neoVimWindow(for window: NvimApi.Window, + currentWindow: NvimApi.Window?, + currentBuffer: NvimApi.Buffer?) -> NeoVimWindow? { guard let buf = self.nvim.winGetBuf(window: window).value else { return nil @@ -222,9 +222,9 @@ extension NeoVimView { return NeoVimWindow(handle: window.handle, buffer: buffer, currentInTab: window == currentWindow) } - private func neoVimTab(for tabpage: Nvim.Tabpage, - currentTabpage: Nvim.Tabpage?, - currentBuffer: Nvim.Buffer?) -> NeoVimTab? { + private func neoVimTab(for tabpage: NvimApi.Tabpage, + currentTabpage: NvimApi.Tabpage?, + currentBuffer: NvimApi.Buffer?) -> NeoVimTab? { let curWinInTab = self.nvim.tabpageGetWin(tabpage: tabpage).value diff --git a/SwiftNeoVim/NeoVimView+Dragging.swift b/NvimView/NvimView/NeoVimView+Dragging.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+Dragging.swift rename to NvimView/NvimView/NeoVimView+Dragging.swift diff --git a/SwiftNeoVim/NeoVimView+Draw.swift b/NvimView/NvimView/NeoVimView+Draw.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+Draw.swift rename to NvimView/NvimView/NeoVimView+Draw.swift diff --git a/SwiftNeoVim/NeoVimView+Key.swift b/NvimView/NvimView/NeoVimView+Key.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+Key.swift rename to NvimView/NvimView/NeoVimView+Key.swift diff --git a/SwiftNeoVim/NeoVimView+MenuItems.swift b/NvimView/NvimView/NeoVimView+MenuItems.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+MenuItems.swift rename to NvimView/NvimView/NeoVimView+MenuItems.swift diff --git a/SwiftNeoVim/NeoVimView+Mouse.swift b/NvimView/NvimView/NeoVimView+Mouse.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+Mouse.swift rename to NvimView/NvimView/NeoVimView+Mouse.swift diff --git a/SwiftNeoVim/NeoVimView+Resize.swift b/NvimView/NvimView/NeoVimView+Resize.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+Resize.swift rename to NvimView/NvimView/NeoVimView+Resize.swift diff --git a/SwiftNeoVim/NeoVimView+TouchBar.swift b/NvimView/NvimView/NeoVimView+TouchBar.swift similarity index 97% rename from SwiftNeoVim/NeoVimView+TouchBar.swift rename to NvimView/NvimView/NeoVimView+TouchBar.swift index c45b7703..7c691b67 100644 --- a/SwiftNeoVim/NeoVimView+TouchBar.swift +++ b/NvimView/NvimView/NeoVimView+TouchBar.swift @@ -87,6 +87,6 @@ extension NeoVimView : NSTouchBarDelegate, NSScrubberDataSource, NSScrubberDeleg } let window = tab.currentWindow() ?? tab.windows[0] - self.nvim.setCurrentWin(window: Nvim.Window(window.handle), expectsReturnValue: false) + self.nvim.setCurrentWin(window: NvimApi.Window(window.handle), expectsReturnValue: false) } } diff --git a/SwiftNeoVim/NeoVimView+UiBridge.swift b/NvimView/NvimView/NeoVimView+UiBridge.swift similarity index 100% rename from SwiftNeoVim/NeoVimView+UiBridge.swift rename to NvimView/NvimView/NeoVimView+UiBridge.swift diff --git a/SwiftNeoVim/NeoVimView.swift b/NvimView/NvimView/NeoVimView.swift similarity index 99% rename from SwiftNeoVim/NeoVimView.swift rename to NvimView/NvimView/NeoVimView.swift index e0e5a633..be497b4f 100644 --- a/SwiftNeoVim/NeoVimView.swift +++ b/NvimView/NvimView/NeoVimView.swift @@ -154,7 +154,7 @@ public class NeoVimView: NSView, self.agent = NeoVimAgent(uuid: self.uuid) let sockPath = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("vimr_\(self.uuid).sock").path - guard let nvim = Nvim(at: sockPath) else { + guard let nvim = NvimApi(at: sockPath) else { preconditionFailure("Nvim could not be instantiated") } @@ -207,7 +207,7 @@ public class NeoVimView: NSView, with: URL(fileURLWithPath: "/tmp/nvv-bridge.log"), shouldLogDebug: nil) let agent: NeoVimAgent - let nvim: Nvim + let nvim: NvimApi let grid = Grid() let drawer: TextDrawer diff --git a/SwiftNeoVim/NeoVimViewDelegate.swift b/NvimView/NvimView/NeoVimViewDelegate.swift similarity index 100% rename from SwiftNeoVim/NeoVimViewDelegate.swift rename to NvimView/NvimView/NeoVimViewDelegate.swift diff --git a/NeoVimServer/NeoVimWindow.h b/NvimView/NvimView/NeoVimWindow.h similarity index 100% rename from NeoVimServer/NeoVimWindow.h rename to NvimView/NvimView/NeoVimWindow.h diff --git a/NeoVimServer/NeoVimWindow.m b/NvimView/NvimView/NeoVimWindow.m similarity index 100% rename from NeoVimServer/NeoVimWindow.m rename to NvimView/NvimView/NeoVimWindow.m diff --git a/NvimView/NvimView/NvimView.h b/NvimView/NvimView/NvimView.h new file mode 100644 index 00000000..b67c4199 --- /dev/null +++ b/NvimView/NvimView/NvimView.h @@ -0,0 +1,26 @@ +// +// NvimView.h +// NvimView +// +// Created by hat on 02.12.17. +// Copyright © 2017 Tae Won Ha. All rights reserved. +// + +#import + +//! Project version number for NvimView. +FOUNDATION_EXPORT double NvimViewVersionNumber; + +//! Project version string for NvimView. +FOUNDATION_EXPORT const unsigned char NvimViewVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import +// TODO: this header should not be public, but we cannot use a bridging header in a framework. +#import +#import +#import +#import +#import +#import diff --git a/SwiftNeoVim/TextDrawer.h b/NvimView/NvimView/TextDrawer.h similarity index 100% rename from SwiftNeoVim/TextDrawer.h rename to NvimView/NvimView/TextDrawer.h diff --git a/SwiftNeoVim/TextDrawer.m b/NvimView/NvimView/TextDrawer.m similarity index 100% rename from SwiftNeoVim/TextDrawer.m rename to NvimView/NvimView/TextDrawer.m diff --git a/SwiftNeoVim/VIM.LICENSE b/NvimView/NvimView/VIM.LICENSE similarity index 100% rename from SwiftNeoVim/VIM.LICENSE rename to NvimView/NvimView/VIM.LICENSE diff --git a/local-dev.mk b/NvimView/local-dev.mk similarity index 100% rename from local-dev.mk rename to NvimView/local-dev.mk diff --git a/local.mk b/NvimView/local.mk similarity index 99% rename from local.mk rename to NvimView/local.mk index f6edf04d..df4a6314 100644 --- a/local.mk +++ b/NvimView/local.mk @@ -4,4 +4,3 @@ ENABLE_CUSTOM_UI := ENABLE DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUA=ON CMAKE_BUILD_TYPE := Release - diff --git a/neovim b/NvimView/neovim similarity index 100% rename from neovim rename to NvimView/neovim diff --git a/third-party/libintl/include/libintl.h b/NvimView/third-party/libintl/include/libintl.h similarity index 100% rename from third-party/libintl/include/libintl.h rename to NvimView/third-party/libintl/include/libintl.h diff --git a/third-party/libintl/lib/libintl.8.dylib b/NvimView/third-party/libintl/lib/libintl.8.dylib similarity index 100% rename from third-party/libintl/lib/libintl.8.dylib rename to NvimView/third-party/libintl/lib/libintl.8.dylib diff --git a/third-party/libintl/lib/libintl.a b/NvimView/third-party/libintl/lib/libintl.a similarity index 100% rename from third-party/libintl/lib/libintl.a rename to NvimView/third-party/libintl/lib/libintl.a diff --git a/third-party/libintl/lib/libintl.dylib b/NvimView/third-party/libintl/lib/libintl.dylib similarity index 100% rename from third-party/libintl/lib/libintl.dylib rename to NvimView/third-party/libintl/lib/libintl.dylib diff --git a/README.md b/README.md index 6b041924..012bde3f 100644 --- a/README.md +++ b/README.md @@ -53,53 +53,40 @@ We will gradually create feature [issues](https://github.com/qvacua/vimr/issues) ## How to Build First after cloning the VimR source tree you need to initialize git submodules -(right now the only one used is for neovim source tree): ```bash git submodule init git submodule update ``` -You have to use Xcode 8. First install `homebrew`, then in the project root: +You have to use Xcode 9. First install `homebrew`, then in the project root: ```bash -xcode-select --install # install the Xcode command line tools -brew install gnu-sed -brew install carthage # install Carthage for dependency management -brew install libtool automake cmake pkg-config gettext ninja # install libs and tools for neovim +xcode-select --install # install the Xcode command line tools, if you haven't already +brew bundle ./bin/build_vimr.sh # VimR.app will be placed in build/Build/Products/Release/ ``` -If you encounter `/usr/local/Library/ENV/4.3/sed: No such file or directory`, then try the following: - -```bash -cd neovim -make distclean -brew reinstall -s libtool -``` - -Then `./bin/build_vimr.sh` again in the project root folder. (See [GH-263](https://github.com/qvacua/vimr/issues/263)) - ## Project Setup ### Artifacts Hierarchy ``` VimR.app -+-- SwiftNeoVim.framework ++-- NvimView.framework    +-- NeoVimView    +-- runtime files for Neovim -    +-- NeoVimServer +    +-- NvimServer       +-- libnvim       +-- other libs for Neovim ``` ### Libraries for Neovim -* The library `libiconv` is linked by the linker flag `-liconv`. The version bundled with OSX will be linked. -* The library `libintl` is in `third-party/libintl/lib` and linked by "Other Linker Flags" of the NeoVimServer target. -* Other libraries used by Neovim, which are automatically built by building `libnvim`, are linked by "Other Linker Flags" of the NeoVimServer target. +* The library `libiconv` is linked by the linker flag `-liconv`. The version bundled with macOS will be linked. +* The library `libintl` is pre-built in `third-party/libintl/lib` and linked by "Other Linker Flags" of the NvimServer target. +* Other libraries used by Neovim, which are automatically built by building `libnvim`, are linked by "Other Linker Flags" of the NvimServer target. ## License diff --git a/SwiftNeoVim/SwiftNeoVim.h b/SwiftNeoVim/SwiftNeoVim.h deleted file mode 100644 index a595ee93..00000000 --- a/SwiftNeoVim/SwiftNeoVim.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Tae Won Ha - http://taewon.de - @hataewon - * See LICENSE - */ - -#import - -//! Project version number for SwiftNeoVim. -FOUNDATION_EXPORT double SwiftNeoVimVersionNumber; - -//! Project version string for SwiftNeoVim. -FOUNDATION_EXPORT const unsigned char SwiftNeoVimVersionString[]; - -#import -// TODO: this header should not be public, but we cannot use a bridging header in a framework. -#import -#import -#import -#import -#import -#import -#import diff --git a/SwiftNeoVimTests/SwiftNeoVimTests.swift b/SwiftNeoVimTests/SwiftNeoVimTests.swift deleted file mode 100644 index e7591e65..00000000 --- a/SwiftNeoVimTests/SwiftNeoVimTests.swift +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Tae Won Ha - http://taewon.de - @hataewon - * See LICENSE - */ - -import XCTest -import Nimble -@testable import SwiftNeoVim - -class GridTest: XCTestCase { -} diff --git a/ThemedWindow/AppDelegate.swift b/ThemedWindow/AppDelegate.swift deleted file mode 100644 index 055a53e1..00000000 --- a/ThemedWindow/AppDelegate.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// AppDelegate.swift -// ThemedWindow -// -// Created by hat on 02.09.17. -// Copyright © 2017 Tae Won Ha. All rights reserved. -// - -import Cocoa - -@NSApplicationMain -class AppDelegate: NSObject, NSApplicationDelegate { - - - - func applicationDidFinishLaunching(_ aNotification: Notification) { - // Insert code here to initialize your application - } - - func applicationWillTerminate(_ aNotification: Notification) { - // Insert code here to tear down your application - } - - -} - diff --git a/ThemedWindow/Assets.xcassets/AppIcon.appiconset/Contents.json b/ThemedWindow/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2db2b1c7..00000000 --- a/ThemedWindow/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ThemedWindow/Base.lproj/Main.storyboard b/ThemedWindow/Base.lproj/Main.storyboard deleted file mode 100644 index 9471ee72..00000000 --- a/ThemedWindow/Base.lproj/Main.storyboard +++ /dev/null @@ -1,417 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ThemedWindow/Info.plist b/ThemedWindow/Info.plist deleted file mode 100644 index dfcb50a0..00000000 --- a/ThemedWindow/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - SNAPSHOT-243 - CFBundleVersion - 243 - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - Copyright © 2017 Tae Won Ha. All rights reserved. - NSMainStoryboardFile - Main - NSPrincipalClass - NSApplication - - diff --git a/ThemedWindow/ViewController.swift b/ThemedWindow/ViewController.swift deleted file mode 100644 index ce17a703..00000000 --- a/ThemedWindow/ViewController.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// ViewController.swift -// ThemedWindow -// -// Created by hat on 02.09.17. -// Copyright © 2017 Tae Won Ha. All rights reserved. -// - -import Cocoa - -class ViewController: NSViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - override var representedObject: Any? { - didSet { - // Update the view, if already loaded. - } - } - - -} - diff --git a/ThemedWindow/WindowController.swift b/ThemedWindow/WindowController.swift deleted file mode 100644 index 8afa8df6..00000000 --- a/ThemedWindow/WindowController.swift +++ /dev/null @@ -1,210 +0,0 @@ -import Cocoa -import PureLayout - -fileprivate let gap = CGFloat(4.0) - -class WindowController: NSWindowController, NSWindowDelegate { - - func windowWillEnterFullScreen(_: Notification) { - self.unthemeTitlebar(dueFullScreen: true) - } - - func windowDidExitFullScreen(_: Notification) { - if self.titlebarThemed { - self.themeTitlebar(grow: true) - } - } - - fileprivate var titlebarThemed = false - fileprivate var repIcon: NSButton? - fileprivate var titleView: NSTextField? - - fileprivate func themeTitlebar(grow: Bool) { - guard let window = self.window else { - return - } - - if window.styleMask.contains(.fullScreen) { - return - } - - window.titlebarAppearsTransparent = true - - self.root.removeFromSuperview() - - self.set(repUrl: window.representedURL, themed: true) - - window.contentView?.addSubview(self.root) - self.root.autoPinEdge(toSuperviewEdge: .top, withInset: 22) - self.root.autoPinEdge(toSuperviewEdge: .right) - self.root.autoPinEdge(toSuperviewEdge: .bottom) - self.root.autoPinEdge(toSuperviewEdge: .left) - - self.titlebarThemed = true - } - - fileprivate func unthemeTitlebar(dueFullScreen: Bool) { - self.clearCustomTitle() - - guard let window = self.window, let contentView = window.contentView else { - return - } - - let prevFrame = window.frame - - window.titlebarAppearsTransparent = false - - self.root.removeFromSuperview() - - window.titleVisibility = .visible - window.styleMask.remove(.fullSizeContentView) - - self.set(repUrl: window.representedURL, themed: false) - - contentView.addSubview(self.root) - self.root.autoPinEdgesToSuperviewEdges() - - if !dueFullScreen { - window.setFrame(prevFrame, display: true, animate: false) - self.titlebarThemed = false - } - } - - - fileprivate func clearCustomTitle() { - self.titleView?.removeFromSuperview() - self.repIcon?.removeFromSuperview() - - self.titleView = nil - self.repIcon = nil - } - - fileprivate func internalSetRepUrl(_ url: URL?) { - self.window?.representedURL = nil - self.window?.representedURL = url - self.window?.title = url?.lastPathComponent ?? "Title" - } - - fileprivate func set(repUrl url: URL?, themed: Bool) { - guard let window = self.window else { - return - } - - if window.styleMask.contains(.fullScreen) || themed == false { - self.internalSetRepUrl(url) - return - } - - let prevFrame = window.frame - - self.clearCustomTitle() - - window.titleVisibility = .visible - self.internalSetRepUrl(url) - - guard let contentView = window.contentView else { - return - } - - window.titleVisibility = .hidden - window.styleMask.insert(.fullSizeContentView) - - let title = NSTextField(labelWithString: window.title) - title.configureForAutoLayout() - contentView.addSubview(title) - title.autoPinEdge(toSuperviewEdge: .top, withInset: 2) - - self.titleView = title - - if let button = window.standardWindowButton(.documentIconButton) { - button.removeFromSuperview() // remove the rep icon from the original superview and add it to content view - contentView.addSubview(button) - button.autoSetDimension(.width, toSize: 16) - button.autoSetDimension(.height, toSize: 16) - button.autoPinEdge(toSuperviewEdge: .top, withInset: 3) - - // Center the rep icon and the title side by side in the content view: - // rightView.left = leftView.right + gap - // rightView.right = parentView.centerX + (leftView.width + gap + rightView.width) / 2 - 4 - // The (-4) at the end is an empirical value... - contentView.addConstraint(NSLayoutConstraint(item: title, attribute: .left, - relatedBy: .equal, - toItem: button, attribute: .right, - multiplier: 1, - constant: gap)) - contentView.addConstraint(NSLayoutConstraint(item: title, attribute: .right, - relatedBy: .equal, - toItem: contentView, attribute: .centerX, - multiplier: 1, - constant: -4 + (button.frame.width + gap + title.frame.width) / 2)) - - self.repIcon = button - } else { - title.autoAlignAxis(toSuperviewAxis: .vertical) - } - - window.setFrame(prevFrame, display: true, animate: false) - } - - // ====== >8 ====== - - fileprivate let root = ColorView(bg: .green) - - override func windowDidLoad() { - super.windowDidLoad() - - guard let window = self.window else { - return - } - - window.delegate = self - window.backgroundColor = .yellow - - guard let contentView = window.contentView else { - return - } - - contentView.addSubview(self.root) - self.root.autoPinEdgesToSuperviewEdges() - } - - @IBAction func setRepUrl1(_: Any?) { - self.set(repUrl: URL(fileURLWithPath: "/Users/hat/big.txt"), themed: self.titlebarThemed) - } - - @IBAction func setRepUrl2(_: Any?) { - self.set(repUrl: URL(fileURLWithPath: "/Users/hat/greek.tex"), themed: self.titlebarThemed) - } - - @IBAction func themeTitlebar(_: Any?) { - self.themeTitlebar(grow: !self.titlebarThemed) - } - - @IBAction func unthemeTitlebar(_: Any?) { - self.unthemeTitlebar(dueFullScreen: false) - } -} - -class ColorView: NSView { - - fileprivate let color: NSColor - - init(bg: NSColor) { - self.color = bg - - super.init(frame: .zero) - self.configureForAutoLayout() - - self.wantsLayer = true - self.layer?.backgroundColor = bg.cgColor - } - - override func draw(_ dirtyRect: NSRect) { - super.draw(dirtyRect) - } - - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } -} - diff --git a/VimR-Workspace-Demo/AppDelegate.swift b/VimR-Workspace-Demo/AppDelegate.swift deleted file mode 100644 index 5b42ec09..00000000 --- a/VimR-Workspace-Demo/AppDelegate.swift +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Tae Won Ha - http://taewon.de - @hataewon - * See LICENSE - */ - -import Cocoa -import PureLayout - -@NSApplicationMain -class AppDelegate: NSObject, NSApplicationDelegate, WorkspaceDelegate { - - @IBOutlet weak var window: NSWindow! - - fileprivate var workspace: Workspace = Workspace(mainView: NSView()) - - @IBAction func toggleBars(_ sender: AnyObject!) { - workspace.toggleAllTools() - } - - @IBAction func toggleButtons(_ sender: AnyObject!) { - workspace.toggleToolButtons() - } - - func applicationDidFinishLaunching(_ aNotification: Notification) { - let contentView = self.window.contentView! - let workspace = Workspace(mainView: DummyView(NSColor.white)) - self.workspace = workspace - - contentView.addSubview(workspace) - workspace.autoPinEdgesToSuperviewEdges() - -// workspace.append(tool: dummyTool(title: "Top-1", color: .yellow), location: .top) - - workspace.append(tool: dummyTool(title: "Right-1", color: .magenta), location: .right) - workspace.append(tool: dummyTool(title: "Right-2", color: .black), location: .right) - - let menuItems = [ - NSMenuItem(title: "First", action: nil, keyEquivalent: ""), - NSMenuItem(title: "Second", action: nil, keyEquivalent: ""), - NSMenuItem(title: "Third", action: nil, keyEquivalent: ""), - NSMenuItem(title: "Fourth", action: nil, keyEquivalent: ""), - NSMenuItem(title: "Fifth", action: nil, keyEquivalent: ""), - ] - - let tool = dummyTool(title: "Left-1", color: .blue, customToolbar: DummyView(.orange), customMenu: menuItems) - - workspace.append(tool: tool, location: .left) - workspace.append(tool: dummyTool(title: "Left-2", color: .red), location: .left) - workspace.append(tool: dummyTool(title: "Left-3", color: .gray), location: .left) - - workspace.append(tool: dummyTool(title: "Bottom-1", color: .cyan), location: .bottom) - workspace.append(tool: dummyTool(title: "Bottom-2", color: .blue), location: .bottom) - - tool.toggle() - - // FIXME: GH-422 - workspace.delegate = self - } - - fileprivate func dummyTool(title: String, - color: NSColor, - customToolbar: CustomToolBar? = nil, - customMenu: [NSMenuItem] = []) -> WorkspaceTool - { - let config = WorkspaceTool.Config(title: title, - view: DummyView(color), - minimumDimension: 150, - withInnerToolbar: true, - customToolbar: customToolbar, - customMenuItems: customMenu) - - return WorkspaceTool(config) - } - - func resizeWillStart(workspace: Workspace, tool: WorkspaceTool?) { - NSLog("\(#function)") - } - - func resizeDidEnd(workspace: Workspace, tool: WorkspaceTool?) { - NSLog("\(#function)") - } - - func toggled(tool: WorkspaceTool) { - NSLog("\(#function)") - } - - func moved(tool: WorkspaceTool) { - NSLog("\(#function)") - } -} - -class DummyView: CustomToolBar { - - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - init(_ color: NSColor) { - super.init(frame: .zero) - self.configureForAutoLayout() - self.wantsLayer = true - self.layer?.backgroundColor = color.cgColor - } - - override func mouseDown(with event: NSEvent) { - NSLog("mouse down") - } -} diff --git a/VimR-Workspace-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/VimR-Workspace-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2db2b1c7..00000000 --- a/VimR-Workspace-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/VimR-Workspace-Demo/Base.lproj/MainMenu.xib b/VimR-Workspace-Demo/Base.lproj/MainMenu.xib deleted file mode 100644 index 28c90975..00000000 --- a/VimR-Workspace-Demo/Base.lproj/MainMenu.xib +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VimR-Workspace-Demo/Info.plist b/VimR-Workspace-Demo/Info.plist deleted file mode 100644 index a778bf5b..00000000 --- a/VimR-Workspace-Demo/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - SNAPSHOT-243 - CFBundleSignature - ???? - CFBundleVersion - 243 - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - Copyright © 2016 Tae Won Ha. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/NeoVimServer.xcscheme b/VimR.xcodeproj/xcshareddata/xcschemes/NeoVimServer.xcscheme deleted file mode 100644 index 99df3011..00000000 --- a/VimR.xcodeproj/xcshareddata/xcschemes/NeoVimServer.xcscheme +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVim.xcscheme b/VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVim.xcscheme deleted file mode 100644 index fe19b5bd..00000000 --- a/VimR.xcodeproj/xcshareddata/xcschemes/SwiftNeoVim.xcscheme +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme b/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme deleted file mode 100644 index 3e595659..00000000 --- a/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VimR.xcworkspace/contents.xcworkspacedata b/VimR.xcworkspace/contents.xcworkspacedata index 665ed3cb..e3126c82 100644 --- a/VimR.xcworkspace/contents.xcworkspacedata +++ b/VimR.xcworkspace/contents.xcworkspacedata @@ -1,6 +1,12 @@ + + + + @@ -10,7 +16,4 @@ - - diff --git a/MacNeovim/AppDelegate.swift b/VimR/MacNeovim/AppDelegate.swift similarity index 100% rename from MacNeovim/AppDelegate.swift rename to VimR/MacNeovim/AppDelegate.swift diff --git a/MacNeovim/Application.swift b/VimR/MacNeovim/Application.swift similarity index 100% rename from MacNeovim/Application.swift rename to VimR/MacNeovim/Application.swift diff --git a/MacNeovim/Assets.xcassets/AppIcon.appiconset/Contents.json b/VimR/MacNeovim/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from MacNeovim/Assets.xcassets/AppIcon.appiconset/Contents.json rename to VimR/MacNeovim/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/MacNeovim/Base.lproj/MainMenu.xib b/VimR/MacNeovim/Base.lproj/MainMenu.xib similarity index 100% rename from MacNeovim/Base.lproj/MainMenu.xib rename to VimR/MacNeovim/Base.lproj/MainMenu.xib diff --git a/MacNeovim/Base.lproj/NeoVimWindow.xib b/VimR/MacNeovim/Base.lproj/NeoVimWindow.xib similarity index 100% rename from MacNeovim/Base.lproj/NeoVimWindow.xib rename to VimR/MacNeovim/Base.lproj/NeoVimWindow.xib diff --git a/MacNeovim/Info.plist b/VimR/MacNeovim/Info.plist similarity index 100% rename from MacNeovim/Info.plist rename to VimR/MacNeovim/Info.plist diff --git a/MacNeovim/NeoVimWindow.swift b/VimR/MacNeovim/NeoVimWindow.swift similarity index 100% rename from MacNeovim/NeoVimWindow.swift rename to VimR/MacNeovim/NeoVimWindow.swift diff --git a/VimR.xcodeproj/project.pbxproj b/VimR/VimR.xcodeproj/project.pbxproj similarity index 52% rename from VimR.xcodeproj/project.pbxproj rename to VimR/VimR.xcodeproj/project.pbxproj index ea3080c3..8ade952d 100644 --- a/VimR.xcodeproj/project.pbxproj +++ b/VimR/VimR.xcodeproj/project.pbxproj @@ -14,8 +14,6 @@ 1929B0E0C3BC59F52713D5A2 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; }; 1929B0F599D1F62C7BE53D2C /* HttpServerService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B1DC584C89C477E83FA2 /* HttpServerService.swift */; }; 1929B1837C750CADB3A5BCB9 /* OpenQuicklyFileViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B1558455B3A74D93EF2A /* OpenQuicklyFileViewRow.swift */; }; - 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */; }; - 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */; }; 1929B20CE35B43BB1CE023BA /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BC2F05E9A5C0DB039739 /* Theme.swift */; }; 1929B29B95AD176D57942E08 /* UiRootReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B457B9D0FA4D21F3751E /* UiRootReducer.swift */; }; 1929B3217A7A3D79E28C80DB /* PrefWindowReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B49E6924847AD085C8C9 /* PrefWindowReducer.swift */; }; @@ -49,8 +47,6 @@ 1929B6D8F5FC723B7109031F /* OpenQuicklyReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B12CE56A9B36980288A4 /* OpenQuicklyReducer.swift */; }; 1929B71381946860626E5224 /* FileBrowserReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */; }; 1929B71610FF1DC6E459BA49 /* PreviewUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B8EF9A9F5ACC175452BD /* PreviewUtils.swift */; }; - 1929B728262BAA14FC93F6AC /* NeoVimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BF00B466B40629C2AABE /* NeoVimView.swift */; }; - 1929B7993C8DB7F59447DF5F /* NeoVimView+Draw.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B19207FBC2EBDF1B88F3 /* NeoVimView+Draw.swift */; }; 1929B8DDACEB28E6672AEC42 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6E01216D49BB9F3B6A3 /* MainWindow.swift */; }; 1929B8E90A1378E494D481E7 /* PrefUtilsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7BB3E4B3DC96284B686 /* PrefUtilsTest.swift */; }; 1929B8FB248D71BF88A35761 /* PreviewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6C6C7792B05164B0216 /* PreviewTool.swift */; }; @@ -63,119 +59,44 @@ 1929BAA19A6BEE73963BD4A8 /* NeoVimWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B868F11F398A159EF554 /* NeoVimWindow.swift */; }; 1929BAAD7336FDFF1F78E749 /* ScorerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BF69B01107F358CF7EAD /* ScorerTest.swift */; }; 1929BAE4900D72A7877741B1 /* PrefWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE168F31344B69E61B62 /* PrefWindow.swift */; }; - 1929BAE6B93067FD52DBE892 /* NeoVimView+Mouse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B4A088958A7B4FF152B7 /* NeoVimView+Mouse.swift */; }; 1929BAFF1E011321D3186EE6 /* UiRoot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD4149D5A25C82064DD8 /* UiRoot.swift */; }; - 1929BB0A840D93D1A13C25FD /* NeoVimView+MenuItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B4F65149D3C3E326DA65 /* NeoVimView+MenuItems.swift */; }; - 1929BB38525ECCEE8E39288A /* NeoVimView+Key.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BDF3167E15E7F3349798 /* NeoVimView+Key.swift */; }; 1929BB4A9B2FA42A64CCCC76 /* MainWindowReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD83A13BF133741766CC /* MainWindowReducer.swift */; }; 1929BBE28654E4307AF1E2FD /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BC2F05E9A5C0DB039739 /* Theme.swift */; }; - 1929BC9EF45463113EBF3BCB /* NeoVimView+UiBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B2AD3F9375F57F21AD58 /* NeoVimView+UiBridge.swift */; }; - 1929BCA03A420A83174FD7E7 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B96384F1ED979BD001C556F /* Logger.swift */; }; 1929BCC7908DD899999B70BE /* AppearancePrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BED01F5D94BFCA4CF80F /* AppearancePrefReducer.swift */; }; 1929BCC9D3604933DFF07E2E /* FileBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA5C7099CDEB04B76BA4 /* FileBrowser.swift */; }; 1929BCF7F7B9CC5499A3F506 /* AdvancedPrefReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7039C5689CE45F53888 /* AdvancedPrefReducer.swift */; }; - 1929BD294A33873BAE2804C0 /* NeoVimView+Resize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD05CA498FC3C229455E /* NeoVimView+Resize.swift */; }; 1929BD2F41D93ADFF43C1C98 /* NetUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B02440BC99C42F9EBD45 /* NetUtils.m */; }; 1929BD3878A3A47B8D685CD2 /* AppDelegateReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B7A68B7109CEFAF105E8 /* AppDelegateReducer.swift */; }; 1929BD3F9E609BFADB27584B /* Scorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9D510177918080BE39B /* Scorer.swift */; }; - 1929BDD4BFA4175D0A1B0BC3 /* NeoVimView+Api.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD8F08E21E3ECE9F84AB /* NeoVimView+Api.swift */; }; 1929BDFDBDA7180D02ACB37E /* RxSwiftCommonsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B6C215ACCBE12672A8D7 /* RxSwiftCommonsTest.swift */; }; 1929BE0DAEE9664C5BCFA211 /* States.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB6608B4F0E037CA0F4C /* States.swift */; }; 1929BE0F64A6CE5BCE2A5092 /* MainWindow+Delegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B714EB137AE448CE8ABD /* MainWindow+Delegates.swift */; }; 1929BE2F3E0182CC51F2763A /* ThemedTableSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD2CA8DD198A6BCDBCB7 /* ThemedTableSubviews.swift */; }; - 1929BE407A667356E29386EF /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B96384F1ED979BD001C556F /* Logger.swift */; }; 1929BEAE0592096BC1191B67 /* PrefPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B07A4A9209C88380E015 /* PrefPane.swift */; }; - 1929BEB90DCDAF7A2B68C886 /* ColorUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA6128BFDD54CA92F46E /* ColorUtils.swift */; }; 1929BEDE1BE950EDA9497363 /* GeneralPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB55946DAEBF55D24048 /* GeneralPref.swift */; }; 1929BEFEABA0448306CDB6D4 /* FileItemIgnorePatternTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BBC84557C8351EC6183E /* FileItemIgnorePatternTest.swift */; }; 1929BF03FD6465F289AA80B2 /* ToolsPref.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BB2AD21A10A0ECA66A5E /* ToolsPref.swift */; }; 1929BF4FF30D9A9DE82C3052 /* FileUtilsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B8042AC566CDF6C998A3 /* FileUtilsTest.swift */; }; - 1929BF81A40B4154D3EA33CE /* server_ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929B93013228985F509C8F6 /* server_ui.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 1929BFC70581084B5CE04A5B /* MatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BFE179BCA3C75A13D71B /* MatcherTests.swift */; }; 1929BFDE22D155F7C4B19E96 /* HtmlPreviewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B85023B042C485409CE1 /* HtmlPreviewTool.swift */; }; - 1F1000F81F0ABC0000CA3195 /* NeoVimView+Dragging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1000F71F0ABC0000CA3195 /* NeoVimView+Dragging.swift */; }; - 373416BD1F71879300A87A92 /* NeoVimView+TouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373416BC1F71879300A87A92 /* NeoVimView+TouchBar.swift */; }; 4B029F1A1D45E349004EE0D3 /* PrefWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B029F1C1D45E349004EE0D3 /* PrefWindow.xib */; }; - 4B0BCC941D70320C00D3CE65 /* Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B0BCC931D70320C00D3CE65 /* Logger.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4B12CD891F5A985600167D59 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B12CD881F5A985600167D59 /* AppDelegate.swift */; }; - 4B12CD8B1F5A985600167D59 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B12CD8A1F5A985600167D59 /* ViewController.swift */; }; - 4B12CD8D1F5A985600167D59 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B12CD8C1F5A985600167D59 /* Assets.xcassets */; }; - 4B12CD901F5A985700167D59 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B12CD8E1F5A985700167D59 /* Main.storyboard */; }; - 4B12CD961F5A988000167D59 /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B12CD951F5A988000167D59 /* WindowController.swift */; }; - 4B12CD971F5A98D500167D59 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; }; - 4B12CD981F5A98D500167D59 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B183E0E1E06E2940079E8A8 /* CocoaMarkdown.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */; }; - 4B183E101E06E29C0079E8A8 /* CocoaMarkdown.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B183E1B1E08748B0079E8A8 /* NeoVimAutoCommandEvent.generated.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B183E1A1E08748B0079E8A8 /* NeoVimAutoCommandEvent.generated.h */; settings = {ATTRIBUTES = (Public, ); }; }; 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 */; }; - 4B280EFF1D945DA5003FE725 /* AppKitCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70931D60E04200E12030 /* AppKitCommons.swift */; }; - 4B2A2BEC1D02261F0074CE9A /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BE21D0225800074CE9A /* RxCocoa.framework */; }; - 4B2A2BED1D02261F0074CE9A /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BE21D0225800074CE9A /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B2A2BEE1D02261F0074CE9A /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BE31D0225800074CE9A /* RxSwift.framework */; }; - 4B2A2BEF1D02261F0074CE9A /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BE31D0225800074CE9A /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B2A2BFA1D0351810074CE9A /* SwiftNeoVim.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2A2BF91D0351810074CE9A /* SwiftNeoVim.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B2A2BFE1D0351810074CE9A /* SwiftNeoVim.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; }; - 4B2A2BFF1D0351810074CE9A /* SwiftNeoVim.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B2A2C091D0352CB0074CE9A /* NeoVimUiBridgeProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2A2C061D0352CB0074CE9A /* NeoVimUiBridgeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B337FBB1DEB76F20020ADD2 /* CocoaFontAwesome.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B337FBA1DEB76F20020ADD2 /* CocoaFontAwesome.framework */; }; - 4B337FBC1DEB76F20020ADD2 /* CocoaFontAwesome.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B337FBA1DEB76F20020ADD2 /* CocoaFontAwesome.framework */; }; 4B37ADB91D6E471B00970D55 /* vimr in Resources */ = {isa = PBXBuildFile; fileRef = 4B37ADB81D6E471B00970D55 /* vimr */; }; 4B3965361DEB21300082D3C1 /* InnterToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3965351DEB21300082D3C1 /* InnterToolBar.swift */; }; - 4B3965371DEB21300082D3C1 /* InnterToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3965351DEB21300082D3C1 /* InnterToolBar.swift */; }; 4B3AC8941DB031C600AC5823 /* sparkle_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 4B3AC8931DB031C600AC5823 /* sparkle_pub.pem */; }; - 4B401B141D0454DC00D99EDC /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; }; - 4B401B161D0454E900D99EDC /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B401B1A1D046E0600D99EDC /* NeoVimViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B401B191D046E0600D99EDC /* NeoVimViewDelegate.swift */; }; - 4B40C64F1F05A05B00040B1B /* CocoaMarkdown.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */; }; 4B4147A31D97361400DD4A2C /* WorkspaceToolButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB489411D952CF6005BB0E8 /* WorkspaceToolButton.swift */; }; - 4B4192181D0C52D700A0BEB2 /* Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4192171D0C52D700A0BEB2 /* Grid.swift */; }; - 4B5011F81EBA67EB00F76C46 /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5011F71EBA67EB00F76C46 /* RxTest.framework */; }; - 4B5011F91EBA69E200F76C46 /* RxTest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B5011F71EBA67EB00F76C46 /* RxTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4B5011FB1EBA6FD700F76C46 /* UrlCommonsTest in Resources */ = {isa = PBXBuildFile; fileRef = 4B5011FA1EBA6FD700F76C46 /* UrlCommonsTest */; }; - 4B56F2931D29903F00C1F92E /* SwiftNeoVimTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B56F2921D29903F00C1F92E /* SwiftNeoVimTests.swift */; }; - 4B56F2951D29903F00C1F92E /* SwiftNeoVim.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; }; - 4B56F29D1D29926600C1F92E /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B56F29B1D29926600C1F92E /* Nimble.framework */; }; - 4B570DC21D303CAF006EDC21 /* NeoVimAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B570DC01D303CAF006EDC21 /* NeoVimAgent.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4B570DC31D303CAF006EDC21 /* NeoVimAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B570DC11D303CAF006EDC21 /* NeoVimAgent.m */; }; 4B6423961D8EFD7100FC78C8 /* Workspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423951D8EFD7100FC78C8 /* Workspace.swift */; }; 4B6423981D8EFDE000FC78C8 /* WorkspaceBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423971D8EFDE000FC78C8 /* WorkspaceBar.swift */; }; 4B64239A1D8EFE3000FC78C8 /* WorkspaceTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423991D8EFE3000FC78C8 /* WorkspaceTool.swift */; }; - 4B6423A21D8EFE7500FC78C8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423A11D8EFE7500FC78C8 /* AppDelegate.swift */; }; - 4B6423A41D8EFE7500FC78C8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B6423A31D8EFE7500FC78C8 /* Assets.xcassets */; }; - 4B6423A71D8EFE7500FC78C8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B6423A51D8EFE7500FC78C8 /* MainMenu.xib */; }; - 4B6423AC1D8EFE9800FC78C8 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; }; - 4B6423AD1D8EFE9800FC78C8 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B6423AF1D8EFEA800FC78C8 /* Workspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423951D8EFD7100FC78C8 /* Workspace.swift */; }; - 4B6423B01D8EFEA800FC78C8 /* WorkspaceBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423971D8EFDE000FC78C8 /* WorkspaceBar.swift */; }; - 4B6423B11D8EFEA800FC78C8 /* WorkspaceTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6423991D8EFE3000FC78C8 /* WorkspaceTool.swift */; }; 4B6A70941D60E04200E12030 /* AppKitCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70931D60E04200E12030 /* AppKitCommons.swift */; }; 4B6A70961D6100E300E12030 /* SwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70951D6100E300E12030 /* SwiftCommons.swift */; }; - 4B6A70991D65058A00E12030 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B56F29B1D29926600C1F92E /* Nimble.framework */; }; - 4B6A709C1D6507A000E12030 /* Nimble.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B56F29B1D29926600C1F92E /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4B77808D1EAA25FF00CB4E10 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B77808C1EAA25FF00CB4E10 /* AppDelegate.swift */; }; 4B7780911EAA25FF00CB4E10 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B7780901EAA25FF00CB4E10 /* Assets.xcassets */; }; - 4B7780991EAA262300CB4E10 /* SwiftNeoVim.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; }; - 4B77809A1EAA262300CB4E10 /* SwiftNeoVim.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B77809E1EAA265400CB4E10 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; }; - 4B77809F1EAA265400CB4E10 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B401B131D0454DC00D99EDC /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4B7780A21EAA2D3100CB4E10 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B7780A41EAA2D3100CB4E10 /* MainMenu.xib */; }; 4B7780A71EAA2E3200CB4E10 /* NeoVimWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B7780A91EAA2E3200CB4E10 /* NeoVimWindow.xib */; }; - 4B854A1D1D31447C00E08DE1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B854A1C1D31447C00E08DE1 /* main.m */; }; - 4B8AC0441DBCB3A2007CCC9B /* NeoVimObjectsExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8AC0431DBCB3A1007CCC9B /* NeoVimObjectsExtensions.swift */; }; - 4B8C7C761F05A04400F25BE8 /* CocoaMarkdown.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B90EFC91FCD6CE2008A39E0 /* MsgPackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90EFCA1FCD6CE2008A39E0 /* MsgPackRpc.framework */; }; - 4B90EFCB1FCD6CE5008A39E0 /* NvimMsgPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90EFCC1FCD6CE5008A39E0 /* NvimMsgPack.framework */; }; - 4B90EFCD1FCD6CEB008A39E0 /* MsgPackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90EFCA1FCD6CE2008A39E0 /* MsgPackRpc.framework */; }; - 4B90EFCE1FCD6CEE008A39E0 /* NvimMsgPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90EFCC1FCD6CE5008A39E0 /* NvimMsgPack.framework */; }; - 4B90EFE31FCF54D2008A39E0 /* NvimMsgPack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90EFCC1FCD6CE5008A39E0 /* NvimMsgPack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B90EFE41FCF54D2008A39E0 /* MsgPackRpc.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B90EFCA1FCD6CE2008A39E0 /* MsgPackRpc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B91FFF41DEB772200447068 /* CocoaFontAwesome.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B337FBA1DEB76F20020ADD2 /* CocoaFontAwesome.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B91FFF61DEB772B00447068 /* CocoaFontAwesome.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B337FBA1DEB76F20020ADD2 /* CocoaFontAwesome.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B96384C1ED9793B001C556F /* NeoVimAutoCommandEvent.generated.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B96384B1ED9793B001C556F /* NeoVimAutoCommandEvent.generated.m */; }; - 4B96384E1ED9797F001C556F /* NeoVimUiBridgeProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B96384D1ED9797F001C556F /* NeoVimUiBridgeProtocol.m */; }; - 4B9638501ED979BD001C556F /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B96384F1ED979BD001C556F /* Logger.swift */; }; 4B96FB3B1EBBC56F00E4E164 /* FileItemIgnorePattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B69499B2569793350CEC /* FileItemIgnorePattern.swift */; }; 4B96FB3C1EBBC56F00E4E164 /* FileUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA8AC40B901B20F20B71 /* FileUtils.swift */; }; 4B96FB3D1EBBC56F00E4E164 /* Matcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BEEB33113B0E33C3830F /* Matcher.swift */; }; @@ -184,83 +105,56 @@ 4B96FB401EBBC56F00E4E164 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; }; 4B96FB411EBBC56F00E4E164 /* RxSwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB1BEA81D48773200463C29 /* RxSwiftCommons.swift */; }; 4B96FB421EBBC56F00E4E164 /* SwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70951D6100E300E12030 /* SwiftCommons.swift */; }; - 4B96FB431EBBC5C300E4E164 /* SwiftNeoVim.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; }; - 4B96FB441EBBC5E300E4E164 /* SwiftNeoVim.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B96FB451EBBC6EA00E4E164 /* RxSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B2A2BE31D0225800074CE9A /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B96FB461EBBC6EE00E4E164 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2A2BE31D0225800074CE9A /* RxSwift.framework */; }; 4B97E2CC1D33F53D00FC0660 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B97E2CE1D33F53D00FC0660 /* MainWindow.xib */; }; - 4B9A15241D2993DA009F9F67 /* Nimble.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B56F29B1D29926600C1F92E /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4B9A15261D2993DF009F9F67 /* SwiftNeoVim.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BB1BEA91D48773200463C29 /* RxSwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB1BEA81D48773200463C29 /* RxSwiftCommons.swift */; }; 4BB409E51DD68CCC005F39A2 /* FileBrowserMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB409E71DD68CCC005F39A2 /* FileBrowserMenu.xib */; }; 4BB409EE1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB409ED1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift */; }; - 4BB409EF1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB409ED1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift */; }; - 4BB489431D952CF6005BB0E8 /* WorkspaceToolButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB489411D952CF6005BB0E8 /* WorkspaceToolButton.swift */; }; - 4BB727141E97A718001571C1 /* CocoaMarkdown.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */; }; - 4BB727151E97A718001571C1 /* CocoaMarkdown.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4BB7F3931F9D261500624F61 /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB7F3911F9D260B00624F61 /* Swifter.framework */; }; - 4BB7F3941F9D261500624F61 /* Swifter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB7F3911F9D260B00624F61 /* Swifter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4BCADE081D11ED12004DAD0F /* CocoaExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCADE071D11ED12004DAD0F /* CocoaExtensions.swift */; }; - 4BDCFACB1D31449700F62670 /* NeoVimServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDCFACA1D31449700F62670 /* NeoVimServer.m */; }; - 4BDCFAEA1D31486E00F62670 /* NeoVimMsgIds.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDCFAE91D3147A300F62670 /* NeoVimMsgIds.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4BDCFAED1D315CB800F62670 /* runtime in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA6621D00157A00673FDF /* runtime */; }; - 4BDCFAEF1D315CF200F62670 /* NeoVimServer in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B854A1A1D31447C00E08DE1 /* NeoVimServer */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 4BDD056A1DB0CAB700D1B405 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDD05691DB0CAB700D1B405 /* Sparkle.framework */; }; - 4BDD056B1DB0CACB00D1B405 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDD05691DB0CAB700D1B405 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4BDD05851DBBC50000D1B405 /* NeoVimBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDD057F1DBBC50000D1B405 /* NeoVimBuffer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4BDD05861DBBC50000D1B405 /* NeoVimBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDD05801DBBC50000D1B405 /* NeoVimBuffer.m */; }; - 4BDD05871DBBC50000D1B405 /* NeoVimBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDD05801DBBC50000D1B405 /* NeoVimBuffer.m */; }; - 4BDD05881DBBC50000D1B405 /* NeoVimTab.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDD05811DBBC50000D1B405 /* NeoVimTab.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4BDD05891DBBC50000D1B405 /* NeoVimTab.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDD05821DBBC50000D1B405 /* NeoVimTab.m */; }; - 4BDD058A1DBBC50000D1B405 /* NeoVimTab.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDD05821DBBC50000D1B405 /* NeoVimTab.m */; }; - 4BDD058B1DBBC50000D1B405 /* NeoVimWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDD05831DBBC50000D1B405 /* NeoVimWindow.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4BDD058C1DBBC50000D1B405 /* NeoVimWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDD05841DBBC50000D1B405 /* NeoVimWindow.m */; }; - 4BDD058D1DBBC50000D1B405 /* NeoVimWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDD05841DBBC50000D1B405 /* NeoVimWindow.m */; }; - 4BDF50081D7607BF00D8FBC3 /* EonilFileSystemEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDF50071D7607BF00D8FBC3 /* EonilFileSystemEvents.framework */; }; + 4BC164261FD2DEE1001903BE /* MsgPackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC164291FD2DEE1001903BE /* MsgPackRpc.framework */; }; + 4BC164271FD2DEE1001903BE /* NvimMsgPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642A1FD2DEE1001903BE /* NvimMsgPack.framework */; }; + 4BC164281FD2DEE1001903BE /* NvimView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; }; + 4BC1642C1FD2DEEA001903BE /* MsgPackRpc.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC164291FD2DEE1001903BE /* MsgPackRpc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BC1642D1FD2DEEA001903BE /* NvimMsgPack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642A1FD2DEE1001903BE /* NvimMsgPack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BC1642E1FD2DEEA001903BE /* NvimView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BDF500C1D760A3500D8FBC3 /* FileUtilsTest in Resources */ = {isa = PBXBuildFile; fileRef = 4BDF500B1D760A3500D8FBC3 /* FileUtilsTest */; }; - 4BDF50121D760B7200D8FBC3 /* EonilFileSystemEvents.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDF50071D7607BF00D8FBC3 /* EonilFileSystemEvents.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4BDF50171D77540900D8FBC3 /* OpenQuicklyWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BDF50191D77540900D8FBC3 /* OpenQuicklyWindow.xib */; }; - 4BDF641C1D0887C100D47E1D /* TextDrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDF641A1D0887C100D47E1D /* TextDrawer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4BDF641D1D0887C100D47E1D /* TextDrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDF641B1D0887C100D47E1D /* TextDrawer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 4BDF64241D08CAB000D47E1D /* MMCoreTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDF64221D08CAB000D47E1D /* MMCoreTextView.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4BDF64251D08CAB000D47E1D /* MMCoreTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDF64231D08CAB000D47E1D /* MMCoreTextView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 4BE45C1D1FD2DBD2005C0A95 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE45C1C1FD2DBD2005C0A95 /* Logger.swift */; }; 4BEBA5091CFF374B00673FDF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEBA5081CFF374B00673FDF /* AppDelegate.swift */; }; 4BEBA50B1CFF374B00673FDF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA50A1CFF374B00673FDF /* Assets.xcassets */; }; 4BEBA50E1CFF374B00673FDF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA50C1CFF374B00673FDF /* MainMenu.xib */; }; - 4BEE79171D16D3800012EDAA /* CellAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE79161D16D3800012EDAA /* CellAttributes.swift */; }; 4BF07EE41D51326A009BECEB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4BF07EE61D51326A009BECEB /* Credits.rtf */; }; - 4BF6E29C1D34153C0053FA76 /* KeyUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF6E29B1D34153C0053FA76 /* KeyUtils.swift */; }; + 4BF18C391FD2E2AB00DF95D1 /* EonilFileSystemEvents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C311FD2E2AA00DF95D1 /* EonilFileSystemEvents.framework */; }; + 4BF18C3A1FD2E2AB00DF95D1 /* PureLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C321FD2E2AA00DF95D1 /* PureLayout.framework */; }; + 4BF18C3B1FD2E2AB00DF95D1 /* CocoaMarkdown.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */; }; + 4BF18C3C1FD2E2AB00DF95D1 /* CocoaFontAwesome.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C341FD2E2AA00DF95D1 /* CocoaFontAwesome.framework */; }; + 4BF18C3D1FD2E2AB00DF95D1 /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C351FD2E2AB00DF95D1 /* Swifter.framework */; }; + 4BF18C3E1FD2E2AB00DF95D1 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */; }; + 4BF18C3F1FD2E2AB00DF95D1 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; }; + 4BF18C401FD2E2AB00DF95D1 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C381FD2E2AB00DF95D1 /* RxCocoa.framework */; }; + 4BF18C411FD2E2C900DF95D1 /* CocoaFontAwesome.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C341FD2E2AA00DF95D1 /* CocoaFontAwesome.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C421FD2E2C900DF95D1 /* CocoaMarkdown.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C431FD2E2C900DF95D1 /* EonilFileSystemEvents.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C311FD2E2AA00DF95D1 /* EonilFileSystemEvents.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C441FD2E2C900DF95D1 /* PureLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C321FD2E2AA00DF95D1 /* PureLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C451FD2E2C900DF95D1 /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C381FD2E2AB00DF95D1 /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C461FD2E2C900DF95D1 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C471FD2E2C900DF95D1 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C481FD2E2C900DF95D1 /* Swifter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C351FD2E2AB00DF95D1 /* Swifter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C4A1FD2E2DE00DF95D1 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C491FD2E2DE00DF95D1 /* Nimble.framework */; }; + 4BF18C4C1FD2E4CE00DF95D1 /* NvimView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; }; + 4BF18C4D1FD2E4D200DF95D1 /* MsgPackRpc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC164291FD2DEE1001903BE /* MsgPackRpc.framework */; }; + 4BF18C4E1FD2E4D200DF95D1 /* NvimMsgPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642A1FD2DEE1001903BE /* NvimMsgPack.framework */; }; + 4BF18C4F1FD2E4F100DF95D1 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */; }; + 4BF18C511FD2E4F200DF95D1 /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C501FD2E4F200DF95D1 /* RxTest.framework */; }; + 4BF18C521FD2E52300DF95D1 /* RxTest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF18C501FD2E4F200DF95D1 /* RxTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C531FD2E52300DF95D1 /* Nimble.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF18C491FD2E2DE00DF95D1 /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C541FD2E52300DF95D1 /* RxSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C551FD2E52300DF95D1 /* MsgPackRpc.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BC164291FD2DEE1001903BE /* MsgPackRpc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C561FD2E52300DF95D1 /* NvimMsgPack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BC1642A1FD2DEE1001903BE /* NvimMsgPack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C571FD2E52300DF95D1 /* NvimView.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF18C581FD2E53400DF95D1 /* CocoaMarkdown.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */; }; + 4BF18C591FD2E53B00DF95D1 /* CocoaMarkdown.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 4B2A2BFC1D0351810074CE9A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEBA4FD1CFF374B00673FDF /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4B2A2BF61D0351810074CE9A; - remoteInfo = SwiftNeoVim; - }; - 4B56F2961D29903F00C1F92E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEBA4FD1CFF374B00673FDF /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4B2A2BF61D0351810074CE9A; - remoteInfo = SwiftNeoVim; - }; - 4B77809B1EAA262300CB4E10 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEBA4FD1CFF374B00673FDF /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4B2A2BF61D0351810074CE9A; - remoteInfo = SwiftNeoVim; - }; - 4BDCFADD1D31465100F62670 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEBA4FD1CFF374B00673FDF /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4B854A191D31447C00E08DE1; - remoteInfo = NeoVimServer; - }; 4BEBA5151CFF374B00673FDF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4BEBA4FD1CFF374B00673FDF /* Project object */; @@ -271,47 +165,23 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 4B12CD991F5A98D500167D59 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 4B12CD981F5A98D500167D59 /* PureLayout.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; 4B2A2BF01D02261F0074CE9A /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 4B90EFE31FCF54D2008A39E0 /* NvimMsgPack.framework in Embed Frameworks */, - 4B90EFE41FCF54D2008A39E0 /* MsgPackRpc.framework in Embed Frameworks */, - 4BDD056B1DB0CACB00D1B405 /* Sparkle.framework in Embed Frameworks */, - 4BDF50121D760B7200D8FBC3 /* EonilFileSystemEvents.framework in Embed Frameworks */, - 4B91FFF61DEB772B00447068 /* CocoaFontAwesome.framework in Embed Frameworks */, - 4B183E101E06E29C0079E8A8 /* CocoaMarkdown.framework in Embed Frameworks */, - 4B2A2BFF1D0351810074CE9A /* SwiftNeoVim.framework in Embed Frameworks */, - 4B2A2BEF1D02261F0074CE9A /* RxSwift.framework in Embed Frameworks */, - 4BB7F3941F9D261500624F61 /* Swifter.framework in Embed Frameworks */, - 4B401B161D0454E900D99EDC /* PureLayout.framework in Embed Frameworks */, - 4B2A2BED1D02261F0074CE9A /* RxCocoa.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 4B6423AE1D8EFE9800FC78C8 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 4BB727151E97A718001571C1 /* CocoaMarkdown.framework in Embed Frameworks */, - 4B6423AD1D8EFE9800FC78C8 /* PureLayout.framework in Embed Frameworks */, - 4B91FFF41DEB772200447068 /* CocoaFontAwesome.framework in Embed Frameworks */, + 4BF18C411FD2E2C900DF95D1 /* CocoaFontAwesome.framework in Embed Frameworks */, + 4BF18C421FD2E2C900DF95D1 /* CocoaMarkdown.framework in Embed Frameworks */, + 4BF18C431FD2E2C900DF95D1 /* EonilFileSystemEvents.framework in Embed Frameworks */, + 4BF18C441FD2E2C900DF95D1 /* PureLayout.framework in Embed Frameworks */, + 4BF18C451FD2E2C900DF95D1 /* RxCocoa.framework in Embed Frameworks */, + 4BF18C461FD2E2C900DF95D1 /* RxSwift.framework in Embed Frameworks */, + 4BF18C471FD2E2C900DF95D1 /* Sparkle.framework in Embed Frameworks */, + 4BF18C481FD2E2C900DF95D1 /* Swifter.framework in Embed Frameworks */, + 4BC1642C1FD2DEEA001903BE /* MsgPackRpc.framework in Embed Frameworks */, + 4BC1642D1FD2DEEA001903BE /* NvimMsgPack.framework in Embed Frameworks */, + 4BC1642E1FD2DEEA001903BE /* NvimView.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -322,11 +192,13 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4B8C7C761F05A04400F25BE8 /* CocoaMarkdown.framework in CopyFiles */, - 4B96FB451EBBC6EA00E4E164 /* RxSwift.framework in CopyFiles */, - 4B96FB441EBBC5E300E4E164 /* SwiftNeoVim.framework in CopyFiles */, - 4B5011F91EBA69E200F76C46 /* RxTest.framework in CopyFiles */, - 4B6A709C1D6507A000E12030 /* Nimble.framework in CopyFiles */, + 4BF18C591FD2E53B00DF95D1 /* CocoaMarkdown.framework in CopyFiles */, + 4BF18C521FD2E52300DF95D1 /* RxTest.framework in CopyFiles */, + 4BF18C531FD2E52300DF95D1 /* Nimble.framework in CopyFiles */, + 4BF18C541FD2E52300DF95D1 /* RxSwift.framework in CopyFiles */, + 4BF18C551FD2E52300DF95D1 /* MsgPackRpc.framework in CopyFiles */, + 4BF18C561FD2E52300DF95D1 /* NvimMsgPack.framework in CopyFiles */, + 4BF18C571FD2E52300DF95D1 /* NvimView.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -336,42 +208,10 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4B77809F1EAA265400CB4E10 /* PureLayout.framework in Embed Frameworks */, - 4B77809A1EAA262300CB4E10 /* SwiftNeoVim.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - 4B854A061D3137B500E08DE1 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 13; - files = ( - 4BDCFAEF1D315CF200F62670 /* NeoVimServer in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B854A181D31447C00E08DE1 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; - 4B9A15231D2993D0009F9F67 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 4B9A15261D2993DF009F9F67 /* SwiftNeoVim.framework in CopyFiles */, - 4B9A15241D2993DA009F9F67 /* Nimble.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -380,26 +220,18 @@ 1929B067B3247675BCD09218 /* MainWindow+Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MainWindow+Actions.swift"; sourceTree = ""; }; 1929B07A4A9209C88380E015 /* PrefPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefPane.swift; sourceTree = ""; }; 1929B0EB3F49C42A57D083AF /* GeneralPrefReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPrefReducer.swift; sourceTree = ""; }; - 1929B0EEBE4A765934AF8335 /* DataWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataWrapper.h; sourceTree = ""; }; 1929B0FBFB766042CF06E463 /* AppearancePref.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearancePref.swift; sourceTree = ""; }; 1929B11D672134E52A256A7F /* UrlCommonsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UrlCommonsTest.swift; sourceTree = ""; }; 1929B12CE56A9B36980288A4 /* OpenQuicklyReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyReducer.swift; sourceTree = ""; }; 1929B1558455B3A74D93EF2A /* OpenQuicklyFileViewRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyFileViewRow.swift; sourceTree = ""; }; - 1929B15B7EDC9B0F40E5E95C /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; - 1929B19207FBC2EBDF1B88F3 /* NeoVimView+Draw.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Draw.swift"; sourceTree = ""; }; - 1929B1A51F076E088EF4CCA4 /* server_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_globals.h; sourceTree = ""; }; 1929B1DC584C89C477E83FA2 /* HttpServerService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpServerService.swift; sourceTree = ""; }; - 1929B2AD3F9375F57F21AD58 /* NeoVimView+UiBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+UiBridge.swift"; sourceTree = ""; }; 1929B34FC23D805A8B29E8F7 /* Context.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Context.swift; sourceTree = ""; }; 1929B364460D86F17E80943C /* PrefService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefService.swift; sourceTree = ""; }; 1929B365A6434354B568B04F /* FileMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileMonitor.swift; sourceTree = ""; }; 1929B457B9D0FA4D21F3751E /* UiRootReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UiRootReducer.swift; sourceTree = ""; }; 1929B49E6924847AD085C8C9 /* PrefWindowReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefWindowReducer.swift; sourceTree = ""; }; - 1929B4A088958A7B4FF152B7 /* NeoVimView+Mouse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Mouse.swift"; sourceTree = ""; }; - 1929B4F65149D3C3E326DA65 /* NeoVimView+MenuItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+MenuItems.swift"; sourceTree = ""; }; 1929B5046239709E33516F5C /* Pref128ToCurrentConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pref128ToCurrentConverter.swift; sourceTree = ""; }; 1929B56C8ED31834BA9D8543 /* FileItemUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemUtils.swift; sourceTree = ""; }; - 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CocoaCategories.m; sourceTree = ""; }; 1929B5D45C9792BBE76B8AFF /* StringCommonsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringCommonsTest.swift; sourceTree = ""; }; 1929B5E3E722EFA5172E3455 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; 1929B617C229B19DB3E987B8 /* PreviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewService.swift; sourceTree = ""; }; @@ -422,93 +254,50 @@ 1929B85023B042C485409CE1 /* HtmlPreviewTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlPreviewTool.swift; sourceTree = ""; }; 1929B868F11F398A159EF554 /* NeoVimWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimWindow.swift; sourceTree = ""; }; 1929B8EF9A9F5ACC175452BD /* PreviewUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewUtils.swift; sourceTree = ""; }; - 1929B93013228985F509C8F6 /* server_ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = server_ui.m; sourceTree = ""; }; 1929B9355C892BEBA7496C71 /* DictionaryCommonsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DictionaryCommonsTest.swift; sourceTree = ""; }; 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationCommons.swift; sourceTree = ""; }; 1929B9D510177918080BE39B /* Scorer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Scorer.swift; sourceTree = ""; }; 1929BA42AB6F1BF631B57399 /* SerializableStates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SerializableStates.swift; sourceTree = ""; }; 1929BA43449BA41666CD55ED /* OpenedFileList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenedFileList.swift; sourceTree = ""; }; 1929BA5C7099CDEB04B76BA4 /* FileBrowser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowser.swift; sourceTree = ""; }; - 1929BA6128BFDD54CA92F46E /* ColorUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorUtils.swift; sourceTree = ""; }; 1929BA8AC40B901B20F20B71 /* FileUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = ""; }; 1929BADEB143008EFA6F3318 /* NetUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetUtils.h; sourceTree = ""; }; 1929BAF13FAD5DA8D3762367 /* ArrayCommonsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayCommonsTest.swift; sourceTree = ""; }; 1929BB2AD21A10A0ECA66A5E /* ToolsPref.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ToolsPref.swift; sourceTree = ""; }; 1929BB55946DAEBF55D24048 /* GeneralPref.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPref.swift; sourceTree = ""; }; 1929BB6608B4F0E037CA0F4C /* States.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = States.swift; sourceTree = ""; }; - 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataWrapper.m; sourceTree = ""; }; 1929BBC84557C8351EC6183E /* FileItemIgnorePatternTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileItemIgnorePatternTest.swift; sourceTree = ""; }; 1929BBE0A534F2F6009D31BE /* AdvencedPref.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvencedPref.swift; sourceTree = ""; }; 1929BC2F05E9A5C0DB039739 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = ""; }; 1929BCE3E156C06EDF1F2806 /* FileOutlineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileOutlineView.swift; sourceTree = ""; }; - 1929BD05CA498FC3C229455E /* NeoVimView+Resize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Resize.swift"; sourceTree = ""; }; 1929BD2CA8DD198A6BCDBCB7 /* ThemedTableSubviews.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemedTableSubviews.swift; sourceTree = ""; }; 1929BD4149D5A25C82064DD8 /* UiRoot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UiRoot.swift; sourceTree = ""; }; 1929BD83A13BF133741766CC /* MainWindowReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowReducer.swift; sourceTree = ""; }; - 1929BD8F08E21E3ECE9F84AB /* NeoVimView+Api.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Api.swift"; sourceTree = ""; }; 1929BDC3F82CB4CB4FE56D1B /* ImageAndTextTableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAndTextTableCell.swift; sourceTree = ""; }; 1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowserReducer.swift; sourceTree = ""; }; - 1929BDF3167E15E7F3349798 /* NeoVimView+Key.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Key.swift"; sourceTree = ""; }; 1929BDF9EBAF1D9D44399045 /* ScoredFileItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScoredFileItem.swift; sourceTree = ""; }; 1929BE168F31344B69E61B62 /* PrefWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefWindow.swift; sourceTree = ""; }; 1929BE37AA2843779CAFA76F /* PreviewReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewReducer.swift; sourceTree = ""; }; 1929BE5AEA3D0980860EED50 /* HtmlPreviewToolReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HtmlPreviewToolReducer.swift; sourceTree = ""; }; - 1929BE69CF9AB1A10D0DD4F2 /* CocoaCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaCategories.h; sourceTree = ""; }; 1929BED01F5D94BFCA4CF80F /* AppearancePrefReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearancePrefReducer.swift; sourceTree = ""; }; 1929BEDE7F92BC7B49E802AF /* OpenQuicklyFilterOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenQuicklyFilterOperation.swift; sourceTree = ""; }; 1929BEEB33113B0E33C3830F /* Matcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Matcher.swift; sourceTree = ""; }; - 1929BF00B466B40629C2AABE /* NeoVimView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimView.swift; sourceTree = ""; }; 1929BF69B01107F358CF7EAD /* ScorerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScorerTest.swift; sourceTree = ""; }; 1929BFB0F294F3714D5E095F /* PreviewToolReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewToolReducer.swift; sourceTree = ""; }; 1929BFC0A5A9C6DB09BE1368 /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = ""; }; 1929BFE179BCA3C75A13D71B /* MatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatcherTests.swift; sourceTree = ""; }; - 1F1000F71F0ABC0000CA3195 /* NeoVimView+Dragging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NeoVimView+Dragging.swift"; sourceTree = ""; }; - 373416BC1F71879300A87A92 /* NeoVimView+TouchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NeoVimView+TouchBar.swift"; sourceTree = ""; }; 4B029F1B1D45E349004EE0D3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PrefWindow.xib; sourceTree = ""; }; - 4B0BCC931D70320C00D3CE65 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logger.h; path = VimR/Logger.h; sourceTree = SOURCE_ROOT; }; - 4B12CD861F5A985600167D59 /* ThemedWindow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ThemedWindow.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B12CD881F5A985600167D59 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 4B12CD8A1F5A985600167D59 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 4B12CD8C1F5A985600167D59 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 4B12CD8F1F5A985700167D59 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 4B12CD911F5A985700167D59 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4B12CD951F5A988000167D59 /* WindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = ""; }; - 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaMarkdown.framework; path = Carthage/Build/Mac/CocoaMarkdown.framework; sourceTree = SOURCE_ROOT; }; - 4B183E1A1E08748B0079E8A8 /* NeoVimAutoCommandEvent.generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimAutoCommandEvent.generated.h; sourceTree = ""; }; 4B19BEFA1E110183007E823C /* markdown */ = {isa = PBXFileReference; lastKnownFileType = folder; path = markdown; sourceTree = ""; }; 4B19BEFB1E110183007E823C /* preview */ = {isa = PBXFileReference; lastKnownFileType = folder; path = preview; sourceTree = ""; }; - 4B1BB3521D16C5E500CA4FEF /* InputTestView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputTestView.swift; sourceTree = ""; }; 4B238BE01D3BF24200CBDD98 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; - 4B2A2BE21D0225800074CE9A /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = SOURCE_ROOT; }; - 4B2A2BE31D0225800074CE9A /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = SOURCE_ROOT; }; - 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftNeoVim.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B2A2BF91D0351810074CE9A /* SwiftNeoVim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftNeoVim.h; sourceTree = ""; }; - 4B2A2BFB1D0351810074CE9A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4B2A2C061D0352CB0074CE9A /* NeoVimUiBridgeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimUiBridgeProtocol.h; sourceTree = ""; }; 4B2A2C0D1D0353750074CE9A /* Bridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = ""; }; - 4B337FBA1DEB76F20020ADD2 /* CocoaFontAwesome.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaFontAwesome.framework; path = Carthage/Build/Mac/CocoaFontAwesome.framework; sourceTree = SOURCE_ROOT; }; 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 = ""; }; 4B3AC8931DB031C600AC5823 /* sparkle_pub.pem */ = {isa = PBXFileReference; fileEncoding = 1; lastKnownFileType = text; path = sparkle_pub.pem; sourceTree = ""; }; - 4B401B131D0454DC00D99EDC /* PureLayout.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PureLayout.framework; path = Carthage/Build/Mac/PureLayout.framework; sourceTree = SOURCE_ROOT; }; - 4B401B191D046E0600D99EDC /* NeoVimViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimViewDelegate.swift; sourceTree = ""; }; - 4B4192171D0C52D700A0BEB2 /* Grid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Grid.swift; sourceTree = ""; }; - 4B5011F71EBA67EB00F76C46 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/Mac/RxTest.framework; sourceTree = SOURCE_ROOT; }; 4B5011FA1EBA6FD700F76C46 /* UrlCommonsTest */ = {isa = PBXFileReference; lastKnownFileType = folder; path = UrlCommonsTest; sourceTree = ""; }; - 4B56F2901D29903F00C1F92E /* SwiftNeoVimTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftNeoVimTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B56F2921D29903F00C1F92E /* SwiftNeoVimTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftNeoVimTests.swift; sourceTree = ""; }; - 4B56F2941D29903F00C1F92E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4B56F29B1D29926600C1F92E /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/Mac/Nimble.framework; sourceTree = SOURCE_ROOT; }; - 4B570DC01D303CAF006EDC21 /* NeoVimAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimAgent.h; sourceTree = ""; }; - 4B570DC11D303CAF006EDC21 /* NeoVimAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimAgent.m; sourceTree = ""; }; 4B6423951D8EFD7100FC78C8 /* Workspace.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Workspace.swift; path = Workspace/Workspace.swift; sourceTree = ""; }; 4B6423971D8EFDE000FC78C8 /* WorkspaceBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WorkspaceBar.swift; path = Workspace/WorkspaceBar.swift; sourceTree = ""; }; 4B6423991D8EFE3000FC78C8 /* WorkspaceTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WorkspaceTool.swift; path = Workspace/WorkspaceTool.swift; sourceTree = ""; }; - 4B64239F1D8EFE7500FC78C8 /* VimR-Workspace-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VimR-Workspace-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B6423A11D8EFE7500FC78C8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 4B6423A31D8EFE7500FC78C8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 4B6423A61D8EFE7500FC78C8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 4B6423A81D8EFE7500FC78C8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4B6A70931D60E04200E12030 /* AppKitCommons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppKitCommons.swift; sourceTree = ""; }; 4B6A70951D6100E300E12030 /* SwiftCommons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftCommons.swift; sourceTree = ""; }; 4B77808A1EAA25FF00CB4E10 /* MacNeovim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacNeovim.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -517,39 +306,17 @@ 4B7780951EAA25FF00CB4E10 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4B7780A31EAA2D3100CB4E10 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 4B7780A81EAA2E3200CB4E10 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NeoVimWindow.xib; sourceTree = ""; }; - 4B854A1A1D31447C00E08DE1 /* NeoVimServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = NeoVimServer; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B854A1C1D31447C00E08DE1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 4B8AC0431DBCB3A1007CCC9B /* NeoVimObjectsExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeoVimObjectsExtensions.swift; sourceTree = ""; }; - 4B90EFCA1FCD6CE2008A39E0 /* MsgPackRpc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MsgPackRpc.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B90EFCC1FCD6CE5008A39E0 /* NvimMsgPack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimMsgPack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B96384B1ED9793B001C556F /* NeoVimAutoCommandEvent.generated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimAutoCommandEvent.generated.m; sourceTree = ""; }; - 4B96384D1ED9797F001C556F /* NeoVimUiBridgeProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimUiBridgeProtocol.m; sourceTree = ""; }; - 4B96384F1ED979BD001C556F /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; 4B97E2CD1D33F53D00FC0660 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainWindow.xib; sourceTree = ""; }; 4BB1BEA81D48773200463C29 /* RxSwiftCommons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxSwiftCommons.swift; sourceTree = ""; }; 4BB409E61DD68CCC005F39A2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FileBrowserMenu.xib; sourceTree = ""; }; 4BB409ED1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProxyWorkspaceBar.swift; path = Workspace/ProxyWorkspaceBar.swift; sourceTree = ""; }; 4BB489411D952CF6005BB0E8 /* WorkspaceToolButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WorkspaceToolButton.swift; path = Workspace/WorkspaceToolButton.swift; sourceTree = ""; }; - 4BB7F3911F9D260B00624F61 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = Carthage/Build/Mac/Swifter.framework; sourceTree = ""; }; - 4BCADE071D11ED12004DAD0F /* CocoaExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CocoaExtensions.swift; sourceTree = ""; }; - 4BCF638F1D323CFD00F15CE4 /* nvim */ = {isa = PBXFileReference; lastKnownFileType = folder; name = nvim; path = neovim/src/nvim; sourceTree = SOURCE_ROOT; }; - 4BDCFAC91D31449700F62670 /* NeoVimServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NeoVimServer.h; sourceTree = ""; }; - 4BDCFACA1D31449700F62670 /* NeoVimServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NeoVimServer.m; sourceTree = ""; }; - 4BDCFAE91D3147A300F62670 /* NeoVimMsgIds.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NeoVimMsgIds.h; sourceTree = ""; }; - 4BDD05691DB0CAB700D1B405 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Carthage/Build/Mac/Sparkle.framework; sourceTree = SOURCE_ROOT; }; - 4BDD057F1DBBC50000D1B405 /* NeoVimBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NeoVimBuffer.h; path = NeoVimServer/NeoVimBuffer.h; sourceTree = SOURCE_ROOT; }; - 4BDD05801DBBC50000D1B405 /* NeoVimBuffer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NeoVimBuffer.m; path = NeoVimServer/NeoVimBuffer.m; sourceTree = SOURCE_ROOT; }; - 4BDD05811DBBC50000D1B405 /* NeoVimTab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NeoVimTab.h; path = NeoVimServer/NeoVimTab.h; sourceTree = SOURCE_ROOT; }; - 4BDD05821DBBC50000D1B405 /* NeoVimTab.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NeoVimTab.m; path = NeoVimServer/NeoVimTab.m; sourceTree = SOURCE_ROOT; }; - 4BDD05831DBBC50000D1B405 /* NeoVimWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NeoVimWindow.h; path = NeoVimServer/NeoVimWindow.h; sourceTree = SOURCE_ROOT; }; - 4BDD05841DBBC50000D1B405 /* NeoVimWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NeoVimWindow.m; path = NeoVimServer/NeoVimWindow.m; sourceTree = SOURCE_ROOT; }; - 4BDF50071D7607BF00D8FBC3 /* EonilFileSystemEvents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EonilFileSystemEvents.framework; path = Carthage/Build/Mac/EonilFileSystemEvents.framework; sourceTree = SOURCE_ROOT; }; + 4BC164291FD2DEE1001903BE /* MsgPackRpc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MsgPackRpc.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4BC1642A1FD2DEE1001903BE /* NvimMsgPack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimMsgPack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4BC1642B1FD2DEE1001903BE /* NvimView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4BDF500B1D760A3500D8FBC3 /* FileUtilsTest */ = {isa = PBXFileReference; lastKnownFileType = folder; path = FileUtilsTest; sourceTree = ""; }; 4BDF50181D77540900D8FBC3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OpenQuicklyWindow.xib; sourceTree = ""; }; - 4BDF641A1D0887C100D47E1D /* TextDrawer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextDrawer.h; sourceTree = ""; }; - 4BDF641B1D0887C100D47E1D /* TextDrawer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextDrawer.m; sourceTree = ""; }; - 4BDF64221D08CAB000D47E1D /* MMCoreTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMCoreTextView.h; sourceTree = ""; }; - 4BDF64231D08CAB000D47E1D /* MMCoreTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMCoreTextView.m; sourceTree = ""; }; + 4BE45C1C1FD2DBD2005C0A95 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; 4BEBA5051CFF374B00673FDF /* VimR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VimR.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4BEBA5081CFF374B00673FDF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 4BEBA50A1CFF374B00673FDF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -557,59 +324,21 @@ 4BEBA50F1CFF374B00673FDF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4BEBA5141CFF374B00673FDF /* VimRTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VimRTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 4BEBA51A1CFF374B00673FDF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4BEBA6621D00157A00673FDF /* runtime */ = {isa = PBXFileReference; lastKnownFileType = folder; name = runtime; path = neovim/runtime; sourceTree = SOURCE_ROOT; }; - 4BEE79161D16D3800012EDAA /* CellAttributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellAttributes.swift; sourceTree = ""; }; 4BF07EE51D51326A009BECEB /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Credits.rtf; sourceTree = ""; }; - 4BF6E29B1D34153C0053FA76 /* KeyUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyUtils.swift; sourceTree = ""; }; + 4BF18C311FD2E2AA00DF95D1 /* EonilFileSystemEvents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EonilFileSystemEvents.framework; path = ../Carthage/Build/Mac/EonilFileSystemEvents.framework; sourceTree = ""; }; + 4BF18C321FD2E2AA00DF95D1 /* PureLayout.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PureLayout.framework; path = ../Carthage/Build/Mac/PureLayout.framework; sourceTree = ""; }; + 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaMarkdown.framework; path = ../Carthage/Build/Mac/CocoaMarkdown.framework; sourceTree = ""; }; + 4BF18C341FD2E2AA00DF95D1 /* CocoaFontAwesome.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaFontAwesome.framework; path = ../Carthage/Build/Mac/CocoaFontAwesome.framework; sourceTree = ""; }; + 4BF18C351FD2E2AB00DF95D1 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = ../Carthage/Build/Mac/Swifter.framework; sourceTree = ""; }; + 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = ../Carthage/Build/Mac/RxSwift.framework; sourceTree = ""; }; + 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../Carthage/Build/Mac/Sparkle.framework; sourceTree = ""; }; + 4BF18C381FD2E2AB00DF95D1 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = ../Carthage/Build/Mac/RxCocoa.framework; sourceTree = ""; }; + 4BF18C491FD2E2DE00DF95D1 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = ../Carthage/Build/Mac/Nimble.framework; sourceTree = ""; }; + 4BF18C501FD2E4F200DF95D1 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = ../Carthage/Build/Mac/RxTest.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 4B12CD831F5A985600167D59 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B12CD971F5A98D500167D59 /* PureLayout.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B2A2BF31D0351810074CE9A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B90EFCE1FCD6CEE008A39E0 /* NvimMsgPack.framework in Frameworks */, - 4B90EFCD1FCD6CEB008A39E0 /* MsgPackRpc.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B56F28D1D29903F00C1F92E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B56F2951D29903F00C1F92E /* SwiftNeoVim.framework in Frameworks */, - 4B56F29D1D29926600C1F92E /* Nimble.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B64239C1D8EFE7500FC78C8 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4BB727141E97A718001571C1 /* CocoaMarkdown.framework in Frameworks */, - 4B6423AC1D8EFE9800FC78C8 /* PureLayout.framework in Frameworks */, - 4B337FBC1DEB76F20020ADD2 /* CocoaFontAwesome.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4B7780871EAA25FF00CB4E10 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B77809E1EAA265400CB4E10 /* PureLayout.framework in Frameworks */, - 4B7780991EAA262300CB4E10 /* SwiftNeoVim.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B854A171D31447C00E08DE1 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -620,17 +349,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4B90EFCB1FCD6CE5008A39E0 /* NvimMsgPack.framework in Frameworks */, - 4B90EFC91FCD6CE2008A39E0 /* MsgPackRpc.framework in Frameworks */, - 4B2A2BFE1D0351810074CE9A /* SwiftNeoVim.framework in Frameworks */, - 4BDD056A1DB0CAB700D1B405 /* Sparkle.framework in Frameworks */, - 4B337FBB1DEB76F20020ADD2 /* CocoaFontAwesome.framework in Frameworks */, - 4BB7F3931F9D261500624F61 /* Swifter.framework in Frameworks */, - 4B183E0E1E06E2940079E8A8 /* CocoaMarkdown.framework in Frameworks */, - 4B2A2BEE1D02261F0074CE9A /* RxSwift.framework in Frameworks */, - 4B401B141D0454DC00D99EDC /* PureLayout.framework in Frameworks */, - 4BDF50081D7607BF00D8FBC3 /* EonilFileSystemEvents.framework in Frameworks */, - 4B2A2BEC1D02261F0074CE9A /* RxCocoa.framework in Frameworks */, + 4BF18C391FD2E2AB00DF95D1 /* EonilFileSystemEvents.framework in Frameworks */, + 4BF18C3A1FD2E2AB00DF95D1 /* PureLayout.framework in Frameworks */, + 4BF18C3B1FD2E2AB00DF95D1 /* CocoaMarkdown.framework in Frameworks */, + 4BF18C3C1FD2E2AB00DF95D1 /* CocoaFontAwesome.framework in Frameworks */, + 4BF18C3D1FD2E2AB00DF95D1 /* Swifter.framework in Frameworks */, + 4BF18C3E1FD2E2AB00DF95D1 /* RxSwift.framework in Frameworks */, + 4BF18C3F1FD2E2AB00DF95D1 /* Sparkle.framework in Frameworks */, + 4BF18C401FD2E2AB00DF95D1 /* RxCocoa.framework in Frameworks */, + 4BC164261FD2DEE1001903BE /* MsgPackRpc.framework in Frameworks */, + 4BC164271FD2DEE1001903BE /* NvimMsgPack.framework in Frameworks */, + 4BC164281FD2DEE1001903BE /* NvimView.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -638,11 +367,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4B96FB431EBBC5C300E4E164 /* SwiftNeoVim.framework in Frameworks */, - 4B96FB461EBBC6EE00E4E164 /* RxSwift.framework in Frameworks */, - 4B6A70991D65058A00E12030 /* Nimble.framework in Frameworks */, - 4B40C64F1F05A05B00040B1B /* CocoaMarkdown.framework in Frameworks */, - 4B5011F81EBA67EB00F76C46 /* RxTest.framework in Frameworks */, + 4BF18C581FD2E53400DF95D1 /* CocoaMarkdown.framework in Frameworks */, + 4BF18C511FD2E4F200DF95D1 /* RxTest.framework in Frameworks */, + 4BF18C4F1FD2E4F100DF95D1 /* RxSwift.framework in Frameworks */, + 4BF18C4D1FD2E4D200DF95D1 /* MsgPackRpc.framework in Frameworks */, + 4BF18C4E1FD2E4D200DF95D1 /* NvimMsgPack.framework in Frameworks */, + 4BF18C4C1FD2E4CE00DF95D1 /* NvimView.framework in Frameworks */, + 4BF18C4A1FD2E2DE00DF95D1 /* Nimble.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -797,82 +528,26 @@ name = Services; sourceTree = ""; }; - 1929BFC86BF38D341F2DDCBD /* NeoVim Objects */ = { - isa = PBXGroup; - children = ( - 4BDD057F1DBBC50000D1B405 /* NeoVimBuffer.h */, - 4BDD05801DBBC50000D1B405 /* NeoVimBuffer.m */, - 4BDD05811DBBC50000D1B405 /* NeoVimTab.h */, - 4BDD05821DBBC50000D1B405 /* NeoVimTab.m */, - 4BDD05831DBBC50000D1B405 /* NeoVimWindow.h */, - 4BDD05841DBBC50000D1B405 /* NeoVimWindow.m */, - ); - path = "NeoVim Objects"; - sourceTree = ""; - }; - 4B12CD871F5A985600167D59 /* ThemedWindow */ = { - isa = PBXGroup; - children = ( - 4B12CD881F5A985600167D59 /* AppDelegate.swift */, - 4B12CD8A1F5A985600167D59 /* ViewController.swift */, - 4B12CD8C1F5A985600167D59 /* Assets.xcassets */, - 4B12CD8E1F5A985700167D59 /* Main.storyboard */, - 4B12CD911F5A985700167D59 /* Info.plist */, - 4B12CD951F5A988000167D59 /* WindowController.swift */, - ); - path = ThemedWindow; - sourceTree = ""; - }; - 4B2A2BF81D0351810074CE9A /* SwiftNeoVim */ = { - isa = PBXGroup; - children = ( - 4B854A151D31444800E08DE1 /* resources */, - 4BEE79131D16D1C60012EDAA /* NeoVimView */, - 4BEE79161D16D3800012EDAA /* CellAttributes.swift */, - 1929BA6128BFDD54CA92F46E /* ColorUtils.swift */, - 4B2A2BF91D0351810074CE9A /* SwiftNeoVim.h */, - 4BDF641A1D0887C100D47E1D /* TextDrawer.h */, - 4BDF641B1D0887C100D47E1D /* TextDrawer.m */, - 4BDF64221D08CAB000D47E1D /* MMCoreTextView.h */, - 4BDF64231D08CAB000D47E1D /* MMCoreTextView.m */, - 4B96384F1ED979BD001C556F /* Logger.swift */, - 4B4192171D0C52D700A0BEB2 /* Grid.swift */, - 4BCADE071D11ED12004DAD0F /* CocoaExtensions.swift */, - 4B1BB3521D16C5E500CA4FEF /* InputTestView.swift */, - 4BF6E29B1D34153C0053FA76 /* KeyUtils.swift */, - 4B8AC0431DBCB3A1007CCC9B /* NeoVimObjectsExtensions.swift */, - ); - path = SwiftNeoVim; - sourceTree = ""; - }; 4B5012001EBA791000F76C46 /* Frameworks */ = { isa = PBXGroup; children = ( - 4B90EFCC1FCD6CE5008A39E0 /* NvimMsgPack.framework */, - 4B90EFCA1FCD6CE2008A39E0 /* MsgPackRpc.framework */, - 4BB7F3911F9D260B00624F61 /* Swifter.framework */, - 4B5011F71EBA67EB00F76C46 /* RxTest.framework */, - 4B183E0D1E06E2940079E8A8 /* CocoaMarkdown.framework */, - 4B337FBA1DEB76F20020ADD2 /* CocoaFontAwesome.framework */, - 4BDD05691DB0CAB700D1B405 /* Sparkle.framework */, - 4BDF50071D7607BF00D8FBC3 /* EonilFileSystemEvents.framework */, - 4B56F29B1D29926600C1F92E /* Nimble.framework */, - 4B401B131D0454DC00D99EDC /* PureLayout.framework */, - 4B2A2BE21D0225800074CE9A /* RxCocoa.framework */, - 4B2A2BE31D0225800074CE9A /* RxSwift.framework */, + 4BF18C501FD2E4F200DF95D1 /* RxTest.framework */, + 4BF18C491FD2E2DE00DF95D1 /* Nimble.framework */, + 4BF18C341FD2E2AA00DF95D1 /* CocoaFontAwesome.framework */, + 4BF18C331FD2E2AA00DF95D1 /* CocoaMarkdown.framework */, + 4BF18C311FD2E2AA00DF95D1 /* EonilFileSystemEvents.framework */, + 4BF18C321FD2E2AA00DF95D1 /* PureLayout.framework */, + 4BF18C381FD2E2AB00DF95D1 /* RxCocoa.framework */, + 4BF18C361FD2E2AB00DF95D1 /* RxSwift.framework */, + 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */, + 4BF18C351FD2E2AB00DF95D1 /* Swifter.framework */, + 4BC164291FD2DEE1001903BE /* MsgPackRpc.framework */, + 4BC1642A1FD2DEE1001903BE /* NvimMsgPack.framework */, + 4BC1642B1FD2DEE1001903BE /* NvimView.framework */, ); name = Frameworks; sourceTree = ""; }; - 4B56F2911D29903F00C1F92E /* SwiftNeoVimTests */ = { - isa = PBXGroup; - children = ( - 4B56F2921D29903F00C1F92E /* SwiftNeoVimTests.swift */, - 4B56F2941D29903F00C1F92E /* Info.plist */, - ); - path = SwiftNeoVimTests; - sourceTree = ""; - }; 4B6423941D8EFD6100FC78C8 /* Workspace */ = { isa = PBXGroup; children = ( @@ -886,17 +561,6 @@ name = Workspace; sourceTree = ""; }; - 4B6423A01D8EFE7500FC78C8 /* VimR-Workspace-Demo */ = { - isa = PBXGroup; - children = ( - 4B6423A11D8EFE7500FC78C8 /* AppDelegate.swift */, - 4B6423A31D8EFE7500FC78C8 /* Assets.xcassets */, - 4B6423A51D8EFE7500FC78C8 /* MainMenu.xib */, - 4B6423A81D8EFE7500FC78C8 /* Info.plist */, - ); - path = "VimR-Workspace-Demo"; - sourceTree = ""; - }; 4B77808B1EAA25FF00CB4E10 /* MacNeovim */ = { isa = PBXGroup; children = ( @@ -911,35 +575,6 @@ path = MacNeovim; sourceTree = ""; }; - 4B854A151D31444800E08DE1 /* resources */ = { - isa = PBXGroup; - children = ( - 4B2A2BFB1D0351810074CE9A /* Info.plist */, - 4BEBA6621D00157A00673FDF /* runtime */, - ); - name = resources; - sourceTree = ""; - }; - 4B854A1B1D31447C00E08DE1 /* NeoVimServer */ = { - isa = PBXGroup; - children = ( - 4BCF638F1D323CFD00F15CE4 /* nvim */, - 4BDCFAE91D3147A300F62670 /* NeoVimMsgIds.h */, - 4BDCFAC91D31449700F62670 /* NeoVimServer.h */, - 4BDCFACA1D31449700F62670 /* NeoVimServer.m */, - 4B854A1C1D31447C00E08DE1 /* main.m */, - 1929B93013228985F509C8F6 /* server_ui.m */, - 1929B1A51F076E088EF4CCA4 /* server_globals.h */, - 1929B15B7EDC9B0F40E5E95C /* Logging.h */, - 1929B5C3F2F1CA4113DABFFD /* CocoaCategories.m */, - 1929BE69CF9AB1A10D0DD4F2 /* CocoaCategories.h */, - 1929BFC86BF38D341F2DDCBD /* NeoVim Objects */, - 1929BB6CFF4CC0B5E8B00C62 /* DataWrapper.m */, - 1929B0EEBE4A765934AF8335 /* DataWrapper.h */, - ); - path = NeoVimServer; - sourceTree = ""; - }; 4B97E2CF1D33F92200FC0660 /* resources */ = { isa = PBXGroup; children = ( @@ -985,12 +620,7 @@ children = ( 4BEBA5071CFF374B00673FDF /* VimR */, 4BEBA5171CFF374B00673FDF /* VimRTests */, - 4B2A2BF81D0351810074CE9A /* SwiftNeoVim */, - 4B56F2911D29903F00C1F92E /* SwiftNeoVimTests */, - 4B854A1B1D31447C00E08DE1 /* NeoVimServer */, - 4B6423A01D8EFE7500FC78C8 /* VimR-Workspace-Demo */, 4B77808B1EAA25FF00CB4E10 /* MacNeovim */, - 4B12CD871F5A985600167D59 /* ThemedWindow */, 4B5012001EBA791000F76C46 /* Frameworks */, 4BEBA5061CFF374B00673FDF /* Products */, ); @@ -1003,12 +633,7 @@ children = ( 4BEBA5051CFF374B00673FDF /* VimR.app */, 4BEBA5141CFF374B00673FDF /* VimRTests.xctest */, - 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */, - 4B56F2901D29903F00C1F92E /* SwiftNeoVimTests.xctest */, - 4B854A1A1D31447C00E08DE1 /* NeoVimServer */, - 4B64239F1D8EFE7500FC78C8 /* VimR-Workspace-Demo.app */, 4B77808A1EAA25FF00CB4E10 /* MacNeovim.app */, - 4B12CD861F5A985600167D59 /* ThemedWindow.app */, ); name = Products; sourceTree = ""; @@ -1017,6 +642,7 @@ isa = PBXGroup; children = ( 4B2A2C0D1D0353750074CE9A /* Bridge.h */, + 4BE45C1C1FD2DBD2005C0A95 /* Logger.swift */, 4B238BE01D3BF24200CBDD98 /* Application.swift */, 4BEBA5081CFF374B00673FDF /* AppDelegate.swift */, 4BDF50111D760B1100D8FBC3 /* File Items */, @@ -1041,31 +667,6 @@ path = VimRTests; sourceTree = ""; }; - 4BEE79131D16D1C60012EDAA /* NeoVimView */ = { - isa = PBXGroup; - children = ( - 4B0BCC931D70320C00D3CE65 /* Logger.h */, - 1929BF00B466B40629C2AABE /* NeoVimView.swift */, - 4B401B191D046E0600D99EDC /* NeoVimViewDelegate.swift */, - 4B570DC01D303CAF006EDC21 /* NeoVimAgent.h */, - 4B570DC11D303CAF006EDC21 /* NeoVimAgent.m */, - 4B183E1A1E08748B0079E8A8 /* NeoVimAutoCommandEvent.generated.h */, - 4B96384B1ED9793B001C556F /* NeoVimAutoCommandEvent.generated.m */, - 4B2A2C061D0352CB0074CE9A /* NeoVimUiBridgeProtocol.h */, - 4B96384D1ED9797F001C556F /* NeoVimUiBridgeProtocol.m */, - 1929BD8F08E21E3ECE9F84AB /* NeoVimView+Api.swift */, - 1929B2AD3F9375F57F21AD58 /* NeoVimView+UiBridge.swift */, - 1929B4A088958A7B4FF152B7 /* NeoVimView+Mouse.swift */, - 1929B19207FBC2EBDF1B88F3 /* NeoVimView+Draw.swift */, - 1929BD05CA498FC3C229455E /* NeoVimView+Resize.swift */, - 1929BDF3167E15E7F3349798 /* NeoVimView+Key.swift */, - 1929B4F65149D3C3E326DA65 /* NeoVimView+MenuItems.swift */, - 1F1000F71F0ABC0000CA3195 /* NeoVimView+Dragging.swift */, - 373416BC1F71879300A87A92 /* NeoVimView+TouchBar.swift */, - ); - name = NeoVimView; - sourceTree = ""; - }; 4BF8EED91D858C4400CAC08A /* Utils */ = { isa = PBXGroup; children = ( @@ -1085,103 +686,7 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - 4B2A2BF41D0351810074CE9A /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B2A2C091D0352CB0074CE9A /* NeoVimUiBridgeProtocol.h in Headers */, - 4B570DC21D303CAF006EDC21 /* NeoVimAgent.h in Headers */, - 4BDF641C1D0887C100D47E1D /* TextDrawer.h in Headers */, - 4BDD058B1DBBC50000D1B405 /* NeoVimWindow.h in Headers */, - 4BDD05851DBBC50000D1B405 /* NeoVimBuffer.h in Headers */, - 4BDD05881DBBC50000D1B405 /* NeoVimTab.h in Headers */, - 4BDCFAEA1D31486E00F62670 /* NeoVimMsgIds.h in Headers */, - 4B2A2BFA1D0351810074CE9A /* SwiftNeoVim.h in Headers */, - 4B183E1B1E08748B0079E8A8 /* NeoVimAutoCommandEvent.generated.h in Headers */, - 4B0BCC941D70320C00D3CE65 /* Logger.h in Headers */, - 4BDF64241D08CAB000D47E1D /* MMCoreTextView.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ - 4B12CD851F5A985600167D59 /* ThemedWindow */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4B12CD941F5A985700167D59 /* Build configuration list for PBXNativeTarget "ThemedWindow" */; - buildPhases = ( - 4B12CD821F5A985600167D59 /* Sources */, - 4B12CD831F5A985600167D59 /* Frameworks */, - 4B12CD841F5A985600167D59 /* Resources */, - 4B12CD991F5A98D500167D59 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ThemedWindow; - productName = ThemedWindow; - productReference = 4B12CD861F5A985600167D59 /* ThemedWindow.app */; - productType = "com.apple.product-type.application"; - }; - 4B2A2BF61D0351810074CE9A /* SwiftNeoVim */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4B2A2C021D0351810074CE9A /* Build configuration list for PBXNativeTarget "SwiftNeoVim" */; - buildPhases = ( - 4B2A2BF21D0351810074CE9A /* Sources */, - 4B2A2BF31D0351810074CE9A /* Frameworks */, - 4B2A2BF41D0351810074CE9A /* Headers */, - 4B2A2BF51D0351810074CE9A /* Resources */, - 4B854A061D3137B500E08DE1 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 4BDCFADE1D31465100F62670 /* PBXTargetDependency */, - ); - name = SwiftNeoVim; - productName = SwiftNeoVim; - productReference = 4B2A2BF71D0351810074CE9A /* SwiftNeoVim.framework */; - productType = "com.apple.product-type.framework"; - }; - 4B56F28F1D29903F00C1F92E /* SwiftNeoVimTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4B56F29A1D29903F00C1F92E /* Build configuration list for PBXNativeTarget "SwiftNeoVimTests" */; - buildPhases = ( - 4B56F28C1D29903F00C1F92E /* Sources */, - 4B56F28D1D29903F00C1F92E /* Frameworks */, - 4B56F28E1D29903F00C1F92E /* Resources */, - 4B9A15231D2993D0009F9F67 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 4B56F2971D29903F00C1F92E /* PBXTargetDependency */, - ); - name = SwiftNeoVimTests; - productName = SwiftNeoVimTests; - productReference = 4B56F2901D29903F00C1F92E /* SwiftNeoVimTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 4B64239E1D8EFE7500FC78C8 /* VimR-Workspace-Demo */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4B6423A91D8EFE7500FC78C8 /* Build configuration list for PBXNativeTarget "VimR-Workspace-Demo" */; - buildPhases = ( - 4B64239B1D8EFE7500FC78C8 /* Sources */, - 4B64239C1D8EFE7500FC78C8 /* Frameworks */, - 4B64239D1D8EFE7500FC78C8 /* Resources */, - 4B6423AE1D8EFE9800FC78C8 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "VimR-Workspace-Demo"; - productName = "VimR-Workspace-Demo"; - productReference = 4B64239F1D8EFE7500FC78C8 /* VimR-Workspace-Demo.app */; - productType = "com.apple.product-type.application"; - }; 4B7780891EAA25FF00CB4E10 /* MacNeovim */ = { isa = PBXNativeTarget; buildConfigurationList = 4B7780981EAA25FF00CB4E10 /* Build configuration list for PBXNativeTarget "MacNeovim" */; @@ -1194,32 +699,12 @@ buildRules = ( ); dependencies = ( - 4B77809C1EAA262300CB4E10 /* PBXTargetDependency */, ); name = MacNeovim; productName = MacNeovim; productReference = 4B77808A1EAA25FF00CB4E10 /* MacNeovim.app */; productType = "com.apple.product-type.application"; }; - 4B854A191D31447C00E08DE1 /* NeoVimServer */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4B854A1E1D31447C00E08DE1 /* Build configuration list for PBXNativeTarget "NeoVimServer" */; - buildPhases = ( - 4BBA71F11D319E0900E16612 /* ShellScript */, - 4BDFAC751E59BAC30056122C /* ShellScript */, - 4B854A161D31447C00E08DE1 /* Sources */, - 4B854A171D31447C00E08DE1 /* Frameworks */, - 4B854A181D31447C00E08DE1 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = NeoVimServer; - productName = NeoVimServer; - productReference = 4B854A1A1D31447C00E08DE1 /* NeoVimServer */; - productType = "com.apple.product-type.tool"; - }; 4BEBA5041CFF374B00673FDF /* VimR */ = { isa = PBXNativeTarget; buildConfigurationList = 4BEBA51D1CFF374B00673FDF /* Build configuration list for PBXNativeTarget "VimR" */; @@ -1233,7 +718,6 @@ buildRules = ( ); dependencies = ( - 4B2A2BFD1D0351810074CE9A /* PBXTargetDependency */, ); name = VimR; productName = VimR; @@ -1269,30 +753,10 @@ LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Tae Won Ha"; TargetAttributes = { - 4B12CD851F5A985600167D59 = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; - }; - 4B2A2BF61D0351810074CE9A = { - CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = H96Q2NKTQH; - LastSwiftMigration = 0900; - }; - 4B56F28F1D29903F00C1F92E = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0800; - }; - 4B64239E1D8EFE7500FC78C8 = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0800; - }; 4B7780891EAA25FF00CB4E10 = { CreatedOnToolsVersion = 8.3.2; ProvisioningStyle = Automatic; }; - 4B854A191D31447C00E08DE1 = { - CreatedOnToolsVersion = 7.3.1; - }; 4BEBA5041CFF374B00673FDF = { CreatedOnToolsVersion = 7.3.1; DevelopmentTeam = H96Q2NKTQH; @@ -1319,50 +783,12 @@ targets = ( 4BEBA5041CFF374B00673FDF /* VimR */, 4BEBA5131CFF374B00673FDF /* VimRTests */, - 4B2A2BF61D0351810074CE9A /* SwiftNeoVim */, - 4B56F28F1D29903F00C1F92E /* SwiftNeoVimTests */, - 4B854A191D31447C00E08DE1 /* NeoVimServer */, - 4B64239E1D8EFE7500FC78C8 /* VimR-Workspace-Demo */, 4B7780891EAA25FF00CB4E10 /* MacNeovim */, - 4B12CD851F5A985600167D59 /* ThemedWindow */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 4B12CD841F5A985600167D59 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B12CD8D1F5A985600167D59 /* Assets.xcassets in Resources */, - 4B12CD901F5A985700167D59 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B2A2BF51D0351810074CE9A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4BDCFAED1D315CB800F62670 /* runtime in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B56F28E1D29903F00C1F92E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B64239D1D8EFE7500FC78C8 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B6423A41D8EFE7500FC78C8 /* Assets.xcassets in Resources */, - 4B6423A71D8EFE7500FC78C8 /* MainMenu.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4B7780881EAA25FF00CB4E10 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1414,103 +840,11 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp ${SRCROOT}/Carthage/Checkouts/github-markdown-css/github-markdown.css ${SRCROOT}/VimR/markdown/"; - }; - 4BBA71F11D319E0900E16612 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "pushd neovim\n../bin/build_libnvim.sh\npopd"; - }; - 4BDFAC751E59BAC30056122C /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = ./bin/generate_source.py; + shellScript = "cp ${SRCROOT}/../Carthage/Checkouts/github-markdown-css/github-markdown.css ${SRCROOT}/VimR/markdown/"; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 4B12CD821F5A985600167D59 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B12CD8B1F5A985600167D59 /* ViewController.swift in Sources */, - 4B12CD961F5A988000167D59 /* WindowController.swift in Sources */, - 4B12CD891F5A985600167D59 /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B2A2BF21D0351810074CE9A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B96384C1ED9793B001C556F /* NeoVimAutoCommandEvent.generated.m in Sources */, - 4BDD05891DBBC50000D1B405 /* NeoVimTab.m in Sources */, - 4BEE79171D16D3800012EDAA /* CellAttributes.swift in Sources */, - 4BDD05861DBBC50000D1B405 /* NeoVimBuffer.m in Sources */, - 373416BD1F71879300A87A92 /* NeoVimView+TouchBar.swift in Sources */, - 4BF6E29C1D34153C0053FA76 /* KeyUtils.swift in Sources */, - 4BCADE081D11ED12004DAD0F /* CocoaExtensions.swift in Sources */, - 4B401B1A1D046E0600D99EDC /* NeoVimViewDelegate.swift in Sources */, - 1929B728262BAA14FC93F6AC /* NeoVimView.swift in Sources */, - 4B9638501ED979BD001C556F /* Logger.swift in Sources */, - 4B570DC31D303CAF006EDC21 /* NeoVimAgent.m in Sources */, - 4BDF641D1D0887C100D47E1D /* TextDrawer.m in Sources */, - 4BDF64251D08CAB000D47E1D /* MMCoreTextView.m in Sources */, - 4BDD058C1DBBC50000D1B405 /* NeoVimWindow.m in Sources */, - 1929BEB90DCDAF7A2B68C886 /* ColorUtils.swift in Sources */, - 4B8AC0441DBCB3A2007CCC9B /* NeoVimObjectsExtensions.swift in Sources */, - 4B96384E1ED9797F001C556F /* NeoVimUiBridgeProtocol.m in Sources */, - 4B4192181D0C52D700A0BEB2 /* Grid.swift in Sources */, - 1929BDD4BFA4175D0A1B0BC3 /* NeoVimView+Api.swift in Sources */, - 1929BC9EF45463113EBF3BCB /* NeoVimView+UiBridge.swift in Sources */, - 1929BAE6B93067FD52DBE892 /* NeoVimView+Mouse.swift in Sources */, - 1929B7993C8DB7F59447DF5F /* NeoVimView+Draw.swift in Sources */, - 1929BD294A33873BAE2804C0 /* NeoVimView+Resize.swift in Sources */, - 1929BB38525ECCEE8E39288A /* NeoVimView+Key.swift in Sources */, - 1F1000F81F0ABC0000CA3195 /* NeoVimView+Dragging.swift in Sources */, - 1929BB0A840D93D1A13C25FD /* NeoVimView+MenuItems.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B56F28C1D29903F00C1F92E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B56F2931D29903F00C1F92E /* SwiftNeoVimTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4B64239B1D8EFE7500FC78C8 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4B280EFF1D945DA5003FE725 /* AppKitCommons.swift in Sources */, - 4B3965371DEB21300082D3C1 /* InnterToolBar.swift in Sources */, - 4B6423AF1D8EFEA800FC78C8 /* Workspace.swift in Sources */, - 4B6423B01D8EFEA800FC78C8 /* WorkspaceBar.swift in Sources */, - 4BB489431D952CF6005BB0E8 /* WorkspaceToolButton.swift in Sources */, - 4BB409EF1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift in Sources */, - 4B6423B11D8EFEA800FC78C8 /* WorkspaceTool.swift in Sources */, - 4B6423A21D8EFE7500FC78C8 /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4B7780861EAA25FF00CB4E10 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1521,21 +855,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4B854A161D31447C00E08DE1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4BDCFACB1D31449700F62670 /* NeoVimServer.m in Sources */, - 4BDD058A1DBBC50000D1B405 /* NeoVimTab.m in Sources */, - 4B854A1D1D31447C00E08DE1 /* main.m in Sources */, - 1929BF81A40B4154D3EA33CE /* server_ui.m in Sources */, - 4BDD058D1DBBC50000D1B405 /* NeoVimWindow.m in Sources */, - 4BDD05871DBBC50000D1B405 /* NeoVimBuffer.m in Sources */, - 1929B1E05C116514C1D3A384 /* CocoaCategories.m in Sources */, - 1929B18A0D7C7407C51DB642 /* DataWrapper.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4BEBA5011CFF374B00673FDF /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1565,6 +884,7 @@ 1929BAFF1E011321D3186EE6 /* UiRoot.swift in Sources */, 1929B29B95AD176D57942E08 /* UiRootReducer.swift in Sources */, 1929BB4A9B2FA42A64CCCC76 /* MainWindowReducer.swift in Sources */, + 4BE45C1D1FD2DBD2005C0A95 /* Logger.swift in Sources */, 1929B8FB248D71BF88A35761 /* PreviewTool.swift in Sources */, 1929B4B70926DE113E6BF990 /* PreviewReducer.swift in Sources */, 1929B5C1BABBC0D09D97C3EF /* PreviewService.swift in Sources */, @@ -1602,7 +922,6 @@ 1929BF03FD6465F289AA80B2 /* ToolsPref.swift in Sources */, 1929B6C0393DE40E34F4A49A /* ToolsPrefReducer.swift in Sources */, 1929B542A071BD03C846F6EF /* PrefUtils.swift in Sources */, - 1929BE407A667356E29386EF /* Logger.swift in Sources */, 1929BE2F3E0182CC51F2763A /* ThemedTableSubviews.swift in Sources */, 1929B6460862447A31B5B082 /* ImageAndTextTableCell.swift in Sources */, 1929BBE28654E4307AF1E2FD /* Theme.swift in Sources */, @@ -1635,7 +954,6 @@ 1929BFC70581084B5CE04A5B /* MatcherTests.swift in Sources */, 1929BAAD7336FDFF1F78E749 /* ScorerTest.swift in Sources */, 1929B8E90A1378E494D481E7 /* PrefUtilsTest.swift in Sources */, - 1929BCA03A420A83174FD7E7 /* Logger.swift in Sources */, 1929B20CE35B43BB1CE023BA /* Theme.swift in Sources */, 1929B9318D32146D58BB38EC /* AppKitCommons.swift in Sources */, ); @@ -1644,26 +962,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4B2A2BFD1D0351810074CE9A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4B2A2BF61D0351810074CE9A /* SwiftNeoVim */; - targetProxy = 4B2A2BFC1D0351810074CE9A /* PBXContainerItemProxy */; - }; - 4B56F2971D29903F00C1F92E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4B2A2BF61D0351810074CE9A /* SwiftNeoVim */; - targetProxy = 4B56F2961D29903F00C1F92E /* PBXContainerItemProxy */; - }; - 4B77809C1EAA262300CB4E10 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4B2A2BF61D0351810074CE9A /* SwiftNeoVim */; - targetProxy = 4B77809B1EAA262300CB4E10 /* PBXContainerItemProxy */; - }; - 4BDCFADE1D31465100F62670 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4B854A191D31447C00E08DE1 /* NeoVimServer */; - targetProxy = 4BDCFADD1D31465100F62670 /* PBXContainerItemProxy */; - }; 4BEBA5161CFF374B00673FDF /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4BEBA5041CFF374B00673FDF /* VimR */; @@ -1680,22 +978,6 @@ name = PrefWindow.xib; sourceTree = ""; }; - 4B12CD8E1F5A985700167D59 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 4B12CD8F1F5A985700167D59 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 4B6423A51D8EFE7500FC78C8 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 4B6423A61D8EFE7500FC78C8 /* Base */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; 4B7780A41EAA2D3100CB4E10 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( @@ -1755,164 +1037,9 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 4B12CD921F5A985700167D59 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - INFOPLIST_FILE = ThemedWindow/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.ThemedWindow; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - 4B12CD931F5A985700167D59 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - INFOPLIST_FILE = ThemedWindow/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.ThemedWindow; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; - 4B2A2C001D0351810074CE9A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 243; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftNeoVim/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.VimR.SwiftNeoVim; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 4B2A2C011D0351810074CE9A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 243; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftNeoVim/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.VimR.SwiftNeoVim; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Release; - }; - 4B56F2981D29903F00C1F92E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - INFOPLIST_FILE = SwiftNeoVimTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.vimr.SwiftNeoVimTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 4B56F2991D29903F00C1F92E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - INFOPLIST_FILE = SwiftNeoVimTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.vimr.SwiftNeoVimTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 4B6423AA1D8EFE7500FC78C8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - INFOPLIST_FILE = "VimR-Workspace-Demo/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.qvacua.VimR-Workspace-Demo"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 4B6423AB1D8EFE7500FC78C8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - INFOPLIST_FILE = "VimR-Workspace-Demo/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.qvacua.VimR-Workspace-Demo"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 4B7780961EAA25FF00CB4E10 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -1934,7 +1061,6 @@ 4B7780971EAA25FF00CB4E10 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -1952,77 +1078,6 @@ }; name = Release; }; - 4B854A1F1D31447C00E08DE1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "INCLUDE_GENERATED_DECLARATIONS=1", - ); - HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/neovim/build/include", - "$(PROJECT_DIR)/neovim/src", - "$(PROJECT_DIR)/neovim/.deps/usr/include", - "$(PROJECT_DIR)/neovim/build/config", - "$(PROJECT_DIR)/third-party/libintl/include", - "$(PROJECT_DIR)/neovim/build/src/nvim/auto", - ); - LIBRARY_SEARCH_PATHS = ( - "$(PROJECT_DIR)/neovim/build/lib", - "$(PROJECT_DIR)/neovim/.deps/usr/lib", - ); - OTHER_LDFLAGS = ( - "-liconv", - "-lpthread", - "-ldl", - "-lm", - "-lutil", - "$(PROJECT_DIR)/third-party/libintl/lib/libintl.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libjemalloc.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/liblua.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libvterm.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libuv.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libmsgpackc.a", - "$(PROJECT_DIR)/neovim/build/lib/libnvim.a", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 4B854A201D31447C00E08DE1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = "INCLUDE_GENERATED_DECLARATIONS=1"; - HEADER_SEARCH_PATHS = ( - "$(PROJECT_DIR)/neovim/build/include", - "$(PROJECT_DIR)/neovim/src", - "$(PROJECT_DIR)/neovim/.deps/usr/include", - "$(PROJECT_DIR)/neovim/build/config", - "$(PROJECT_DIR)/third-party/libintl/include", - "$(PROJECT_DIR)/neovim/build/src/nvim/auto", - ); - LIBRARY_SEARCH_PATHS = ( - "$(PROJECT_DIR)/neovim/build/lib", - "$(PROJECT_DIR)/neovim/.deps/usr/lib", - ); - OTHER_LDFLAGS = ( - "-liconv", - "-lpthread", - "-ldl", - "-lm", - "-lutil", - "$(PROJECT_DIR)/third-party/libintl/lib/libintl.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libjemalloc.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/liblua.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libvterm.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libuv.a", - "$(PROJECT_DIR)/neovim/.deps/usr/lib/libmsgpackc.a", - "$(PROJECT_DIR)/neovim/build/lib/libnvim.a", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 4BEBA51B1CFF374B00673FDF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2128,13 +1183,12 @@ 4BEBA51E1CFF374B00673FDF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/../Carthage/Build/Mac", ); INFOPLIST_FILE = VimR/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; @@ -2147,13 +1201,12 @@ 4BEBA51F1CFF374B00673FDF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/../Carthage/Build/Mac", ); INFOPLIST_FILE = VimR/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; @@ -2169,7 +1222,7 @@ COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/../Carthage/Build/Mac", ); INFOPLIST_FILE = VimRTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -2184,7 +1237,7 @@ COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/../Carthage/Build/Mac", ); INFOPLIST_FILE = VimRTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -2196,42 +1249,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4B12CD941F5A985700167D59 /* Build configuration list for PBXNativeTarget "ThemedWindow" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4B12CD921F5A985700167D59 /* Debug */, - 4B12CD931F5A985700167D59 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4B2A2C021D0351810074CE9A /* Build configuration list for PBXNativeTarget "SwiftNeoVim" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4B2A2C001D0351810074CE9A /* Debug */, - 4B2A2C011D0351810074CE9A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4B56F29A1D29903F00C1F92E /* Build configuration list for PBXNativeTarget "SwiftNeoVimTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4B56F2981D29903F00C1F92E /* Debug */, - 4B56F2991D29903F00C1F92E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4B6423A91D8EFE7500FC78C8 /* Build configuration list for PBXNativeTarget "VimR-Workspace-Demo" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4B6423AA1D8EFE7500FC78C8 /* Debug */, - 4B6423AB1D8EFE7500FC78C8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 4B7780981EAA25FF00CB4E10 /* Build configuration list for PBXNativeTarget "MacNeovim" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2241,15 +1258,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4B854A1E1D31447C00E08DE1 /* Build configuration list for PBXNativeTarget "NeoVimServer" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4B854A1F1D31447C00E08DE1 /* Debug */, - 4B854A201D31447C00E08DE1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 4BEBA5001CFF374B00673FDF /* Build configuration list for PBXProject "VimR" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/VimR.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/VimR/VimR.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from VimR.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to VimR/VimR.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/MacNeovim.xcscheme b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/MacNeovim.xcscheme similarity index 100% rename from VimR.xcodeproj/xcshareddata/xcschemes/MacNeovim.xcscheme rename to VimR/VimR.xcodeproj/xcshareddata/xcschemes/MacNeovim.xcscheme diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/VimR-Workspace-Demo.xcscheme b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme similarity index 73% rename from VimR.xcodeproj/xcshareddata/xcschemes/VimR-Workspace-Demo.xcscheme rename to VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme index 04505a73..046f7060 100644 --- a/VimR.xcodeproj/xcshareddata/xcschemes/VimR-Workspace-Demo.xcscheme +++ b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme @@ -14,9 +14,9 @@ buildForAnalyzing = "YES"> @@ -29,13 +29,23 @@ language = "" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -57,9 +67,9 @@ runnableDebuggingMode = "0"> @@ -76,9 +86,9 @@ runnableDebuggingMode = "0"> diff --git a/VimR.xcodeproj/xcshareddata/xcschemes/VimRTests.xcscheme b/VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimRTests.xcscheme similarity index 100% rename from VimR.xcodeproj/xcshareddata/xcschemes/VimRTests.xcscheme rename to VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimRTests.xcscheme diff --git a/VimR/AdvancedPrefReducer.swift b/VimR/VimR/AdvancedPrefReducer.swift similarity index 100% rename from VimR/AdvancedPrefReducer.swift rename to VimR/VimR/AdvancedPrefReducer.swift diff --git a/VimR/AdvencedPref.swift b/VimR/VimR/AdvencedPref.swift similarity index 100% rename from VimR/AdvencedPref.swift rename to VimR/VimR/AdvencedPref.swift diff --git a/VimR/AppDelegate.swift b/VimR/VimR/AppDelegate.swift similarity index 100% rename from VimR/AppDelegate.swift rename to VimR/VimR/AppDelegate.swift diff --git a/VimR/AppDelegateReducer.swift b/VimR/VimR/AppDelegateReducer.swift similarity index 100% rename from VimR/AppDelegateReducer.swift rename to VimR/VimR/AppDelegateReducer.swift diff --git a/VimR/AppKitCommons.swift b/VimR/VimR/AppKitCommons.swift similarity index 100% rename from VimR/AppKitCommons.swift rename to VimR/VimR/AppKitCommons.swift diff --git a/VimR/AppearancePref.swift b/VimR/VimR/AppearancePref.swift similarity index 100% rename from VimR/AppearancePref.swift rename to VimR/VimR/AppearancePref.swift diff --git a/VimR/AppearancePrefReducer.swift b/VimR/VimR/AppearancePrefReducer.swift similarity index 100% rename from VimR/AppearancePrefReducer.swift rename to VimR/VimR/AppearancePrefReducer.swift diff --git a/VimR/Application.swift b/VimR/VimR/Application.swift similarity index 100% rename from VimR/Application.swift rename to VimR/VimR/Application.swift diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/Contents.json b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/Contents.json rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_32x32.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_32x32.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_32x32.png diff --git a/VimR/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_512x512.png similarity index 100% rename from VimR/Assets.xcassets/AppIcon.appiconset/icon_512x512.png rename to VimR/VimR/Assets.xcassets/AppIcon.appiconset/icon_512x512.png diff --git a/VimR/Base.lproj/Credits.rtf b/VimR/VimR/Base.lproj/Credits.rtf similarity index 100% rename from VimR/Base.lproj/Credits.rtf rename to VimR/VimR/Base.lproj/Credits.rtf diff --git a/VimR/Base.lproj/FileBrowserMenu.xib b/VimR/VimR/Base.lproj/FileBrowserMenu.xib similarity index 100% rename from VimR/Base.lproj/FileBrowserMenu.xib rename to VimR/VimR/Base.lproj/FileBrowserMenu.xib diff --git a/VimR/Base.lproj/MainMenu.xib b/VimR/VimR/Base.lproj/MainMenu.xib similarity index 100% rename from VimR/Base.lproj/MainMenu.xib rename to VimR/VimR/Base.lproj/MainMenu.xib diff --git a/VimR/Base.lproj/MainWindow.xib b/VimR/VimR/Base.lproj/MainWindow.xib similarity index 100% rename from VimR/Base.lproj/MainWindow.xib rename to VimR/VimR/Base.lproj/MainWindow.xib diff --git a/VimR/Base.lproj/OpenQuicklyWindow.xib b/VimR/VimR/Base.lproj/OpenQuicklyWindow.xib similarity index 100% rename from VimR/Base.lproj/OpenQuicklyWindow.xib rename to VimR/VimR/Base.lproj/OpenQuicklyWindow.xib diff --git a/VimR/Base.lproj/PrefWindow.xib b/VimR/VimR/Base.lproj/PrefWindow.xib similarity index 100% rename from VimR/Base.lproj/PrefWindow.xib rename to VimR/VimR/Base.lproj/PrefWindow.xib diff --git a/VimR/Bridge.h b/VimR/VimR/Bridge.h similarity index 71% rename from VimR/Bridge.h rename to VimR/VimR/Bridge.h index c6836947..6577a920 100644 --- a/VimR/Bridge.h +++ b/VimR/VimR/Bridge.h @@ -3,5 +3,5 @@ * See LICENSE */ -#import +#import #import "NetUtils.h" diff --git a/VimR/Context.swift b/VimR/VimR/Context.swift similarity index 100% rename from VimR/Context.swift rename to VimR/VimR/Context.swift diff --git a/VimR/Debouncer.swift b/VimR/VimR/Debouncer.swift similarity index 100% rename from VimR/Debouncer.swift rename to VimR/VimR/Debouncer.swift diff --git a/VimR/FileBrowser.swift b/VimR/VimR/FileBrowser.swift similarity index 100% rename from VimR/FileBrowser.swift rename to VimR/VimR/FileBrowser.swift diff --git a/VimR/FileBrowserReducer.swift b/VimR/VimR/FileBrowserReducer.swift similarity index 100% rename from VimR/FileBrowserReducer.swift rename to VimR/VimR/FileBrowserReducer.swift diff --git a/VimR/FileItem.swift b/VimR/VimR/FileItem.swift similarity index 100% rename from VimR/FileItem.swift rename to VimR/VimR/FileItem.swift diff --git a/VimR/FileItemIgnorePattern.swift b/VimR/VimR/FileItemIgnorePattern.swift similarity index 100% rename from VimR/FileItemIgnorePattern.swift rename to VimR/VimR/FileItemIgnorePattern.swift diff --git a/VimR/FileItemUtils.swift b/VimR/VimR/FileItemUtils.swift similarity index 100% rename from VimR/FileItemUtils.swift rename to VimR/VimR/FileItemUtils.swift diff --git a/VimR/FileMonitor.swift b/VimR/VimR/FileMonitor.swift similarity index 100% rename from VimR/FileMonitor.swift rename to VimR/VimR/FileMonitor.swift diff --git a/VimR/FileMonitorReducer.swift b/VimR/VimR/FileMonitorReducer.swift similarity index 100% rename from VimR/FileMonitorReducer.swift rename to VimR/VimR/FileMonitorReducer.swift diff --git a/VimR/FileOutlineView.swift b/VimR/VimR/FileOutlineView.swift similarity index 99% rename from VimR/FileOutlineView.swift rename to VimR/VimR/FileOutlineView.swift index 71d35a74..d3cd633e 100644 --- a/VimR/FileOutlineView.swift +++ b/VimR/VimR/FileOutlineView.swift @@ -4,7 +4,7 @@ */ import Cocoa -import SwiftNeoVim +import NvimView import PureLayout import RxSwift diff --git a/VimR/FileUtils.swift b/VimR/VimR/FileUtils.swift similarity index 100% rename from VimR/FileUtils.swift rename to VimR/VimR/FileUtils.swift diff --git a/VimR/FoundationCommons.swift b/VimR/VimR/FoundationCommons.swift similarity index 100% rename from VimR/FoundationCommons.swift rename to VimR/VimR/FoundationCommons.swift diff --git a/VimR/GeneralPref.swift b/VimR/VimR/GeneralPref.swift similarity index 100% rename from VimR/GeneralPref.swift rename to VimR/VimR/GeneralPref.swift diff --git a/VimR/GeneralPrefReducer.swift b/VimR/VimR/GeneralPrefReducer.swift similarity index 100% rename from VimR/GeneralPrefReducer.swift rename to VimR/VimR/GeneralPrefReducer.swift diff --git a/VimR/HtmlPreviewTool.swift b/VimR/VimR/HtmlPreviewTool.swift similarity index 100% rename from VimR/HtmlPreviewTool.swift rename to VimR/VimR/HtmlPreviewTool.swift diff --git a/VimR/HtmlPreviewToolReducer.swift b/VimR/VimR/HtmlPreviewToolReducer.swift similarity index 100% rename from VimR/HtmlPreviewToolReducer.swift rename to VimR/VimR/HtmlPreviewToolReducer.swift diff --git a/VimR/HttpServerService.swift b/VimR/VimR/HttpServerService.swift similarity index 100% rename from VimR/HttpServerService.swift rename to VimR/VimR/HttpServerService.swift diff --git a/VimR/ImageAndTextTableCell.swift b/VimR/VimR/ImageAndTextTableCell.swift similarity index 100% rename from VimR/ImageAndTextTableCell.swift rename to VimR/VimR/ImageAndTextTableCell.swift diff --git a/VimR/Info.plist b/VimR/VimR/Info.plist similarity index 100% rename from VimR/Info.plist rename to VimR/VimR/Info.plist diff --git a/VimR/VimR/Logger.swift b/VimR/VimR/Logger.swift new file mode 100644 index 00000000..0bd66b36 --- /dev/null +++ b/VimR/VimR/Logger.swift @@ -0,0 +1,252 @@ +/** + * Tae Won Ha - http://taewon.de - @hataewon + * See LICENSE + */ + +import Foundation + +class LogContext { + + enum Level: String { + + case `default` = "DEFAULT" + case info = "INFO" + case debug = "DEBUG" + case error = "ERROR" + case fault = "FAULT" + } + + static func stdoutLogger(as name: T, shouldLogDebug: Bool? = nil) -> Logger { + return Logger(as: name, with: self.stdoutAppender, shouldLogDebug: shouldLogDebug) + } + + static func fileLogger(as name: T, with url: URL, shouldLogDebug: Bool? = nil) -> Logger { + let appender = self.appenderManager.requestFileAppender(for: url) + return Logger(as: name, with: appender, shouldLogDebug: shouldLogDebug) + } + + fileprivate static let stdoutAppender = StdoutAppender() + fileprivate static let appenderManager = FileAppenderManager() +} + +fileprivate class FileAppenderManager { + + fileprivate func requestFileAppender(`for` url: URL) -> FileAppender { + self.lock.lock() + defer { self.lock.unlock() } + + if let fileAppender = self.fileAppenders[url] { + return fileAppender + } + + let fileAppender = FileAppender(with: url, manager: self) + self.fileAppenders[url] = fileAppender + + return fileAppender + } + + fileprivate func deregisterFileAppender(`for` url: URL) { + self.lock.lock() + defer { self.lock.unlock() } + + self.fileAppenders.removeValue(forKey: url) + } + + fileprivate let lock = NSRecursiveLock() + + fileprivate var fileAppenders: [URL: FileAppender] = [:] +} + +class Logger { + + let uuid = UUID().uuidString + let name: String + + var shouldLogDebug: Bool + + init(as name: T, with appender: Appender, shouldLogDebug: Bool? = nil) { + if let debug = shouldLogDebug { + self.shouldLogDebug = debug + } else { +#if DEBUG + self.shouldLogDebug = true +#else + self.shouldLogDebug = false +#endif + } + + switch name { + case let str as String: self.name = str + default: self.name = String(describing: name) + } + + self.logDateFormatter.dateFormat = "dd HH:mm:SSS" + self.appender = appender + } + + func hr(file: String = #file, line: Int = #line, function: String = #function) { + self.log("----------", level: .debug, file: file, line: line, function: function) + } + + func mark(file: String = #file, line: Int = #line, function: String = #function) { + self.log("", level: .debug, file: file, line: line, function: function) + } + + func `default`(_ message: T, + file: String = #file, line: Int = #line, function: String = #function) { + + self.log(message, level: .default, file: file, line: line, function: function) + } + + func info(_ message: T, + file: String = #file, line: Int = #line, function: String = #function) { + + self.log(message, level: .info, file: file, line: line, function: function) + } + + func debug(_ message: T, + file: String = #file, line: Int = #line, function: String = #function) { + + self.log(message, level: .debug, file: file, line: line, function: function) + } + + func error(_ message: T, + file: String = #file, line: Int = #line, function: String = #function) { + + self.log(message, level: .error, file: file, line: line, function: function) + } + + func fault(_ message: T, + file: String = #file, line: Int = #line, function: String = #function) { + + self.log(message, level: .fault, file: file, line: line, function: function) + } + + func log(_ message: T, level: LogContext.Level = .default, + file: String = #file, line: Int = #line, function: String = #function) { + + guard self.shouldLogDebug else { + return + } + + let timestamp = self.logDateFormatter.string(from: Date()) + let strMsg = self.string(from: message) + + let logMsg = "\(timestamp) \(self.name) \(function) \(strMsg)" + let data = "[\(level.rawValue)] \(logMsg)\n".data(using: .utf8) ?? conversionErrorMsg + self.appender.write(data) + } + + fileprivate func string(from obj: T) -> String { + switch obj { + case let str as String: return str + case let convertible as CustomStringConvertible: return convertible.description + case let convertible as CustomDebugStringConvertible: return convertible.debugDescription + default: return String(describing: obj) + } + } + + fileprivate let appender: Appender + fileprivate let logDateFormatter = DateFormatter() +} + +protocol Appender { + + func write(_ data: Data) +} + +fileprivate class StdoutAppender: Appender { + + init() { + self.handle = .standardOutput + } + + deinit { + self.handle.closeFile() + } + + func write(_ data: Data) { + self.queue.async { + self.handle.write(data) + } + } + + fileprivate let handle: FileHandle + + fileprivate let queue = DispatchQueue(label: String(describing: StdoutAppender.self), qos: .background) +} + +fileprivate class FileAppender: Appender { + + init(with fileUrl: URL, manager: FileAppenderManager) { + guard fileUrl.isFileURL else { + preconditionFailure("\(fileUrl) must be a file URL!") + } + + self.queue = DispatchQueue(label: self.uuid, qos: .background) + self.fileUrl = fileUrl + self.manager = manager + self.fileDateFormatter.dateFormat = "yyyy-MM-dd_HH-mm-SSS" + self.setupFileHandle(at: fileUrl) + } + + deinit { + self.fileHandle.closeFile() + self.manager?.deregisterFileAppender(for: self.fileUrl) + } + + func write(_ data: Data) { + queue.async { + self.fileHandle.write(data) + + if self.fileHandle.offsetInFile >= maxFileSize { + self.archiveLogFile() + } + } + } + + fileprivate let uuid = UUID().uuidString + + fileprivate let fileUrl: URL + fileprivate weak var manager: FileAppenderManager? + fileprivate var fileHandle = FileHandle.standardOutput + fileprivate let fileDateFormatter = DateFormatter() + + fileprivate let queue: DispatchQueue + + fileprivate func setupFileHandle(at fileUrl: URL) { + if !fileManager.fileExists(atPath: fileUrl.path) { + fileManager.createFile(atPath: fileUrl.path, contents: nil) + } + + if let fileHandle = try? FileHandle(forWritingTo: fileUrl) { + self.fileHandle = fileHandle + self.fileHandle.seekToEndOfFile() + } else { + NSLog("[ERROR] Could not get handle for \(fileUrl), defaulting to STDOUT") + self.fileHandle = FileHandle.standardOutput + } + } + + fileprivate func archiveLogFile() { + self.fileHandle.closeFile() + + do { + let fileTimestamp = self.fileDateFormatter.string(from: Date()) + let fileName = self.fileUrl.deletingPathExtension().lastPathComponent + let archiveFileName = "\(fileName)-\(fileTimestamp).\(self.fileUrl.pathExtension)" + let archiveFileUrl = self.fileUrl + .deletingLastPathComponent().appendingPathComponent(archiveFileName) + + try fileManager.moveItem(at: self.fileUrl, to: archiveFileUrl) + } catch let error as NSError { + NSLog("[ERROR] Could not archive log file: \(error)") + } + + self.setupFileHandle(at: self.fileUrl) + } +} + +fileprivate let conversionErrorMsg = "[ERROR] Could not convert log msg to Data!".data(using: .utf8)! +fileprivate let fileManager = FileManager.default +fileprivate let maxFileSize: UInt64 = 4 * 1024 * 1024 diff --git a/VimR/MainWindow+Actions.swift b/VimR/VimR/MainWindow+Actions.swift similarity index 100% rename from VimR/MainWindow+Actions.swift rename to VimR/VimR/MainWindow+Actions.swift diff --git a/VimR/MainWindow+CustomTitle.swift b/VimR/VimR/MainWindow+CustomTitle.swift similarity index 100% rename from VimR/MainWindow+CustomTitle.swift rename to VimR/VimR/MainWindow+CustomTitle.swift diff --git a/VimR/MainWindow+Delegates.swift b/VimR/VimR/MainWindow+Delegates.swift similarity index 100% rename from VimR/MainWindow+Delegates.swift rename to VimR/VimR/MainWindow+Delegates.swift diff --git a/VimR/MainWindow.swift b/VimR/VimR/MainWindow.swift similarity index 99% rename from VimR/MainWindow.swift rename to VimR/VimR/MainWindow.swift index 52e10494..5a5ea266 100644 --- a/VimR/MainWindow.swift +++ b/VimR/VimR/MainWindow.swift @@ -5,7 +5,7 @@ import Cocoa import RxSwift -import SwiftNeoVim +import NvimView import PureLayout class MainWindow: NSObject, diff --git a/VimR/MainWindowReducer.swift b/VimR/VimR/MainWindowReducer.swift similarity index 100% rename from VimR/MainWindowReducer.swift rename to VimR/VimR/MainWindowReducer.swift diff --git a/VimR/Matcher.swift b/VimR/VimR/Matcher.swift similarity index 100% rename from VimR/Matcher.swift rename to VimR/VimR/Matcher.swift diff --git a/VimR/NetUtils.h b/VimR/VimR/NetUtils.h similarity index 100% rename from VimR/NetUtils.h rename to VimR/VimR/NetUtils.h diff --git a/VimR/NetUtils.m b/VimR/VimR/NetUtils.m similarity index 100% rename from VimR/NetUtils.m rename to VimR/VimR/NetUtils.m diff --git a/VimR/OpenQuicklyFileViewRow.swift b/VimR/VimR/OpenQuicklyFileViewRow.swift similarity index 100% rename from VimR/OpenQuicklyFileViewRow.swift rename to VimR/VimR/OpenQuicklyFileViewRow.swift diff --git a/VimR/OpenQuicklyFilterOperation.swift b/VimR/VimR/OpenQuicklyFilterOperation.swift similarity index 100% rename from VimR/OpenQuicklyFilterOperation.swift rename to VimR/VimR/OpenQuicklyFilterOperation.swift diff --git a/VimR/OpenQuicklyReducer.swift b/VimR/VimR/OpenQuicklyReducer.swift similarity index 100% rename from VimR/OpenQuicklyReducer.swift rename to VimR/VimR/OpenQuicklyReducer.swift diff --git a/VimR/OpenQuicklyWindow.swift b/VimR/VimR/OpenQuicklyWindow.swift similarity index 100% rename from VimR/OpenQuicklyWindow.swift rename to VimR/VimR/OpenQuicklyWindow.swift diff --git a/VimR/OpenedFileList.swift b/VimR/VimR/OpenedFileList.swift similarity index 99% rename from VimR/OpenedFileList.swift rename to VimR/VimR/OpenedFileList.swift index a3d0dac7..ca7e4ceb 100644 --- a/VimR/OpenedFileList.swift +++ b/VimR/VimR/OpenedFileList.swift @@ -6,7 +6,7 @@ import Cocoa import RxSwift import PureLayout -import SwiftNeoVim +import NvimView class BuffersList: NSView, UiComponent, diff --git a/VimR/OpenedFileListReducer.swift b/VimR/VimR/OpenedFileListReducer.swift similarity index 100% rename from VimR/OpenedFileListReducer.swift rename to VimR/VimR/OpenedFileListReducer.swift diff --git a/VimR/Pref128ToCurrentConverter.swift b/VimR/VimR/Pref128ToCurrentConverter.swift similarity index 100% rename from VimR/Pref128ToCurrentConverter.swift rename to VimR/VimR/Pref128ToCurrentConverter.swift diff --git a/VimR/PrefPane.swift b/VimR/VimR/PrefPane.swift similarity index 100% rename from VimR/PrefPane.swift rename to VimR/VimR/PrefPane.swift diff --git a/VimR/PrefService.swift b/VimR/VimR/PrefService.swift similarity index 100% rename from VimR/PrefService.swift rename to VimR/VimR/PrefService.swift diff --git a/VimR/PrefUtils.swift b/VimR/VimR/PrefUtils.swift similarity index 99% rename from VimR/PrefUtils.swift rename to VimR/VimR/PrefUtils.swift index f65d002b..df51b756 100644 --- a/VimR/PrefUtils.swift +++ b/VimR/VimR/PrefUtils.swift @@ -4,7 +4,7 @@ */ import Cocoa -import SwiftNeoVim +import NvimView class PrefUtils { diff --git a/VimR/PrefWindow.swift b/VimR/VimR/PrefWindow.swift similarity index 100% rename from VimR/PrefWindow.swift rename to VimR/VimR/PrefWindow.swift diff --git a/VimR/PrefWindowReducer.swift b/VimR/VimR/PrefWindowReducer.swift similarity index 100% rename from VimR/PrefWindowReducer.swift rename to VimR/VimR/PrefWindowReducer.swift diff --git a/VimR/PreviewReducer.swift b/VimR/VimR/PreviewReducer.swift similarity index 100% rename from VimR/PreviewReducer.swift rename to VimR/VimR/PreviewReducer.swift diff --git a/VimR/PreviewService.swift b/VimR/VimR/PreviewService.swift similarity index 100% rename from VimR/PreviewService.swift rename to VimR/VimR/PreviewService.swift diff --git a/VimR/PreviewTool.swift b/VimR/VimR/PreviewTool.swift similarity index 100% rename from VimR/PreviewTool.swift rename to VimR/VimR/PreviewTool.swift diff --git a/VimR/PreviewToolReducer.swift b/VimR/VimR/PreviewToolReducer.swift similarity index 100% rename from VimR/PreviewToolReducer.swift rename to VimR/VimR/PreviewToolReducer.swift diff --git a/VimR/PreviewUtils.swift b/VimR/VimR/PreviewUtils.swift similarity index 100% rename from VimR/PreviewUtils.swift rename to VimR/VimR/PreviewUtils.swift diff --git a/VimR/RxSwiftCommons.swift b/VimR/VimR/RxSwiftCommons.swift similarity index 100% rename from VimR/RxSwiftCommons.swift rename to VimR/VimR/RxSwiftCommons.swift diff --git a/VimR/ScoredFileItem.swift b/VimR/VimR/ScoredFileItem.swift similarity index 100% rename from VimR/ScoredFileItem.swift rename to VimR/VimR/ScoredFileItem.swift diff --git a/VimR/Scorer.swift b/VimR/VimR/Scorer.swift similarity index 100% rename from VimR/Scorer.swift rename to VimR/VimR/Scorer.swift diff --git a/VimR/SerializableStates.swift b/VimR/VimR/SerializableStates.swift similarity index 100% rename from VimR/SerializableStates.swift rename to VimR/VimR/SerializableStates.swift diff --git a/VimR/States.swift b/VimR/VimR/States.swift similarity index 100% rename from VimR/States.swift rename to VimR/VimR/States.swift diff --git a/VimR/SwiftCommons.swift b/VimR/VimR/SwiftCommons.swift similarity index 100% rename from VimR/SwiftCommons.swift rename to VimR/VimR/SwiftCommons.swift diff --git a/VimR/Theme.swift b/VimR/VimR/Theme.swift similarity index 98% rename from VimR/Theme.swift rename to VimR/VimR/Theme.swift index a55335ef..858fe677 100644 --- a/VimR/Theme.swift +++ b/VimR/VimR/Theme.swift @@ -4,7 +4,7 @@ */ import Cocoa -import SwiftNeoVim +import NvimView func changeTheme(themePrefChanged: Bool, themeChanged: Bool, usesTheme: Bool, forTheme: () -> Void, forDefaultTheme: () -> Void) -> Bool { diff --git a/VimR/ThemedTableSubviews.swift b/VimR/VimR/ThemedTableSubviews.swift similarity index 99% rename from VimR/ThemedTableSubviews.swift rename to VimR/VimR/ThemedTableSubviews.swift index dea1cc55..c10bddb3 100644 --- a/VimR/ThemedTableSubviews.swift +++ b/VimR/VimR/ThemedTableSubviews.swift @@ -4,7 +4,7 @@ */ import Cocoa -import SwiftNeoVim +import NvimView import PureLayout protocol ThemedView: class { diff --git a/VimR/ToolsPref.swift b/VimR/VimR/ToolsPref.swift similarity index 100% rename from VimR/ToolsPref.swift rename to VimR/VimR/ToolsPref.swift diff --git a/VimR/ToolsPrefReducer.swift b/VimR/VimR/ToolsPrefReducer.swift similarity index 100% rename from VimR/ToolsPrefReducer.swift rename to VimR/VimR/ToolsPrefReducer.swift diff --git a/VimR/Types.swift b/VimR/VimR/Types.swift similarity index 100% rename from VimR/Types.swift rename to VimR/VimR/Types.swift diff --git a/VimR/UiRoot.swift b/VimR/VimR/UiRoot.swift similarity index 100% rename from VimR/UiRoot.swift rename to VimR/VimR/UiRoot.swift diff --git a/VimR/UiRootReducer.swift b/VimR/VimR/UiRootReducer.swift similarity index 100% rename from VimR/UiRootReducer.swift rename to VimR/VimR/UiRootReducer.swift diff --git a/VimR/Workspace/InnterToolBar.swift b/VimR/VimR/Workspace/InnterToolBar.swift similarity index 100% rename from VimR/Workspace/InnterToolBar.swift rename to VimR/VimR/Workspace/InnterToolBar.swift diff --git a/VimR/Workspace/ProxyWorkspaceBar.swift b/VimR/VimR/Workspace/ProxyWorkspaceBar.swift similarity index 100% rename from VimR/Workspace/ProxyWorkspaceBar.swift rename to VimR/VimR/Workspace/ProxyWorkspaceBar.swift diff --git a/VimR/Workspace/Workspace.swift b/VimR/VimR/Workspace/Workspace.swift similarity index 100% rename from VimR/Workspace/Workspace.swift rename to VimR/VimR/Workspace/Workspace.swift diff --git a/VimR/Workspace/WorkspaceBar.swift b/VimR/VimR/Workspace/WorkspaceBar.swift similarity index 100% rename from VimR/Workspace/WorkspaceBar.swift rename to VimR/VimR/Workspace/WorkspaceBar.swift diff --git a/VimR/Workspace/WorkspaceTool.swift b/VimR/VimR/Workspace/WorkspaceTool.swift similarity index 100% rename from VimR/Workspace/WorkspaceTool.swift rename to VimR/VimR/Workspace/WorkspaceTool.swift diff --git a/VimR/Workspace/WorkspaceToolButton.swift b/VimR/VimR/Workspace/WorkspaceToolButton.swift similarity index 100% rename from VimR/Workspace/WorkspaceToolButton.swift rename to VimR/VimR/Workspace/WorkspaceToolButton.swift diff --git a/VimR/markdown/github-markdown.css b/VimR/VimR/markdown/github-markdown.css similarity index 100% rename from VimR/markdown/github-markdown.css rename to VimR/VimR/markdown/github-markdown.css diff --git a/VimR/markdown/template.html b/VimR/VimR/markdown/template.html similarity index 100% rename from VimR/markdown/template.html rename to VimR/VimR/markdown/template.html diff --git a/VimR/preview/base.css b/VimR/VimR/preview/base.css similarity index 100% rename from VimR/preview/base.css rename to VimR/VimR/preview/base.css diff --git a/VimR/preview/empty.html b/VimR/VimR/preview/empty.html similarity index 100% rename from VimR/preview/empty.html rename to VimR/VimR/preview/empty.html diff --git a/VimR/preview/error.html b/VimR/VimR/preview/error.html similarity index 100% rename from VimR/preview/error.html rename to VimR/VimR/preview/error.html diff --git a/VimR/preview/save-first.html b/VimR/VimR/preview/save-first.html similarity index 100% rename from VimR/preview/save-first.html rename to VimR/VimR/preview/save-first.html diff --git a/VimR/preview/select-first.html b/VimR/VimR/preview/select-first.html similarity index 100% rename from VimR/preview/select-first.html rename to VimR/VimR/preview/select-first.html diff --git a/VimR/sparkle_pub.pem b/VimR/VimR/sparkle_pub.pem similarity index 100% rename from VimR/sparkle_pub.pem rename to VimR/VimR/sparkle_pub.pem diff --git a/VimR/vimr b/VimR/VimR/vimr similarity index 100% rename from VimR/vimr rename to VimR/VimR/vimr diff --git a/VimRTests/ArrayCommonsTest.swift b/VimR/VimRTests/ArrayCommonsTest.swift similarity index 100% rename from VimRTests/ArrayCommonsTest.swift rename to VimR/VimRTests/ArrayCommonsTest.swift diff --git a/VimRTests/DictionaryCommonsTest.swift b/VimR/VimRTests/DictionaryCommonsTest.swift similarity index 100% rename from VimRTests/DictionaryCommonsTest.swift rename to VimR/VimRTests/DictionaryCommonsTest.swift diff --git a/VimRTests/FileItemIgnorePatternTest.swift b/VimR/VimRTests/FileItemIgnorePatternTest.swift similarity index 100% rename from VimRTests/FileItemIgnorePatternTest.swift rename to VimR/VimRTests/FileItemIgnorePatternTest.swift diff --git a/VimRTests/FileUtilsTest.swift b/VimR/VimRTests/FileUtilsTest.swift similarity index 100% rename from VimRTests/FileUtilsTest.swift rename to VimR/VimRTests/FileUtilsTest.swift diff --git a/SwiftNeoVimTests/Info.plist b/VimR/VimRTests/Info.plist similarity index 100% rename from SwiftNeoVimTests/Info.plist rename to VimR/VimRTests/Info.plist diff --git a/VimRTests/MatcherTests.swift b/VimR/VimRTests/MatcherTests.swift similarity index 100% rename from VimRTests/MatcherTests.swift rename to VimR/VimRTests/MatcherTests.swift diff --git a/VimRTests/PrefUtilsTest.swift b/VimR/VimRTests/PrefUtilsTest.swift similarity index 100% rename from VimRTests/PrefUtilsTest.swift rename to VimR/VimRTests/PrefUtilsTest.swift diff --git a/VimRTests/RxSwiftCommonsTest.swift b/VimR/VimRTests/RxSwiftCommonsTest.swift similarity index 100% rename from VimRTests/RxSwiftCommonsTest.swift rename to VimR/VimRTests/RxSwiftCommonsTest.swift diff --git a/VimRTests/ScorerTest.swift b/VimR/VimRTests/ScorerTest.swift similarity index 100% rename from VimRTests/ScorerTest.swift rename to VimR/VimRTests/ScorerTest.swift diff --git a/VimRTests/StringCommonsTest.swift b/VimR/VimRTests/StringCommonsTest.swift similarity index 100% rename from VimRTests/StringCommonsTest.swift rename to VimR/VimRTests/StringCommonsTest.swift diff --git a/VimRTests/UrlCommonsTest.swift b/VimR/VimRTests/UrlCommonsTest.swift similarity index 100% rename from VimRTests/UrlCommonsTest.swift rename to VimR/VimRTests/UrlCommonsTest.swift diff --git a/VimRTests/resources/FileUtilsTest/a1/a1-file1 b/VimR/VimRTests/resources/FileUtilsTest/a1/a1-file1 similarity index 100% rename from VimRTests/resources/FileUtilsTest/a1/a1-file1 rename to VimR/VimRTests/resources/FileUtilsTest/a1/a1-file1 diff --git a/VimRTests/resources/FileUtilsTest/a1/a2/a1-a2-file1 b/VimR/VimRTests/resources/FileUtilsTest/a1/a2/a1-a2-file1 similarity index 100% rename from VimRTests/resources/FileUtilsTest/a1/a2/a1-a2-file1 rename to VimR/VimRTests/resources/FileUtilsTest/a1/a2/a1-a2-file1 diff --git a/VimRTests/resources/FileUtilsTest/b1/b1-file1 b/VimR/VimRTests/resources/FileUtilsTest/b1/b1-file1 similarity index 100% rename from VimRTests/resources/FileUtilsTest/b1/b1-file1 rename to VimR/VimRTests/resources/FileUtilsTest/b1/b1-file1 diff --git a/VimRTests/resources/UrlCommonsTest/.dot-hidden-file b/VimR/VimRTests/resources/UrlCommonsTest/.dot-hidden-file similarity index 100% rename from VimRTests/resources/UrlCommonsTest/.dot-hidden-file rename to VimR/VimRTests/resources/UrlCommonsTest/.dot-hidden-file diff --git a/VimRTests/resources/UrlCommonsTest/dummy.rtfd/TXT.rtf b/VimR/VimRTests/resources/UrlCommonsTest/dummy.rtfd/TXT.rtf similarity index 100% rename from VimRTests/resources/UrlCommonsTest/dummy.rtfd/TXT.rtf rename to VimR/VimRTests/resources/UrlCommonsTest/dummy.rtfd/TXT.rtf diff --git a/VimRTests/Info.plist b/VimRTests/Info.plist deleted file mode 100644 index 8d54dd35..00000000 --- a/VimRTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - SNAPSHOT-243 - CFBundleSignature - ???? - CFBundleVersion - 243 - - diff --git a/bin/build.sh b/bin/build.sh index aad905db..1ed826aa 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -58,8 +58,11 @@ fi ./bin/build_vimr.sh true +pushd VimR BUNDLE_VERSION=$(agvtool what-version | sed '2q;d' | sed -E 's/ +(.+)/\1/') MARKETING_VERSION=$(agvtool what-marketing-version | tail -n 1 | sed -E 's/.*of "(.*)" in.*/\1/') +popd + COMPOUND_VERSION="v${MARKETING_VERSION}-${BUNDLE_VERSION}" TAG=${COMPOUND_VERSION} diff --git a/bin/build_deps.sh b/bin/build_deps.sh index fb3e4861..92d1a56e 100755 --- a/bin/build_deps.sh +++ b/bin/build_deps.sh @@ -6,6 +6,8 @@ GETTEXT_VERSION="0.19.8.1" echo "### Building deps" +pushd NvimView + rm -rf .deps mkdir .deps pushd .deps @@ -48,4 +50,6 @@ pushd third-party/libintl/lib ln -f -s libintl.8.dylib libintl.dylib popd +popd # $WORKSPACE_ROOT + echo "### Built deps" diff --git a/bin/build_libnvim.sh b/bin/build_libnvim.sh index 0ec5885f..fdbf9347 100755 --- a/bin/build_libnvim.sh +++ b/bin/build_libnvim.sh @@ -4,7 +4,12 @@ set -e echo "### Building libnvim" -# We assume that we're already in the neovim project root -make CFLAGS='-mmacosx-version-min=10.10' MACOSX_DEPLOYMENT_TARGET=10.10 CMAKE_EXTRA_FLAGS="-DGETTEXT_SOURCE=CUSTOM -DPREFER_LUA=ON" libnvim +# We assume that we're already in the neovim project root. +# Use custom gettext source only when building libnvim => not in local.mk which is also used to build the full nvim +# to get the full runtime. +make CFLAGS='-mmacosx-version-min=10.10' \ + MACOSX_DEPLOYMENT_TARGET=10.10 \ + CMAKE_EXTRA_FLAGS="-DGETTEXT_SOURCE=CUSTOM -DPREFER_LUA=ON" \ + libnvim echo "### Built libnvim" diff --git a/bin/build_travis.sh b/bin/build_travis.sh index 44a74e5e..f63a28f1 100755 --- a/bin/build_travis.sh +++ b/bin/build_travis.sh @@ -4,14 +4,14 @@ set -e echo "### Building libnvim" -pushd neovim +pushd NvimView/neovim -ln -f -s ../local.mk . +ln -f -s ../../local.mk . rm -rf build make distclean -../bin/build_libnvim.sh +../../bin/build_libnvim.sh popd @@ -20,9 +20,8 @@ carthage update --platform osx --cache-builds # to avoid Xcode time out, cf https://stackoverflow.com/questions/37922146/xctests-failing-on-physical-device-canceling-tests-due-to-timeout/40790171#40790171 echo "### Building" -xcodebuild build -scheme SwiftNeoVim -workspace VimR.xcworkspace +xcodebuild build -scheme NvimView -workspace VimR.xcworkspace xcodebuild build -scheme VimR -workspace VimR.xcworkspace echo "### Executing tests" -xcodebuild test -scheme SwiftNeoVim -workspace VimR.xcworkspace xcodebuild test -scheme VimR -workspace VimR.xcworkspace diff --git a/bin/build_vimr.sh b/bin/build_vimr.sh index 829c3ad5..d1bae0a5 100755 --- a/bin/build_vimr.sh +++ b/bin/build_vimr.sh @@ -11,7 +11,7 @@ echo "### Building VimR target" # 1. Build normally to get the full runtime folder and copy it to the neovim's project root # 2. Delete the build folder to re-configure # 3. Build libnvim -pushd neovim +pushd NvimView/neovim ln -f -s ../local.mk . @@ -19,17 +19,17 @@ rm -rf build make distclean echo "### Building nvim to get the complete runtime folder" -rm -rf /tmp/nvim -make CFLAGS='-mmacosx-version-min=10.10' MACOSX_DEPLOYMENT_TARGET=10.10 CMAKE_FLAGS="-DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=/tmp/nvim" install +rm -rf /tmp/nvim-runtime +make CFLAGS='-mmacosx-version-min=10.10' MACOSX_DEPLOYMENT_TARGET=10.10 CMAKE_FLAGS="-DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=/tmp/nvim-runtime" install rm -rf build make clean -../bin/build_libnvim.sh +../../bin/build_libnvim.sh echo "### Copying runtime" rm -rf runtime -cp -r /tmp/nvim/share/nvim/runtime . +cp -r /tmp/nvim-runtime/share/nvim/runtime . popd diff --git a/bin/clean_old_builds.sh b/bin/clean_old_builds.sh index fe5898b1..df0ba098 100755 --- a/bin/clean_old_builds.sh +++ b/bin/clean_old_builds.sh @@ -5,9 +5,9 @@ set -e echo "### Cleaning old builds" rm -rf build -xcodebuild clean +xcodebuild -workspace VimR.xcworkspace -scheme VimR clean -derivedDataPath build -pushd neovim +pushd NvimView/neovim rm -rf build make distclean popd diff --git a/bin/commit_and_push_tags.sh b/bin/commit_and_push_tags.sh index 4619fe6c..516190ba 100755 --- a/bin/commit_and_push_tags.sh +++ b/bin/commit_and_push_tags.sh @@ -15,7 +15,7 @@ echo "### Pushing commit and tag to vimr repository" git push origin HEAD:"${BRANCH}" git push origin "${TAG}" -pushd neovim +pushd NvimView/neovim echo "### Tagging neovim" git tag -s -m "vimr/${TAG}" "vimr/${TAG}" @@ -23,4 +23,4 @@ git tag -s -m "vimr/${TAG}" "vimr/${TAG}" echo "### Pushing tag to neovim repository" git push origin "vimr/${TAG}" -popd neovim +popd diff --git a/bin/generate_source.py b/bin/generate_source.py index b114e966..961af6ed 100755 --- a/bin/generate_source.py +++ b/bin/generate_source.py @@ -5,8 +5,9 @@ import io import re from string import Template +print(os.getcwd()) if 'CONFIGURATION' in os.environ and os.environ['CONFIGURATION'] == 'Debug': - if os.path.isfile('SwiftNeoVim/NeoVimAutoCommandEvent.generated.h') and os.path.isfile('SwiftNeoVim/NeoVimAutoCommandEvent.generated.m'): + if os.path.isfile('./NvimView/NeoVimAutoCommandEvent.generated.h') and os.path.isfile('./NvimView/NeoVimAutoCommandEvent.generated.m'): print("Files already there, exiting...") exit(0) @@ -37,7 +38,7 @@ impl = auto_cmds_impl_template.substitute( event_cases='\n'.join( [' case NeoVimAutoCommandEvent{}: return @"{}";'.format(event[0], event[0]) for event in auto_cmds]) ) -with io.open('SwiftNeoVim/NeoVimAutoCommandEvent.generated.m', 'w') as auto_cmds_impl_file: +with io.open('./NvimView/NeoVimAutoCommandEvent.generated.m', 'w') as auto_cmds_impl_file: auto_cmds_impl_file.write(unicode(impl)) auto_cmds_header_template = Template( @@ -58,5 +59,5 @@ header = auto_cmds_header_template.substitute( ), count=str(len(auto_cmds)) ) -with io.open('SwiftNeoVim/NeoVimAutoCommandEvent.generated.h', 'w') as auto_cmds_header_file: +with io.open('./NvimView/NeoVimAutoCommandEvent.generated.h', 'w') as auto_cmds_header_file: auto_cmds_header_file.write(unicode(header)) diff --git a/bin/set_new_versions.sh b/bin/set_new_versions.sh index 3b93ae9b..aada09c0 100755 --- a/bin/set_new_versions.sh +++ b/bin/set_new_versions.sh @@ -7,6 +7,8 @@ MARKETING_VERSION=$2 echo "### Setting versions of VimR" +pushd VimR + # bundle version agvtool bump -all @@ -18,4 +20,13 @@ fi agvtool new-marketing-version ${MARKETING_VERSION} +popd + +for proj in 'MsgPackRpc' 'NvimMsgPack' 'NvimView'; do + pushd ${proj} + agvtool new-version -all ${BUNDLE_VERSION} + agvtool new-marketing-version ${MARKETING_VERSION} + popd +done + echo "### Set versions of VimR"