Merge branch 'spm' into develop

- First wave of packages via SPM

Cartfile

@@ -1,17 +1,11 @@
 # included as Framework
-github "IBM-Swift/BlueSocket" == 1.0.52
-github "PureLayout/PureLayout" == 3.1.6
 github "ReactiveX/RxSwift" == 5.1.1
 github "a2/MessagePack.swift" == 4.0.0
 github "qvacua/CocoaFontAwesome" "master"
-github "qvacua/CocoaMarkdown" "master"
 github "Kentzo/ShortcutRecorder" == 3.2
 github "sparkle-project/Sparkle" == 1.23.0
-github "httpswift/swifter" == 1.4.7
 
 # included directly
-github "elegantchaos/DictionaryCoding" == 1.0.9
-github "eonil/FSEvents" == 0.1.7
 github "sindresorhus/github-markdown-css" == 4.0.0
 
 # for testing only

Cartfile.resolved

@@ -1,13 +1,7 @@
-github "IBM-Swift/BlueSocket" "1.0.52"
 github "Kentzo/ShortcutRecorder" "3.2"
-github "PureLayout/PureLayout" "v3.1.6"
 github "Quick/Nimble" "v8.1.1"
 github "ReactiveX/RxSwift" "5.1.1"
 github "a2/MessagePack.swift" "4.0.0"
-github "elegantchaos/DictionaryCoding" "1.0.9"
-github "eonil/FSEvents" "0.1.7"
-github "httpswift/swifter" "1.4.7"
 github "qvacua/CocoaFontAwesome" "fc2a08babd676525ced68061b19ad8ff3dd1d0b3"
-github "qvacua/CocoaMarkdown" "c58166490a71ad4d8466f7e7b9faf7cb0917c42f"
 github "sindresorhus/github-markdown-css" "v4.0.0"
 github "sparkle-project/Sparkle" "v1.23.0"

NvimView/NvimView.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -82,9 +82,6 @@
 		4B3C736724BB26F1006274F0 /* Defs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BF14AE831C6832659B66 /* Defs.swift */; };
 		4B3C736824BB2702006274F0 /* OSLogCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B39C7DCDA4E9D5220CD8 /* OSLogCommons.swift */; };
 		4B4A48DC222C7C6A00C8E3A1 /* SharedTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4A48DB222C7C6A00C8E3A1 /* SharedTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4B4B31EE24DC6415000ADAE4 /* SocketProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4B31EB24DC6415000ADAE4 /* SocketProtocols.swift */; };
-		4B4B31EF24DC6415000ADAE4 /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4B31EC24DC6415000ADAE4 /* Socket.swift */; };
-		4B4B31F024DC6415000ADAE4 /* SocketUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4B31ED24DC6415000ADAE4 /* SocketUtils.swift */; };
 		4B6DFB39223592B90066BB43 /* OSLogCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B39C7DCDA4E9D5220CD8 /* OSLogCommons.swift */; };
 		4B8662E81FDC3F9F007F490D /* com.qvacua.NvimView.vim in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B8662E41FDC3D4F007F490D /* com.qvacua.NvimView.vim */; };
 		4B90F02E1FD2AFAE008A39E0 /* NvimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0101FD2AFAC008A39E0 /* NvimView.swift */; };
@@ -155,6 +152,7 @@
 		4BF4FD7C2416A03B0025ACC4 /* MessagePack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5CA209740E900EC394A /* MessagePack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BF4FD7E2416A06D0025ACC4 /* FifoCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BA35C7CA9FEA9FFA3A51 /* FifoCache.swift */; };
 		4BF4FD802416A18E0025ACC4 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF4FD7F2416A18E0025ACC4 /* GameKit.framework */; };
+		4BFB6C1E24E80B7F00B105BA /* Socket in Frameworks */ = {isa = PBXBuildFile; productRef = 4BFB6C1D24E80B7F00B105BA /* Socket */; };
 		A1670FEA244A19E2006A05AB /* ModeInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1670FE9244A19E2006A05AB /* ModeInfo.swift */; };
 /* End PBXBuildFile section */
 
@@ -331,9 +329,6 @@
 		4B3C736124BB2634006274F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4B4A48DA222C7C5600C8E3A1 /* server_shared_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_shared_types.h; sourceTree = "<group>"; };
 		4B4A48DB222C7C6A00C8E3A1 /* SharedTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedTypes.h; sourceTree = "<group>"; };
-		4B4B31EB24DC6415000ADAE4 /* SocketProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketProtocols.swift; path = ../../Carthage/Checkouts/BlueSocket/Sources/Socket/SocketProtocols.swift; sourceTree = "<group>"; };
-		4B4B31EC24DC6415000ADAE4 /* Socket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Socket.swift; path = ../../Carthage/Checkouts/BlueSocket/Sources/Socket/Socket.swift; sourceTree = "<group>"; };
-		4B4B31ED24DC6415000ADAE4 /* SocketUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketUtils.swift; path = ../../Carthage/Checkouts/BlueSocket/Sources/Socket/SocketUtils.swift; sourceTree = "<group>"; };
 		4B8662E41FDC3D4F007F490D /* com.qvacua.NvimView.vim */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.vim; path = com.qvacua.NvimView.vim; sourceTree = "<group>"; };
 		4B8C647C23EB6F91008733D8 /* NvimServer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NvimServer.entitlements; sourceTree = "<group>"; };
 		4B90F0041FD2AF59008A39E0 /* NvimView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NvimView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -412,6 +407,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4BFB6C1E24E80B7F00B105BA /* Socket in Frameworks */,
 				4BC5B0431FE551DF0071D64F /* RxSwift.framework in Frameworks */,
 				4BB1F5CB209740E900EC394A /* MessagePack.framework in Frameworks */,
 			);
@@ -525,16 +521,6 @@
 			path = EnvTest;
 			sourceTree = "<group>";
 		};
