Merge pull request #2 from RobertoMachorro/syntaxHighlighting

Syntax Highlighting
RobertoMachorro · Aug 21, 2019 · 2d19f5e · 2d19f5e
2 parents 6c9db2c + 3c4838a
commit 2d19f5e
Show file tree

Hide file tree

Showing 15 changed files with 416 additions and 245 deletions.
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "raspu/Highlightr"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "raspu/Highlightr" "2.1.1"
diff --git a/MacPad.xcodeproj/project.pbxproj b/MacPad.xcodeproj/project.pbxproj
@@ -8,7 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		E98D58A82300BB4D003E964A /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98D58A72300BB4D003E964A /* WindowController.swift */; };
-		E98D58AA2300BE7B003E964A /* StringModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E98D58A92300BE7B003E964A /* StringModel.swift */; };
+		E990B6EB230263440010CF5D /* Highlightr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E990B6EA230263440010CF5D /* Highlightr.framework */; };
+		E990B6F1230A38930010CF5D /* TextFileModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990B6F0230A38930010CF5D /* TextFileModel.swift */; };
+		E990B6F3230CC09B0010CF5D /* LanguagesUTI.plist in Resources */ = {isa = PBXBuildFile; fileRef = E990B6F2230CC09B0010CF5D /* LanguagesUTI.plist */; };
 		E9D0420D2300A9FE00382715 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9D0420C2300A9FE00382715 /* AppDelegate.swift */; };
 		E9D0420F2300A9FE00382715 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9D0420E2300A9FE00382715 /* ViewController.swift */; };
 		E9D042112300A9FE00382715 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9D042102300A9FE00382715 /* Document.swift */; };
@@ -19,7 +21,9 @@
 
 /* Begin PBXFileReference section */
 		E98D58A72300BB4D003E964A /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = "<group>"; };
-		E98D58A92300BE7B003E964A /* StringModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringModel.swift; sourceTree = "<group>"; };
+		E990B6EA230263440010CF5D /* Highlightr.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Highlightr.framework; path = Carthage/Build/Mac/Highlightr.framework; sourceTree = SOURCE_ROOT; };
+		E990B6F0230A38930010CF5D /* TextFileModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFileModel.swift; sourceTree = "<group>"; };
+		E990B6F2230CC09B0010CF5D /* LanguagesUTI.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = LanguagesUTI.plist; sourceTree = "<group>"; };
 		E9D042092300A9FE00382715 /* MacPad.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPad.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E9D0420C2300A9FE00382715 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E9D0420E2300A9FE00382715 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -36,6 +40,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E990B6EB230263440010CF5D /* Highlightr.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -64,13 +69,15 @@
 				E9D0420C2300A9FE00382715 /* AppDelegate.swift */,
 				E98D58A72300BB4D003E964A /* WindowController.swift */,
 				E9D0420E2300A9FE00382715 /* ViewController.swift */,
-				E98D58A92300BE7B003E964A /* StringModel.swift */,
+				E990B6F0230A38930010CF5D /* TextFileModel.swift */,
 				E9D042102300A9FE00382715 /* Document.swift */,
 				E9FC082C230115B800A1EE3D /* AboutViewController.swift */,
 				E9D042122300A9FE00382715 /* Assets.xcassets */,
 				E9D042142300A9FE00382715 /* Main.storyboard */,
 				E9D042172300A9FE00382715 /* Info.plist */,
+				E990B6F2230CC09B0010CF5D /* LanguagesUTI.plist */,
 				E9D042182300A9FE00382715 /* MacPad.entitlements */,
+				E990B6EA230263440010CF5D /* Highlightr.framework */,
 			);
 			path = MacPad;
 			sourceTree = "<group>";
@@ -85,6 +92,7 @@
 				E9D042052300A9FE00382715 /* Sources */,
 				E9D042062300A9FE00382715 /* Frameworks */,
 				E9D042072300A9FE00382715 /* Resources */,
+				E990B6EC230263880010CF5D /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -138,21 +146,44 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E990B6F3230CC09B0010CF5D /* LanguagesUTI.plist in Resources */,
 				E9D042132300A9FE00382715 /* Assets.xcassets in Resources */,
 				E9D042162300A9FE00382715 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		E990B6EC230263880010CF5D /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/Mac/Highlightr.framework",
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Highlightr.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/usr/local/bin/carthage copy-frameworks\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		E9D042052300A9FE00382715 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				E9FC082D230115B800A1EE3D /* AboutViewController.swift in Sources */,
+				E990B6F1230A38930010CF5D /* TextFileModel.swift in Sources */,
 				E9D0420F2300A9FE00382715 /* ViewController.swift in Sources */,
-				E98D58AA2300BE7B003E964A /* StringModel.swift in Sources */,
 				E98D58A82300BB4D003E964A /* WindowController.swift in Sources */,
 				E9D0420D2300A9FE00382715 /* AppDelegate.swift in Sources */,
 				E9D042112300A9FE00382715 /* Document.swift in Sources */,
@@ -295,6 +326,10 @@
 				CODE_SIGN_ENTITLEMENTS = MacPad/MacPad.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/Mac",
+				);
 				INFOPLIST_FILE = MacPad/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -313,6 +348,10 @@
 				CODE_SIGN_ENTITLEMENTS = MacPad/MacPad.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/Mac",
+				);
 				INFOPLIST_FILE = MacPad/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/MacPad.xcodeproj/xcshareddata/xcschemes/MacPad.xcscheme b/MacPad.xcodeproj/xcshareddata/xcschemes/MacPad.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1030"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E9D042082300A9FE00382715"
+               BuildableName = "MacPad.app"
+               BlueprintName = "MacPad"
+               ReferencedContainer = "container:MacPad.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E9D042082300A9FE00382715"
+            BuildableName = "MacPad.app"
+            BlueprintName = "MacPad"
+            ReferencedContainer = "container:MacPad.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </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 = "E9D042082300A9FE00382715"
+            BuildableName = "MacPad.app"
+            BlueprintName = "MacPad"
+            ReferencedContainer = "container:MacPad.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E9D042082300A9FE00382715"
+            BuildableName = "MacPad.app"
+            BlueprintName = "MacPad"
+            ReferencedContainer = "container:MacPad.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MacPad/AboutViewController.swift b/MacPad/AboutViewController.swift
@@ -28,6 +28,7 @@ class AboutViewController: NSViewController {
 	}
 
 	override func viewDidAppear() {
+		super.viewDidAppear()
 		view.window?.styleMask.remove(.resizable)
 	}
 

diff --git a/MacPad/AppDelegate.swift b/MacPad/AppDelegate.swift
@@ -23,6 +23,8 @@ import Cocoa
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
+	// MARK: - Application Delegate
+
 	func applicationDidFinishLaunching(_ aNotification: Notification) {
 		// Insert code here to initialize your application
 	}