-		4B4B31EA24DC63FE000ADAE4 /* Blue Socket */ = {
-			isa = PBXGroup;
-			children = (
-				4B4B31EC24DC6415000ADAE4 /* Socket.swift */,
-				4B4B31EB24DC6415000ADAE4 /* SocketProtocols.swift */,
-				4B4B31ED24DC6415000ADAE4 /* SocketUtils.swift */,
-			);
-			name = "Blue Socket";
-			sourceTree = "<group>";
-		};
 		4B90EFFA1FD2AF59008A39E0 = {
 			isa = PBXGroup;
 			children = (
@@ -571,7 +557,6 @@
 		4B90F0061FD2AF59008A39E0 /* NvimView */ = {
 			isa = PBXGroup;
 			children = (
-				4B4B31EA24DC63FE000ADAE4 /* Blue Socket */,
 				4B022678224ACE320052362B /* RxPack */,
 				4B4A48DB222C7C6A00C8E3A1 /* SharedTypes.h */,
 				4B90F0081FD2AF59008A39E0 /* Info.plist */,
@@ -753,6 +738,9 @@
 				4B90F06E1FD2B9E3008A39E0 /* PBXTargetDependency */,
 			);
 			name = NvimView;
+			packageProductDependencies = (
+				4BFB6C1D24E80B7F00B105BA /* Socket */,
+			);
 			productName = NvimView;
 			productReference = 4B90F0041FD2AF59008A39E0 /* NvimView.framework */;
 			productType = "com.apple.product-type.framework";
@@ -862,6 +850,9 @@
 				Base,
 			);
 			mainGroup = 4B90EFFA1FD2AF59008A39E0;
+			packageReferences = (
+				4BFB6C1C24E80B7F00B105BA /* XCRemoteSwiftPackageReference "BlueSocket" */,
+			);
 			productRefGroup = 4B90F0051FD2AF59008A39E0 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -1046,11 +1037,8 @@
 				1929BAB9A0399206FB7EBC76 /* CellAttributesCollection.swift in Sources */,
 				1929B3B70C96A78FD63DE737 /* NvimView+Debug.swift in Sources */,
 				4B022689224ACFE30052362B /* RxMessagePort.swift in Sources */,
-				4B4B31EF24DC6415000ADAE4 /* Socket.swift in Sources */,
 				1929B738A3677586230704F7 /* MessagePackCommons.swift in Sources */,
 				4BB1EFB0224B71ED00A5CD5A /* RxMsgpackRpc.swift in Sources */,
-				4B4B31EE24DC6415000ADAE4 /* SocketProtocols.swift in Sources */,
-				4B4B31F024DC6415000ADAE4 /* SocketUtils.swift in Sources */,
 				4BB1EFB4224B71ED00A5CD5A /* RxSwiftCommons.swift in Sources */,
 				1929B00C084F8EA5EF0BE6E2 /* NvimView+Geometry.swift in Sources */,
 				1929B06F50B2585777FFBE48 /* NvimApiCommons.swift in Sources */,
@@ -1196,7 +1184,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = MinimalNvimViewDemo/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.MinimalNvimViewDemo;
@@ -1214,7 +1205,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = MinimalNvimViewDemo/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.MinimalNvimViewDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1229,7 +1223,11 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = NvimViewTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.NvimViewTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1242,7 +1240,11 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = NvimViewTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.NvimViewTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1259,7 +1261,10 @@
 				DEVELOPMENT_TEAM = H96Q2NKTQH;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = EnvTest/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -1282,7 +1287,10 @@
 				DEVELOPMENT_TEAM = H96Q2NKTQH;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = EnvTest/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.EnvTest;
@@ -1404,8 +1412,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1425,7 +1434,11 @@
 				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";
+				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;
@@ -1447,7 +1460,11 @@
 				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";
+				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;
@@ -1546,7 +1563,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = DrawerPerf/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.DrawerPerf;
@@ -1563,7 +1583,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = DrawerPerf/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.DrawerPerf;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1579,7 +1602,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = DrawerDev/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.DrawerDev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -1594,7 +1620,10 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
 				INFOPLIST_FILE = DrawerDev/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.DrawerDev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -1677,6 +1706,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		4BFB6C1C24E80B7F00B105BA /* XCRemoteSwiftPackageReference "BlueSocket" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/IBM-Swift/BlueSocket";
+			requirement = {
+				kind = exactVersion;
+				version = 1.0.52;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		4BFB6C1D24E80B7F00B105BA /* Socket */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4BFB6C1C24E80B7F00B105BA /* XCRemoteSwiftPackageReference "BlueSocket" */;
+			productName = Socket;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 4B90EFFB1FD2AF59008A39E0 /* Project object */;
 }

NvimView/NvimView.xcodeproj/xcshareddata/xcschemes/EnvTest.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1160"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4B3C735724BB2631006274F0"
+               BuildableName = "EnvTest.app"
+               BlueprintName = "EnvTest"
+               ReferencedContainer = "container:NvimView.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4B3C735724BB2631006274F0"
+            BuildableName = "EnvTest.app"
+            BlueprintName = "EnvTest"
+            ReferencedContainer = "container:NvimView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4B3C735724BB2631006274F0"
+            BuildableName = "EnvTest.app"
+            BlueprintName = "EnvTest"
+            ReferencedContainer = "container:NvimView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

RxPack/RxMsgpackRpc.swift

@@ -6,6 +6,7 @@
 import Foundation
 import MessagePack
 import RxSwift
+import Socket
 
 public final class RxMsgpackRpc {
   public typealias Value = MessagePackValue

VimR.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,61 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Socket",
+        "repositoryURL": "https://github.com/IBM-Swift/BlueSocket",
+        "state": {
+          "branch": null,
+          "revision": "c46a3d41f5b2401d18bcb46d0101cdc5cd13e307",
+          "version": "1.0.52"
+        }
+      },
+      {
+        "package": "DictionaryCoding",
+        "repositoryURL": "https://github.com/elegantchaos/DictionaryCoding",
+        "state": {
+          "branch": null,
+          "revision": "ae19e456bd550fed8f341e5bae4318333c53a5b4",
+          "version": "1.0.9"
+        }
+      },
+      {
+        "package": "Down",
+        "repositoryURL": "https://github.com/iwasrobbed/Down",
+        "state": {
+          "branch": null,
+          "revision": "427aec0a0ab342246ec02369dea398597b61174a",
+          "version": "0.9.3"
+        }
+      },
+      {
+        "package": "EonilFSEvents",
+        "repositoryURL": "https://github.com/eonil/FSEvents",
+        "state": {
+          "branch": null,
+          "revision": "e6b7cdfa2754454e194a45ee6c2004d0f630fe88",
+          "version": "0.1.7"
+        }
+      },
+      {
+        "package": "PureLayout",
+        "repositoryURL": "https://github.com/PureLayout/PureLayout",
+        "state": {
+          "branch": null,
+          "revision": "d19b40e831e4d621097765998be97df3856e8413",
+          "version": "3.1.6"
+        }
+      },
+      {
+        "package": "Swifter",
+        "repositoryURL": "https://github.com/httpswift/swifter",
+        "state": {
+          "branch": null,
+          "revision": "8b5afb48ae64d4f729f0489ddcfe09c62b9c3687",
+          "version": "1.4.7"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

VimR/VimR.xcodeproj/project.pbxproj

@@ -3,10 +3,11 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1929B0153C780675EE33F9EC /* AttributedStringMarkdownStyler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BD6439FB8568CD045A41 /* AttributedStringMarkdownStyler.swift */; };
 		1929B04CE8ECBD75CBBB0991 /* StringCommonsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B5D45C9792BBE76B8AFF /* StringCommonsTest.swift */; };
 		1929B05B9D664052EC2D23EF /* FileOutlineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BCE3E156C06EDF1F2806 /* FileOutlineView.swift */; };
 		1929B0C7150100A84FBDB8BF /* ShortcutItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BF230875DED6CD7AB3EB /* ShortcutItem.swift */; };
@@ -82,14 +83,6 @@
 		1929BF4FF30D9A9DE82C3052 /* FileUtilsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B8042AC566CDF6C998A3 /* FileUtilsTest.swift */; };
 		1929BF5D0EFCC56A733BB4B7 /* FuzzySearch.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 1929B656C04BA6F950BFA2F5 /* FuzzySearch.xcdatamodel */; };
 		1929BFDE22D155F7C4B19E96 /* HtmlPreviewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B85023B042C485409CE1 /* HtmlPreviewTool.swift */; };
-		4B004BCF21063B600043A396 /* DictionaryDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCB21063B600043A396 /* DictionaryDecoder.swift */; };
-		4B004BD021063B600043A396 /* DictionaryDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCB21063B600043A396 /* DictionaryDecoder.swift */; };
-		4B004BD121063B600043A396 /* DictionaryCodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCC21063B600043A396 /* DictionaryCodingKey.swift */; };
-		4B004BD221063B600043A396 /* DictionaryCodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCC21063B600043A396 /* DictionaryCodingKey.swift */; };
-		4B004BD321063B600043A396 /* DictionaryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCD21063B600043A396 /* DictionaryEncoder.swift */; };
-		4B004BD421063B600043A396 /* DictionaryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCD21063B600043A396 /* DictionaryEncoder.swift */; };
-		4B004BD521063B600043A396 /* DictionaryErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCE21063B600043A396 /* DictionaryErrors.swift */; };
-		4B004BD621063B600043A396 /* DictionaryErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B004BCE21063B600043A396 /* DictionaryErrors.swift */; };
 		4B029F1A1D45E349004EE0D3 /* PrefWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B029F1C1D45E349004EE0D3 /* PrefWindow.xib */; };
 		4B19BEFC1E110183007E823C /* markdown in Resources */ = {isa = PBXBuildFile; fileRef = 4B19BEFA1E110183007E823C /* markdown */; };
 		4B19BEFD1E110183007E823C /* preview in Resources */ = {isa = PBXBuildFile; fileRef = 4B19BEFB1E110183007E823C /* preview */; };
@@ -107,22 +100,6 @@
 		4B6A70941D60E04200E12030 /* AppKitCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70931D60E04200E12030 /* AppKitCommons.swift */; };
 		4B6A70961D6100E300E12030 /* SwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70951D6100E300E12030 /* SwiftCommons.swift */; };
 		4B6DFB3A22366D140066BB43 /* OSLogCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929BE867BD8F0ED0246CC94 /* OSLogCommons.swift */; };
-		4B917E4D2334D52D00752149 /* EonilFSEventStreamError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E452334D52D00752149 /* EonilFSEventStreamError.swift */; };
-		4B917E4E2334D52D00752149 /* EonilFSEventStreamError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E452334D52D00752149 /* EonilFSEventStreamError.swift */; };
-		4B917E502334D52D00752149 /* EonilFSEventStreamEventFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E462334D52D00752149 /* EonilFSEventStreamEventFlags.swift */; };
-		4B917E512334D52D00752149 /* EonilFSEventStreamEventFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E462334D52D00752149 /* EonilFSEventStreamEventFlags.swift */; };
-		4B917E532334D52D00752149 /* EonilFSEventStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E472334D52D00752149 /* EonilFSEventStream.swift */; };
-		4B917E542334D52D00752149 /* EonilFSEventStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E472334D52D00752149 /* EonilFSEventStream.swift */; };
-		4B917E562334D52D00752149 /* EonilFSEventStreamCreateFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E482334D52D00752149 /* EonilFSEventStreamCreateFlags.swift */; };
-		4B917E572334D52D00752149 /* EonilFSEventStreamCreateFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E482334D52D00752149 /* EonilFSEventStreamCreateFlags.swift */; };
-		4B917E592334D52D00752149 /* EonilFSEventStreamEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E492334D52D00752149 /* EonilFSEventStreamEvent.swift */; };
-		4B917E5A2334D52D00752149 /* EonilFSEventStreamEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E492334D52D00752149 /* EonilFSEventStreamEvent.swift */; };
-		4B917E5C2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E4A2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift */; };
-		4B917E5D2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E4A2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift */; };
-		4B917E5F2334D52D00752149 /* EonilFSEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E4B2334D52D00752149 /* EonilFSEvents.swift */; };
-		4B917E602334D52D00752149 /* EonilFSEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E4B2334D52D00752149 /* EonilFSEvents.swift */; };
-		4B917E622334D52D00752149 /* EonilFSEventStreamEventID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E4C2334D52D00752149 /* EonilFSEventStreamEventID.swift */; };
-		4B917E632334D52D00752149 /* EonilFSEventStreamEventID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B917E4C2334D52D00752149 /* EonilFSEventStreamEventID.swift */; };
 		4B9433DC20B95EC6005807BA /* MacVim-bsh.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A120B95EC1005807BA /* MacVim-bsh.icns */; };
 		4B9433DD20B95EC6005807BA /* MacVim-generic.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A220B95EC1005807BA /* MacVim-generic.icns */; };
 		4B9433DE20B95EC6005807BA /* MacVim-dylan.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4B9433A320B95EC1005807BA /* MacVim-dylan.icns */; };
@@ -187,8 +164,6 @@
 		4B96FB401EBBC56F00E4E164 /* FoundationCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */; };
 		4B96FB421EBBC56F00E4E164 /* SwiftCommons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6A70951D6100E300E12030 /* SwiftCommons.swift */; };
 		4B97E2CC1D33F53D00FC0660 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B97E2CE1D33F53D00FC0660 /* MainWindow.xib */; };
-		4B9DF286209C8A8B00DF2AAD /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9DF285209C8A8B00DF2AAD /* Swifter.framework */; };
-		4B9DF287209C8A8B00DF2AAD /* Swifter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9DF285209C8A8B00DF2AAD /* Swifter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4B9DF288209C8DA000DF2AAD /* MessagePack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BB1F5D02097705E00EC394A /* MessagePack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BB1F5D12097705E00EC394A /* MessagePack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5D02097705E00EC394A /* MessagePack.framework */; };
 		4BB1F5D22097706700EC394A /* MessagePack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB1F5D02097705E00EC394A /* MessagePack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -201,6 +176,11 @@
 		4BC903F022799E2D0016A1CD /* RxRelay.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC903E822799DEB0016A1CD /* RxRelay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BC97BC72273B27500B68997 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; };
 		4BC97BC82273B27600B68997 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		4BD5657324E842E900D52809 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 4BD5655224E8014100D52809 /* Swifter */; };
+		4BD5657424E842E900D52809 /* PureLayout in Frameworks */ = {isa = PBXBuildFile; productRef = 4BD5655824E8040E00D52809 /* PureLayout */; };
+		4BD5657524E842E900D52809 /* Down in Frameworks */ = {isa = PBXBuildFile; productRef = 4BD5656024E8311400D52809 /* Down */; };
+		4BD5657824E8443300D52809 /* DictionaryCoding in Frameworks */ = {isa = PBXBuildFile; productRef = 4BD5657724E8443300D52809 /* DictionaryCoding */; };
+		4BD5657B24E8448300D52809 /* EonilFSEvents in Frameworks */ = {isa = PBXBuildFile; productRef = 4BD5657A24E8448300D52809 /* EonilFSEvents */; };
 		4BDA50B42160BE70004D10A9 /* Socket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B0A1AA72120C35100F1E02F /* Socket.framework */; };
 		4BDA50B52160BE76004D10A9 /* Socket.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B0A1AA72120C35100F1E02F /* Socket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4BDF500C1D760A3500D8FBC3 /* FileUtilsTest in Resources */ = {isa = PBXBuildFile; fileRef = 4BDF500B1D760A3500D8FBC3 /* FileUtilsTest */; };
@@ -211,14 +191,10 @@
 		4BEBA50B1CFF374B00673FDF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA50A1CFF374B00673FDF /* Assets.xcassets */; };
 		4BEBA50E1CFF374B00673FDF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BEBA50C1CFF374B00673FDF /* MainMenu.xib */; };
 		4BF07EE41D51326A009BECEB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4BF07EE61D51326A009BECEB /* Credits.rtf */; };
-		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 */; };
 		4BF18C3E1FD2E2AB00DF95D1 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C361FD2E2AB00DF95D1 /* RxSwift.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, ); }; };
-		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, ); }; };
 		4BF18C4A1FD2E2DE00DF95D1 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C491FD2E2DE00DF95D1 /* Nimble.framework */; };
@@ -262,12 +238,9 @@
 				4BE34B842225BAD2002F57D3 /* ShortcutRecorder.framework in Embed Frameworks */,
 				4BB1F5D22097706700EC394A /* MessagePack.framework in Embed Frameworks */,
 				4BF18C411FD2E2C900DF95D1 /* CocoaFontAwesome.framework in Embed Frameworks */,
-				4BF18C421FD2E2C900DF95D1 /* CocoaMarkdown.framework in Embed Frameworks */,
-				4BF18C441FD2E2C900DF95D1 /* PureLayout.framework in Embed Frameworks */,
 				4BF18C451FD2E2C900DF95D1 /* RxCocoa.framework in Embed Frameworks */,
 				4BC903F022799E2D0016A1CD /* RxRelay.framework in Embed Frameworks */,
 				4BF18C461FD2E2C900DF95D1 /* RxSwift.framework in Embed Frameworks */,
-				4B9DF287209C8A8B00DF2AAD /* Swifter.framework in Embed Frameworks */,
 				4BC1642E1FD2DEEA001903BE /* NvimView.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -369,6 +342,7 @@
 		1929BCE3E156C06EDF1F2806 /* FileOutlineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileOutlineView.swift; sourceTree = "<group>"; };
 		1929BD2CA8DD198A6BCDBCB7 /* ThemedTableSubviews.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemedTableSubviews.swift; sourceTree = "<group>"; };
 		1929BD4149D5A25C82064DD8 /* UiRoot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UiRoot.swift; sourceTree = "<group>"; };
+		1929BD6439FB8568CD045A41 /* AttributedStringMarkdownStyler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttributedStringMarkdownStyler.swift; sourceTree = "<group>"; };
 		1929BD83A13BF133741766CC /* MainWindowReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowReducer.swift; sourceTree = "<group>"; };
 		1929BDC3F82CB4CB4FE56D1B /* ImageAndTextTableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAndTextTableCell.swift; sourceTree = "<group>"; };
 		1929BDC8F5D48578A90236E9 /* FileBrowserReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileBrowserReducer.swift; sourceTree = "<group>"; };
@@ -381,10 +355,6 @@
 		1929BF230875DED6CD7AB3EB /* ShortcutItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShortcutItem.swift; sourceTree = "<group>"; };
 		1929BFB0F294F3714D5E095F /* MarkdownToolReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownToolReducer.swift; sourceTree = "<group>"; };
 		1929BFC0A5A9C6DB09BE1368 /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = "<group>"; };
-		4B004BCB21063B600043A396 /* DictionaryDecoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryDecoder.swift; path = ../../Carthage/Checkouts/DictionaryCoding/Sources/DictionaryCoding/DictionaryDecoder.swift; sourceTree = "<group>"; };
-		4B004BCC21063B600043A396 /* DictionaryCodingKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryCodingKey.swift; path = ../../Carthage/Checkouts/DictionaryCoding/Sources/DictionaryCoding/DictionaryCodingKey.swift; sourceTree = "<group>"; };
-		4B004BCD21063B600043A396 /* DictionaryEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryEncoder.swift; path = ../../Carthage/Checkouts/DictionaryCoding/Sources/DictionaryCoding/DictionaryEncoder.swift; sourceTree = "<group>"; };
-		4B004BCE21063B600043A396 /* DictionaryErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryErrors.swift; path = ../../Carthage/Checkouts/DictionaryCoding/Sources/DictionaryCoding/DictionaryErrors.swift; sourceTree = "<group>"; };
 		4B029F1B1D45E349004EE0D3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PrefWindow.xib; sourceTree = "<group>"; };
 		4B0A1AA72120C35100F1E02F /* Socket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Socket.framework; path = ../Carthage/Build/Mac/Socket.framework; sourceTree = "<group>"; };
 		4B19BEFA1E110183007E823C /* markdown */ = {isa = PBXFileReference; lastKnownFileType = folder; path = markdown; sourceTree = "<group>"; };
@@ -403,14 +373,6 @@
 		4B6A70951D6100E300E12030 /* SwiftCommons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftCommons.swift; sourceTree = "<group>"; };
 		4B8C64CD23F02259008733D8 /* Dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Dev.xcconfig; sourceTree = "<group>"; };
 		4B8C64CE23F022C2008733D8 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		4B917E452334D52D00752149 /* EonilFSEventStreamError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamError.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStreamError.swift; sourceTree = "<group>"; };
-		4B917E462334D52D00752149 /* EonilFSEventStreamEventFlags.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamEventFlags.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStreamEventFlags.swift; sourceTree = "<group>"; };
-		4B917E472334D52D00752149 /* EonilFSEventStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStream.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStream.swift; sourceTree = "<group>"; };
-		4B917E482334D52D00752149 /* EonilFSEventStreamCreateFlags.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamCreateFlags.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStreamCreateFlags.swift; sourceTree = "<group>"; };
-		4B917E492334D52D00752149 /* EonilFSEventStreamEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamEvent.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStreamEvent.swift; sourceTree = "<group>"; };
-		4B917E4A2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamIllogicalErrorLog.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStreamIllogicalErrorLog.swift; sourceTree = "<group>"; };
-		4B917E4B2334D52D00752149 /* EonilFSEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEvents.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEvents.swift; sourceTree = "<group>"; };
-		4B917E4C2334D52D00752149 /* EonilFSEventStreamEventID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamEventID.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEvents/EonilFSEventStreamEventID.swift; sourceTree = "<group>"; };
 		4B9433A120B95EC1005807BA /* MacVim-bsh.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "MacVim-bsh.icns"; path = "macvim-file-icons/MacVim-bsh.icns"; sourceTree = "<group>"; };
 		4B9433A220B95EC1005807BA /* MacVim-generic.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "MacVim-generic.icns"; path = "macvim-file-icons/MacVim-generic.icns"; sourceTree = "<group>"; };
 		4B9433A320B95EC1005807BA /* MacVim-dylan.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "MacVim-dylan.icns"; path = "macvim-file-icons/MacVim-dylan.icns"; sourceTree = "<group>"; };
@@ -516,16 +478,18 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4BD5657524E842E900D52809 /* Down in Frameworks */,
+				4BD5657324E842E900D52809 /* Swifter in Frameworks */,
 				4BC97BC72273B27500B68997 /* Sparkle.framework in Frameworks */,
 				4BB1F5D12097705E00EC394A /* MessagePack.framework in Frameworks */,
-				4BF18C3A1FD2E2AB00DF95D1 /* PureLayout.framework in Frameworks */,
-				4BF18C3B1FD2E2AB00DF95D1 /* CocoaMarkdown.framework in Frameworks */,
 				4BF18C3C1FD2E2AB00DF95D1 /* CocoaFontAwesome.framework in Frameworks */,
 				4BF18C3E1FD2E2AB00DF95D1 /* RxSwift.framework in Frameworks */,
-				4B9DF286209C8A8B00DF2AAD /* Swifter.framework in Frameworks */,
 				4BC903EF22799E2D0016A1CD /* RxRelay.framework in Frameworks */,
+				4BD5657424E842E900D52809 /* PureLayout in Frameworks */,
+				4BD5657B24E8448300D52809 /* EonilFSEvents in Frameworks */,
 				4BF18C401FD2E2AB00DF95D1 /* RxCocoa.framework in Frameworks */,
 				4BE34B832225BAC7002F57D3 /* ShortcutRecorder.framework in Frameworks */,
+				4BD5657824E8443300D52809 /* DictionaryCoding in Frameworks */,
 				4BC164281FD2DEE1001903BE /* NvimView.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -753,17 +717,6 @@
 			name = Middlewares;
 			sourceTree = "<group>";
 		};
-		4B004BCA21063B4D0043A396 /* DictionaryCoding */ = {
-			isa = PBXGroup;
-			children = (
-				4B004BCC21063B600043A396 /* DictionaryCodingKey.swift */,
-				4B004BCB21063B600043A396 /* DictionaryDecoder.swift */,
-				4B004BCD21063B600043A396 /* DictionaryEncoder.swift */,
-				4B004BCE21063B600043A396 /* DictionaryErrors.swift */,
-			);
-			name = DictionaryCoding;
-			sourceTree = "<group>";
-		};
 		4B5012001EBA791000F76C46 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -894,21 +847,6 @@
 			name = resources;
 			sourceTree = "<group>";
 		};
-		4BB4CCEE224A7E6D00474C79 /* FSEvents */ = {
-			isa = PBXGroup;
-			children = (
-				4B917E4B2334D52D00752149 /* EonilFSEvents.swift */,
-				4B917E472334D52D00752149 /* EonilFSEventStream.swift */,
-				4B917E482334D52D00752149 /* EonilFSEventStreamCreateFlags.swift */,
-				4B917E452334D52D00752149 /* EonilFSEventStreamError.swift */,
-				4B917E492334D52D00752149 /* EonilFSEventStreamEvent.swift */,
-				4B917E462334D52D00752149 /* EonilFSEventStreamEventFlags.swift */,
-				4B917E4C2334D52D00752149 /* EonilFSEventStreamEventID.swift */,
-				4B917E4A2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift */,
-			);
-			name = FSEvents;
-			sourceTree = "<group>";
-		};
 		4BDF50101D760AB700D8FBC3 /* Commons */ = {
 			isa = PBXGroup;
 			children = (
@@ -919,6 +857,7 @@
 				1929B9AF20D7BD6E5C975128 /* FoundationCommons.swift */,
 				4B6A70951D6100E300E12030 /* SwiftCommons.swift */,
 				1929BE867BD8F0ED0246CC94 /* OSLogCommons.swift */,
+				1929BD6439FB8568CD045A41 /* AttributedStringMarkdownStyler.swift */,
 			);
 			name = Commons;
 			sourceTree = "<group>";
@@ -949,8 +888,6 @@
 			isa = PBXGroup;
 			children = (
 				4BF70ECB23D1B40A009E51E9 /* Fuzzy Search */,
-				4BB4CCEE224A7E6D00474C79 /* FSEvents */,
-				4B004BCA21063B4D0043A396 /* DictionaryCoding */,
 				4B2A2C0D1D0353750074CE9A /* Bridge.h */,
 				4B238BE01D3BF24200CBDD98 /* Application.swift */,
 				4BEBA5081CFF374B00673FDF /* AppDelegate.swift */,
@@ -1030,6 +967,13 @@
 			dependencies = (
 			);
 			name = VimR;
+			packageProductDependencies = (
+				4BD5655224E8014100D52809 /* Swifter */,
+				4BD5655824E8040E00D52809 /* PureLayout */,
+				4BD5656024E8311400D52809 /* Down */,
+				4BD5657724E8443300D52809 /* DictionaryCoding */,
+				4BD5657A24E8448300D52809 /* EonilFSEvents */,
+			);
 			productName = VimR;
 			productReference = 4BEBA5051CFF374B00673FDF /* VimR.app */;
 			productType = "com.apple.product-type.application";
@@ -1084,6 +1028,13 @@
 				Base,
 			);
 			mainGroup = 4BEBA4FC1CFF374B00673FDF;
+			packageReferences = (
+				4BD5655124E8014100D52809 /* XCRemoteSwiftPackageReference "swifter" */,
+				4BD5655724E8040E00D52809 /* XCRemoteSwiftPackageReference "PureLayout" */,
+				4BD5655F24E8311400D52809 /* XCRemoteSwiftPackageReference "Down" */,
+				4BD5657624E8443300D52809 /* XCRemoteSwiftPackageReference "DictionaryCoding" */,
+				4BD5657924E8448300D52809 /* XCRemoteSwiftPackageReference "FSEvents" */,
+			);
 			productRefGroup = 4BEBA5061CFF374B00673FDF /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -1205,7 +1156,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4B917E592334D52D00752149 /* EonilFSEventStreamEvent.swift in Sources */,
 				4B4147A31D97361400DD4A2C /* WorkspaceToolButton.swift in Sources */,
 				4B238BE11D3BF24200CBDD98 /* Application.swift in Sources */,
 				4B6423961D8EFD7100FC78C8 /* Workspace.swift in Sources */,
@@ -1215,7 +1165,6 @@
 				4B6A70961D6100E300E12030 /* SwiftCommons.swift in Sources */,
 				4BEBA5091CFF374B00673FDF /* AppDelegate.swift in Sources */,
 				4B64239A1D8EFE3000FC78C8 /* WorkspaceTool.swift in Sources */,
-				4B004BD521063B600043A396 /* DictionaryErrors.swift in Sources */,
 				1929B67DA3EB21A631EF1DBB /* FileUtils.swift in Sources */,
 				4BB409EE1DDA77E9005F39A2 /* ProxyWorkspaceBar.swift in Sources */,
 				1929B0E0C3BC59F52713D5A2 /* FoundationCommons.swift in Sources */,
@@ -1229,30 +1178,24 @@
 				4BF70ED623D1B54F009E51E9 /* ScoredUrl.m in Sources */,
 				4BF70EC823D1B3F9009E51E9 /* FuzzyMatcherPool.swift in Sources */,
 				1929B8FB248D71BF88A35761 /* MarkdownTool.swift in Sources */,
-				4B917E5F2334D52D00752149 /* EonilFSEvents.swift in Sources */,
 				1929B4B70926DE113E6BF990 /* MarkdownPreviewReducer.swift in Sources */,
 				1929B5C1BABBC0D09D97C3EF /* MarkdownPreviewMiddleware.swift in Sources */,
 				1929B0F599D1F62C7BE53D2C /* HttpServerMiddleware.swift in Sources */,
-				4B004BD321063B600043A396 /* DictionaryEncoder.swift in Sources */,
 				1929B3AC66EFE35D68C020E3 /* MarkdownToolReducer.swift in Sources */,
 				1929B59FA5C286E010F70BEE /* Types.swift in Sources */,
 				1929B6D8F5FC723B7109031F /* OpenQuicklyReducer.swift in Sources */,
 				4BF70EE123D1B5B3009E51E9 /* FileScanBaton.m in Sources */,
-				4B917E562334D52D00752149 /* EonilFSEventStreamCreateFlags.swift in Sources */,
 				1929B71381946860626E5224 /* FileBrowserReducer.swift in Sources */,
 				1929BA715337FE26155B2071 /* BufferList.swift in Sources */,
 				1929B4E54E2F13A7F5F2B682 /* BufferListReducer.swift in Sources */,
 				1929BAE4900D72A7877741B1 /* PrefWindow.swift in Sources */,
-				4B917E532334D52D00752149 /* EonilFSEventStream.swift in Sources */,
 				1929BEAE0592096BC1191B67 /* PrefPane.swift in Sources */,
 				1929BEDE1BE950EDA9497363 /* GeneralPref.swift in Sources */,
-				4B917E502334D52D00752149 /* EonilFSEventStreamEventFlags.swift in Sources */,
 				1929B3217A7A3D79E28C80DB /* PrefWindowReducer.swift in Sources */,
 				1929B6BE1610892E6C4C0CE6 /* GeneralPrefReducer.swift in Sources */,
 				1929B05B9D664052EC2D23EF /* FileOutlineView.swift in Sources */,
 				1929BCC9D3604933DFF07E2E /* FileBrowser.swift in Sources */,
 				1929B4F0612224E594E89B92 /* AppearancePref.swift in Sources */,
-				4B917E5C2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift in Sources */,
 				1929B50D933A369A86A165DE /* AdvencedPref.swift in Sources */,
 				1929BCC7908DD899999B70BE /* AppearancePrefReducer.swift in Sources */,
 				1929B3557317755A43513B17 /* OpenQuicklyWindow.swift in Sources */,
@@ -1268,15 +1211,11 @@
 				1929B6C0393DE40E34F4A49A /* ToolsPrefReducer.swift in Sources */,
 				1929B542A071BD03C846F6EF /* PrefUtils.swift in Sources */,
 				4BF70EC423D1B3F9009E51E9 /* FuzzyMatcher.mm in Sources */,
-				4B917E622334D52D00752149 /* EonilFSEventStreamEventID.swift in Sources */,
 				1929BE2F3E0182CC51F2763A /* ThemedTableSubviews.swift in Sources */,
 				1929B6460862447A31B5B082 /* ImageAndTextTableCell.swift in Sources */,
 				1929BBE28654E4307AF1E2FD /* Theme.swift in Sources */,
-				4B917E4D2334D52D00752149 /* EonilFSEventStreamError.swift in Sources */,
-				4B004BD121063B600043A396 /* DictionaryCodingKey.swift in Sources */,
 				1929B3A6C332FFAAEC7FD219 /* MainWindow+CustomTitle.swift in Sources */,
 				1929B8DDACEB28E6672AEC42 /* MainWindow.swift in Sources */,
-				4B004BCF21063B600043A396 /* DictionaryDecoder.swift in Sources */,
 				1929B5257DB27F03C6663482 /* MainWindow+Actions.swift in Sources */,
 				1929BE0F64A6CE5BCE2A5092 /* MainWindow+Delegates.swift in Sources */,
 				1929B8F498D1E7C53F572CE2 /* KeysPref.swift in Sources */,
@@ -1300,6 +1239,7 @@
 				1929B223C6E97C090474B2C2 /* Resources.swift in Sources */,
 				1929BC64D3C195A92BE3FD64 /* HtmlPreviewMiddleware.swift in Sources */,
 				1929B29FF537A339CF4075BD /* CssUtils.swift in Sources */,
+				1929B0153C780675EE33F9EC /* AttributedStringMarkdownStyler.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1309,31 +1249,19 @@
 			files = (
 				4B6DFB3A22366D140066BB43 /* OSLogCommons.swift in Sources */,
 				4B96FB3C1EBBC56F00E4E164 /* FileUtils.swift in Sources */,
-				4B917E572334D52D00752149 /* EonilFSEventStreamCreateFlags.swift in Sources */,
-				4B004BD621063B600043A396 /* DictionaryErrors.swift in Sources */,
 				4B96FB3F1EBBC56F00E4E164 /* PrefUtils.swift in Sources */,
 				4B96FB401EBBC56F00E4E164 /* FoundationCommons.swift in Sources */,
-				4B004BD021063B600043A396 /* DictionaryDecoder.swift in Sources */,
 				4B96FB421EBBC56F00E4E164 /* SwiftCommons.swift in Sources */,
 				4B3CF031224B7EAC00FA9833 /* RxSwiftCommons.swift in Sources */,
 				1929B66F795867B8C07FAAD4 /* DictionaryCommonsTest.swift in Sources */,
-				4B004BD221063B600043A396 /* DictionaryCodingKey.swift in Sources */,
-				4B917E542334D52D00752149 /* EonilFSEventStream.swift in Sources */,
 				1929B98F94536E3912AD9F3B /* ArrayCommonsTest.swift in Sources */,
 				1929BDFDBDA7180D02ACB37E /* RxSwiftCommonsTest.swift in Sources */,
-				4B917E5A2334D52D00752149 /* EonilFSEventStreamEvent.swift in Sources */,
 				1929B04CE8ECBD75CBBB0991 /* StringCommonsTest.swift in Sources */,
 				1929B370A275F8C70AD5AA08 /* UrlCommonsTest.swift in Sources */,
 				1929BF4FF30D9A9DE82C3052 /* FileUtilsTest.swift in Sources */,
-				4B917E4E2334D52D00752149 /* EonilFSEventStreamError.swift in Sources */,
-				4B917E632334D52D00752149 /* EonilFSEventStreamEventID.swift in Sources */,
-				4B917E602334D52D00752149 /* EonilFSEvents.swift in Sources */,
-				4B917E512334D52D00752149 /* EonilFSEventStreamEventFlags.swift in Sources */,
-				4B004BD421063B600043A396 /* DictionaryEncoder.swift in Sources */,
 				1929B8E90A1378E494D481E7 /* PrefUtilsTest.swift in Sources */,
 				1929B20CE35B43BB1CE023BA /* Theme.swift in Sources */,
 				1929B9318D32146D58BB38EC /* AppKitCommons.swift in Sources */,
-				4B917E5D2334D52D00752149 /* EonilFSEventStreamIllogicalErrorLog.swift in Sources */,
 				1929BE601267D52FA2E0D6D2 /* Defs.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1506,8 +1434,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1529,7 +1458,10 @@
 					"$(PROJECT_DIR)/../third-party/libpcre/include",
 				);
 				INFOPLIST_FILE = VimR/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				OTHER_LDFLAGS = (
 					"$(PROJECT_DIR)/../third-party/libxz/lib/liblzma.a",
 					"$(PROJECT_DIR)/../third-party/libpcre/lib/libpcre.a",
@@ -1558,7 +1490,10 @@
 					"$(PROJECT_DIR)/../third-party/libpcre/include",
 				);
 				INFOPLIST_FILE = VimR/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				OTHER_LDFLAGS = (
 					"$(PROJECT_DIR)/../third-party/libxz/lib/liblzma.a",
 					"$(PROJECT_DIR)/../third-party/libpcre/lib/libpcre.a",
@@ -1580,7 +1515,11 @@
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
 				);
 				INFOPLIST_FILE = VimRTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.VimRTests;
 				PRODUCT_NAME = VimRTests;
 			};
@@ -1595,7 +1534,11 @@
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
 				);
 				INFOPLIST_FILE = VimRTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.qvacua.VimRTests;
 				PRODUCT_NAME = VimRTests;
 			};
@@ -1632,6 +1575,77 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		4BD5655124E8014100D52809 /* XCRemoteSwiftPackageReference "swifter" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/httpswift/swifter";
+			requirement = {
+				kind = exactVersion;
+				version = 1.4.7;
+			};
+		};
+		4BD5655724E8040E00D52809 /* XCRemoteSwiftPackageReference "PureLayout" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/PureLayout/PureLayout";
+			requirement = {
+				kind = exactVersion;
+				version = 3.1.6;
+			};
+		};
+		4BD5655F24E8311400D52809 /* XCRemoteSwiftPackageReference "Down" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/iwasrobbed/Down";
+			requirement = {
+				kind = exactVersion;
+				version = 0.9.3;
+			};
+		};
+		4BD5657624E8443300D52809 /* XCRemoteSwiftPackageReference "DictionaryCoding" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/elegantchaos/DictionaryCoding";
+			requirement = {
+				kind = exactVersion;
+				version = 1.0.9;
+			};
+		};
+		4BD5657924E8448300D52809 /* XCRemoteSwiftPackageReference "FSEvents" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/eonil/FSEvents";
+			requirement = {
+				kind = exactVersion;
+				version = 0.1.7;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		4BD5655224E8014100D52809 /* Swifter */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4BD5655124E8014100D52809 /* XCRemoteSwiftPackageReference "swifter" */;
+			productName = Swifter;
+		};
+		4BD5655824E8040E00D52809 /* PureLayout */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4BD5655724E8040E00D52809 /* XCRemoteSwiftPackageReference "PureLayout" */;
+			productName = PureLayout;
+		};
+		4BD5656024E8311400D52809 /* Down */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4BD5655F24E8311400D52809 /* XCRemoteSwiftPackageReference "Down" */;
+			productName = Down;
+		};
+		4BD5657724E8443300D52809 /* DictionaryCoding */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4BD5657624E8443300D52809 /* XCRemoteSwiftPackageReference "DictionaryCoding" */;
+			productName = DictionaryCoding;
+		};
+		4BD5657A24E8448300D52809 /* EonilFSEvents */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4BD5657924E8448300D52809 /* XCRemoteSwiftPackageReference "FSEvents" */;
+			productName = EonilFSEvents;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 4BEBA4FD1CFF374B00673FDF /* Project object */;
 }

VimR/VimR/AdvencedPref.swift

@@ -97,45 +97,43 @@ class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
                            title: "Use interactive mode for zsh",
                            action: #selector(AdvancedPref.useInteractiveZshAction(_:)))
 
-    let useInteractiveZshInfo = self.infoTextField(markdown: """
+    let useInteractiveZshInfo = self.infoTextField(markdown: #"""
-      If your login shell is `zsh`, when checked, the `-i` option will be used to launch `zsh`.
+If your login shell is `zsh`, when checked, the `-i` option will be used to launch `zsh`.\
-      Checking this option may break VimR if your `.zshrc` contains complex stuff.
+Checking this option may break VimR if your `.zshrc` contains complex stuff.\
-      It may be a good idea to put the `PATH`-settings in `.zshenv` and let this unchecked.
+It may be a good idea to put the `PATH`-settings in `.zshenv` and let this unchecked.\
 *Use with caution.*
-     """)
+"""#)
 
     let useSnapshotUpdate = self.useSnapshotUpdateCheckbox
     self.configureCheckbox(button: self.useSnapshotUpdateCheckbox,
                            title: "Use Snapshot Update Channel",
                            action: #selector(AdvancedPref.useSnapshotUpdateChannelAction(_:)))
 
-    let useSnapshotUpdateInfo = self.infoTextField(markdown: """
+    let useSnapshotUpdateInfo = self.infoTextField(markdown: #"""
-      If you are adventurous, check this.
+If you are adventurous, check this. You'll be test driving the newest snapshot builds\
-      You'll be test driving the newest snapshot builds of VimR in no time!
+of VimR in no time!
-    """)
+"""#)
 
     let useLiveResize = self.useLiveResizeCheckbox
     self.configureCheckbox(button: useLiveResize,
                            title: "Use Live Window Resizing",
                            action: #selector(AdvancedPref.useLiveResizeAction(_:)))
 
-    let useLiveResizeInfo = self.infoTextField(markdown: """
+    let useLiveResizeInfo = self.infoTextField(markdown: #"""
-      The Live Resizing is yet experimental. You may experience some issues.
+The Live Resizing is yet experimental. You may experience some issues.\
 If you do, please report them at [GitHub](https://github.com/qvacua/vimr/issues).
-    """)
+"""#)
 
     let drawsParallelBox = self.drawsParallelCheckbox
     self.configureCheckbox(button: drawsParallelBox,
                            title: "Use Concurrent Rendering",
                            action: #selector(AdvancedPref.drawParallelAction(_:)))
 
-    let drawsParallelInfo = self.infoTextField(
+    let drawsParallelInfo = self.infoTextField(markdown: #"""
-      markdown: """
+VimR can compute the glyphs concurrently. This may result in faster rendering,\
-                VimR can compute the glyphs concurrently. This may result in faster rendering,
+depending on the situation. It will definitely result in higher CPU usage, e.g.\
-                depending on the situation. It will definitely result in higher CPU usage, e.g.
 when scrolling very fast.
-                """
+"""#)
-    )
 
     let sensitivityTitle = self.titleTextField(title: "Scroll Sensitivity:")
     let sensitivity = self.sensitivitySlider
@@ -143,10 +141,10 @@ class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
     sensitivity.minValue = 1 / 500
     sensitivity.target = self
     sensitivity.action = #selector(sensitivitySliderAction)
-    let sensitivityInfo = self.infoTextField(markdown: """
+    let sensitivityInfo = self.infoTextField(markdown: #"""
-      Trackpad scroll sensitivity is yet experimental. You may experience some issues.
+Trackpad scroll sensitivity is yet experimental. You may experience some issues.\
 If you do, please report them at [GitHub issue #572](https://github.com/qvacua/vimr/issues/572).
-    """)
+"""#)
 
     // We set the value of the NSSlider only at the beginning.
     self.sensitivitySlider.doubleValue = self.sensitivity
@@ -178,35 +176,30 @@ class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate {
 
     sensitivityInfo.autoPinEdge(.top, to: .bottom, of: sensitivitySlider, withOffset: 5)
     sensitivityInfo.autoPinEdge(.left, to: .right, of: sensitivityTitle, withOffset: 5)
-    sensitivityInfo.autoSetDimension(.width, toSize: 300)
 
     useLiveResize.autoPinEdge(.top, to: .bottom, of: sensitivityInfo, withOffset: 18)
     useLiveResize.autoPinEdge(.left, to: .right, of: sensitivityTitle, withOffset: 5)
 
     useLiveResizeInfo.autoPinEdge(.top, to: .bottom, of: useLiveResize, withOffset: 5)
     useLiveResizeInfo.autoPinEdge(.left, to: .left, of: useLiveResize)
-    useLiveResizeInfo.autoSetDimension(.width, toSize: 300)
 
     drawsParallelBox.autoPinEdge(.top, to: .bottom, of: useLiveResizeInfo, withOffset: 18)
     drawsParallelBox.autoPinEdge(.left, to: .right, of: sensitivityTitle, withOffset: 5)
 
     drawsParallelInfo.autoPinEdge(.top, to: .bottom, of: drawsParallelBox, withOffset: 5)
     drawsParallelInfo.autoPinEdge(.left, to: .left, of: drawsParallelBox)
-    drawsParallelInfo.autoSetDimension(.width, toSize: 300)
 
     useSnapshotUpdate.autoPinEdge(.top, to: .bottom, of: drawsParallelInfo, withOffset: 18)
     useSnapshotUpdate.autoPinEdge(.left, to: .right, of: sensitivityTitle, withOffset: 5)
 
     useSnapshotUpdateInfo.autoPinEdge(.top, to: .bottom, of: useSnapshotUpdate, withOffset: 5)
     useSnapshotUpdateInfo.autoPinEdge(.left, to: .left, of: useSnapshotUpdate)
-    useSnapshotUpdateInfo.autoSetDimension(.width, toSize: 300)
 
     useInteractiveZsh.autoPinEdge(.top, to: .bottom, of: useSnapshotUpdateInfo, withOffset: 18)
     useInteractiveZsh.autoPinEdge(.left, to: .right, of: sensitivityTitle, withOffset: 5)
 
     useInteractiveZshInfo.autoPinEdge(.top, to: .bottom, of: useInteractiveZsh, withOffset: 5)
     useInteractiveZshInfo.autoPinEdge(.left, to: .left, of: useInteractiveZsh)
-    useInteractiveZshInfo.autoSetDimension(.width, toSize: 300)
   }
 }
 

VimR/VimR/AppDelegate.swift

@@ -8,6 +8,7 @@ import RxSwift
 import PureLayout
 import Sparkle
 import CocoaFontAwesome
+import DictionaryCoding
 import os
 
 let debugMenuItemIdentifier = NSUserInterfaceItemIdentifier("debug-menu-item")

VimR/VimR/AppKitCommons.swift

@@ -4,7 +4,7 @@
  */
 
 import Cocoa
-import CocoaMarkdown
+import Down
 
 extension NSColor {
 
@@ -119,24 +119,8 @@ extension NSAttributedString {
 
   static func infoLabel(markdown: String) -> NSAttributedString {
     let size = NSFont.smallSystemFontSize
-    let document = CMDocument(data: markdown.data(using: .utf8), options: .normalize)
+    let down = Down(markdownString: markdown)
-
+    guard let result = try? down.toAttributedString(styler: downStyler) else {
-    let attrs = CMTextAttributes()
-    attrs?.textAttributes = [
-      NSAttributedString.Key.font: NSFont.systemFont(ofSize: size),
-      NSAttributedString.Key.foregroundColor: NSColor.gray,
-    ]
-    attrs?.inlineCodeAttributes = [
-      NSAttributedString.Key.font: NSFont.userFixedPitchFont(ofSize: size)!,
-      NSAttributedString.Key.foregroundColor: NSColor.gray,
-    ]
-
-    let renderer = CMAttributedStringRenderer(document: document, attributes: attrs)
-    renderer?.register(CMHTMLStrikethroughTransformer())
-    renderer?.register(CMHTMLSuperscriptTransformer())
-    renderer?.register(CMHTMLUnderlineTransformer())
-
-    guard let result = renderer?.render() else {
       preconditionFailure("Wrong markdown: \(markdown)")
     }
 
@@ -253,3 +237,10 @@ extension NSScrollView {
     return scrollView
   }
 }
+
+private let fontCollection = StaticFontCollection(
+  body: NSFont.systemFont(ofSize: NSFont.smallSystemFontSize),
+  code: NSFont.userFixedPitchFont(ofSize: NSFont.smallSystemFontSize)!
+)
+
+private let downStyler = AttributedStringMarkdownStyler.new()

VimR/VimR/AppearancePref.swift

@@ -94,15 +94,14 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
   private let ligatureCheckbox = NSButton(forAutoLayout: ())
   private let previewArea = NSTextView(frame: .zero)
 
-  private let exampleText =
+  private let exampleText = #"""
-    """
 abcdefghijklmnopqrstuvwxyz
 ABCDEFGHIJKLMNOPQRSTUVWXYZ
 0123456789 -~ - ~
 (){}[] +-*/= .,;:!?#&$%@|^
 <- -> => >> << >>= =<< .. 
 :: -< >- -<< >>- ++ /= ==
-    """
+"""#
 
   required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
 
@@ -116,12 +115,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
       action: #selector(AppearancePref.usesColorschemeAction(_:))
     )
 
-    let useColorschemeInfo = self.infoTextField(
+    let useColorschemeInfo = self.infoTextField(markdown: #"""
-      markdown: """
+If checked, the colors of the selected `colorscheme` will be used to render tools,\
-                If checked, the colors of the selected `colorscheme` will be
+for example the file browser.
-                used to render tools, e.g. the file browser.
+"""#)
-                """
-    )
 
     let fileIcon = self.fileIconCheckbox
     self.configureCheckbox(
@@ -130,12 +127,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
       action: #selector(AppearancePref.fileIconAction(_:))
     )
 
-    let fileIconInfo = self.infoTextField(
+    let fileIconInfo = self.infoTextField(markdown: #"""
-      markdown: """
+In case the selected `colorscheme` does not play well with the file icons\
-                In case the selected `colorscheme` does not play well with the file icons
 in the file browser and the buffer list, you can turn them off.
-                """
+"""#)
-    )
 
     let fontTitle = self.titleTextField(title: "Default Font:")
     let fontPanelButton = self.fontPanelButton

VimR/VimR/AttributedStringMarkdownStyler.swift

@@ -0,0 +1,54 @@
+/**
+ * Tae Won Ha - http://taewon.de - @hataewon
+ * See LICENSE
+ */
+
+import Cocoa
+import Down
+
+class AttributedStringMarkdownStyler {
+
+  static func new() -> Styler {
+    let fonts = StaticFontCollection(
+      body: NSFont.systemFont(ofSize: NSFont.smallSystemFontSize),
+      code: NSFont.userFixedPitchFont(ofSize: NSFont.smallSystemFontSize)!
+    )
+
+    let style = DownStylerConfiguration(fonts: fonts, paragraphStyles: ParagraphStyles())
+    return DownStyler(configuration: style)
+  }
+}
+
+private struct ParagraphStyles: ParagraphStyleCollection {
+
+  let heading1: NSParagraphStyle
+  let heading2: NSParagraphStyle
+  let heading3: NSParagraphStyle
+  let heading4: NSParagraphStyle
+  let heading5: NSParagraphStyle
+  let heading6: NSParagraphStyle
+  let body: NSParagraphStyle
+  let code: NSParagraphStyle
+
+  public init() {
+    let headingStyle = NSParagraphStyle()
+
+    let bodyStyle = NSMutableParagraphStyle()
+    bodyStyle.paragraphSpacingBefore = 2
+    bodyStyle.paragraphSpacing = 2
+    bodyStyle.lineSpacing = 2
+
+    let codeStyle = NSMutableParagraphStyle()
+    codeStyle.paragraphSpacingBefore = 2
+    codeStyle.paragraphSpacing = 2
+
+    self.heading1 = headingStyle
+    self.heading2 = headingStyle
+    self.heading3 = headingStyle
+    self.heading4 = headingStyle
+    self.heading5 = headingStyle
+    self.heading6 = headingStyle
+    self.body = bodyStyle
+    self.code = codeStyle
+  }
+}

VimR/VimR/FileMonitor.swift

@@ -4,6 +4,7 @@
  */
 
 import Foundation
+import EonilFSEvents
 import os
 
 class FileMonitor {

VimR/VimR/GeneralPref.swift

@@ -106,16 +106,13 @@ class GeneralPref: PrefPane, UiComponent, NSTextFieldDelegate {
 
     let ignoreListTitle = self.titleTextField(title: "Open Quickly:")
     let ignoreInfo =
-      self.infoTextField(
+      self.infoTextField(markdown: #"""
-        markdown:
+When checked, the ignore files of VCSs, e.g. `gitignore`, will we used to ignore files.\
-        """
+This checkbox will set the initial value for each VimR window.\
-        When checked, the ignore files of VCSs, e.g. `gitignore`, will we used to ignore files.  
+You can change this setting for each VimR window in the Open Quickly window.\
-        This checkbox will set the initial value for each VimR window.  
-        You can change this setting for each VimR window in the Open Quickly window.  
 The behavior should be almost identical to that of
 [The Silver Searcher](https://github.com/ggreer/the_silver_searcher).
-        """
+"""#)
-      )
 
     let cliToolTitle = self.titleTextField(title: "CLI Tool:")
     let cliToolButton = NSButton(forAutoLayout: ())

VimR/VimR/HtmlPreviewTool.swift

@@ -7,6 +7,7 @@ import Cocoa
 import RxSwift
 import PureLayout
 import WebKit
+import EonilFSEvents
 import os
 
 private let fileSystemEventsLatency = 1.0

VimR/VimR/KeysPref.swift

@@ -82,12 +82,12 @@ class KeysPref: PrefPane, UiComponent, NSTextFieldDelegate {
                            title: "Use Right Option as Meta",
                            action: #selector(KeysPref.isRightOptionMetaAction(_:)))
 
-    let metaInfo = self.infoTextField(markdown: """
+    let metaInfo = self.infoTextField(markdown: #"""
-      When an Option key is set to Meta, then every input containing the corresponding Option key will be passed
+    When an Option key is set to Meta, then every input containing the corresponding Option key will\
-      through to Neovim. This means that you can use mappings like `<M-1>` in Neovim, but cannot use the corresponding
+    be passed through to Neovim. This means that you can use mappings like `<M-1>` in Neovim, but\
-      Option key for keyboard shortcuts containing `Option` or to enter special characters like `µ`
+    cannot use the corresponding Option key for keyboard shortcuts containing `Option` or to enter\
-      which is entered by `Option-M` (on the ABC keyboard layout).
+    special characters like `µ` which is entered by `Option-M` (on the ABC keyboard layout).
-     """)
+    """#)
 
     self.addSubview(paneTitle)
 
@@ -107,7 +107,6 @@ class KeysPref: PrefPane, UiComponent, NSTextFieldDelegate {
 
     metaInfo.autoPinEdge(.top, to: .bottom, of: isRightOptionMeta, withOffset: 5)
     metaInfo.autoPinEdge(toSuperviewEdge: .left, withInset: 18)
-    metaInfo.autoSetDimension(.width, toSize: 300)
   }
 }
 

VimR/VimR/MarkdownPreviewMiddleware.swift

@@ -4,7 +4,7 @@
  */
 
 import Foundation
-import CocoaMarkdown
+import Down
 import os
 
 class MarkdownPreviewMiddleware {
@@ -105,13 +105,9 @@ class MarkdownPreviewMiddleware {
                             category: Defs.LoggerCategory.middleware)
 
     private func render(_ bufferUrl: URL, to htmlUrl: URL) throws {
-      let doc = CMDocument(contentsOfFile: bufferUrl.path, options: .sourcepos)
+      let md = try String(contentsOf: bufferUrl)
-      let renderer = CMHTMLRenderer(document: doc)
+      let down = Down(markdownString: md)
-
+      let body = try down.toHTML(DownOptions.sourcePos)
-      guard let body = renderer?.render() else {
-        // FIXME: error handling!
-        return
-      }
 
       let html = filledTemplate(body: body, title: bufferUrl.lastPathComponent)
       let htmlFilePath = htmlUrl.path

VimR/VimR/PrefMiddleware.swift

@@ -4,6 +4,7 @@
  */
 
 import Foundation
+import DictionaryCoding
 import os
 
 class PrefMiddleware: MiddlewareType {