Short name for application and extension.

Now the app/extension works with space inside his path.
New debug options to create a colorize.log file on your Desktop with the log of last operations.

Author: sbarex

.gitignore

@@ -4,6 +4,7 @@
 
 ## User settings
 xcuserdata/
+*xcworkspace/xcuserdata/*
 
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 *.xcscmblueprint

Application/AppDelegate.swift

@@ -21,7 +21,7 @@
 //  along with SourceCodeSyntaxHighlight. If not, see <http://www.gnu.org/licenses/>.
 
 import Cocoa
-import SourceCodeSyntaxHighlightXPCService
+import Syntax_Highlight_XPC_Service
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {

Application/Base.lproj/Main.storyboard

@@ -139,9 +139,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Syntax Highlight</string>
-	<key>CFBundleDisplayName</key>
-	<string>Source Code Syntax Highlight</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
@@ -151,7 +149,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
@@ -446,12 +444,12 @@
 			</dict>
 		</dict>
 		<dict>
-			<key>UTTypeDescription</key>
-			<string>Markdown document</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.plain-text</string>
 			</array>
+			<key>UTTypeDescription</key>
+			<string>Markdown document</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.daringfireball.markdown</string>
 			<key>UTTypeTagSpecification</key>

Application/Info.plist

@@ -22,7 +22,7 @@
 
 import Cocoa
 import WebKit
-import SourceCodeSyntaxHighlightXPCService
+import Syntax_Highlight_XPC_Service
 
 typealias SuppressedExtension = (ext: String, uti: String)
 
@@ -140,6 +140,7 @@ class PreferencesViewController: NSViewController {
     @IBOutlet weak var lineNumbersPopup: NSPopUpButton!
     @IBOutlet weak var tabSpacesSlider: NSSlider!
     @IBOutlet weak var argumentsTextField: NSTextField!
+    @IBOutlet weak var debugButton: NSButton!
 
     @IBOutlet weak var examplesPopup: NSPopUpButton!
 
@@ -412,13 +413,28 @@ class PreferencesViewController: NSViewController {
 
     // MARK: - Settings
 
+    /// Get the url of the quicklook extension.
+    func getQLAppexUrl() -> URL? {
+        guard let base_url = Bundle.main.builtInPlugInsURL else {
+            return nil
+        }
+        do {
+            for url in try FileManager.default.contentsOfDirectory(at: base_url, includingPropertiesForKeys: nil, options: []) {
+                // Suppose only one appex on the plugin dir.
+                if url.pathExtension == "appex" {
+                    return url
+                }
+            }
+        } catch {
+            return nil
+        }
+        return nil
+    }
+    
     /// Get all handled UTIs.
     func fetchUtis() -> [UTIDesc] {
-        let url = Bundle.main.bundleURL.appendingPathComponent("Contents/PlugIns/SourceCodeSyntaxHighlightExtension.appex")
-        
         // Get the list of all uti supported by the quicklook extension.
-        guard let bundle = Bundle(url: url), let extensionInfo = bundle.object(forInfoDictionaryKey: "NSExtension") as? [String: Any], let attributes = extensionInfo["NSExtensionAttributes"] as? [String: Any], let supportedTypes = attributes["QLSupportedContentTypes"] as? [String] else {
-            self.dismiss(self)
+        guard let url = getQLAppexUrl(), let bundle = Bundle(url: url), let extensionInfo = bundle.object(forInfoDictionaryKey: "NSExtension") as? [String: Any], let attributes = extensionInfo["NSExtensionAttributes"] as? [String: Any], let supportedTypes = attributes["QLSupportedContentTypes"] as? [String] else {
             return []
         }
 
@@ -604,6 +620,9 @@ class PreferencesViewController: NSViewController {
 
         fontChooseButton.isEnabled = settings != nil
 
+        debugButton.state = settings?.debug ?? false ? .on : .off
+        debugButton.isEnabled = settings != nil
+        
         previewThemeControl.isEnabled = settings != nil
         refreshButton.isEnabled = settings != nil
         saveButton.isEnabled = settings != nil
@@ -762,6 +781,8 @@ class PreferencesViewController: NSViewController {
         settings.tabSpaces = tabSpacesSlider.integerValue
         settings.extra = argumentsTextField.stringValue
 
+        settings.debug = debugButton.state == .on
+        
         return settings
     }
 
@@ -1230,7 +1251,7 @@ class PreferencesViewController: NSViewController {
             // Show standard theme preview.
             if let theme: SCSHTheme = themes.first(where: { $0.name == custom_settings.theme }) {
                 if custom_settings.format == .html {
-                    webView.loadHTMLString(theme.getHtmlExample(fontName: settings.fontFamily ?? "Menlo", fontSize: settings.fontSize ?? 12), baseURL: nil)
+                    webView.loadHTMLString(theme.getHtmlExample(fontName: settings.fontFamily ?? "Menlo", fontSize: (settings.fontSize ?? 12) * 1), baseURL: nil)
                 } else {
                     textView.textStorage?.setAttributedString(theme.getAttributedExample(fontName: custom_settings.fontFamily ?? "Menlo", fontSize: custom_settings.fontSize ?? 12))
 

Application/PreferencesViewController.swift

@@ -22,7 +22,7 @@
 
 import Cocoa
 import WebKit
-import SourceCodeSyntaxHighlightXPCService
+import Syntax_Highlight_XPC_Service
 
 class ViewController: NSViewController {
     var webView: WKWebView?
@@ -40,12 +40,12 @@ class ViewController: NSViewController {
     }
 
     func load(url: URL) {
-        self.webView?.loadHTMLString("", baseURL: nil)
         self.webView?.isHidden = true
+        self.webView?.loadHTMLString("", baseURL: nil)
 
-        self.textView?.string = ""
         self.textScrollView?.isHidden = true
-
+        self.textView?.string = ""
+        
         self.representedObject = url
     }
 
@@ -59,8 +59,8 @@ class ViewController: NSViewController {
         }
     }
 
-    func initializeView(forMode mode: String) {
-        if mode == SCSHFormat.rtf.rawValue {
+    func initializeView(forMode mode: SCSHFormat) {
+        if mode == .rtf {
             if self.textScrollView == nil {
                 self.textScrollView = NSScrollView(frame: self.view.bounds)
                 self.textScrollView!.autoresizingMask = [.height, .width]
@@ -116,9 +116,10 @@ class ViewController: NSViewController {
 
                 self.webView = WKWebView(frame: self.view.bounds, configuration: configuration)
                 self.webView!.autoresizingMask = [.height, .width]
+                self.webView?.isHidden = true
 
                 self.view.addSubview(self.webView!)
-                self.webView?.addObserver(self, forKeyPath: #keyPath(WKWebView.estimatedProgress), options: .new, context: nil)
+                self.webView?.navigationDelegate = self
             }
 
             if let tsv = textScrollView {
@@ -142,11 +143,11 @@ class ViewController: NSViewController {
         textScrollView?.isHidden = true
 
         service?.colorize(url: documentUrl, overrideSettings: [SCSHSettings.Key.embedCustomStyle: false]) { (response, settings, error) in
-            let format = settings[SCSHSettings.Key.format] as? String ?? SCSHFormat.html.rawValue
+            let format = SCSHFormat(rawValue: settings[SCSHSettings.Key.format] as? String ?? "html") ?? .html
             DispatchQueue.main.async {
                 self.initializeView(forMode: format)
 
-                if format == SCSHFormat.rtf.rawValue {
+                if format == .rtf {
                     let text: NSAttributedString
                     if let e = error {
                         text = NSAttributedString(string: String(data: response, encoding: .utf8) ?? e.localizedDescription)
@@ -170,18 +171,21 @@ class ViewController: NSViewController {
                     let html: String = response.decodeToString().trimmingCharacters(in: CharacterSet.newlines)
 
                     self.webView?.loadHTMLString(html, baseURL: nil)
-                    self.view.window?.makeFirstResponder(self.webView!)
                 }
             }
         }
     }
+}
+
+extension ViewController: WKNavigationDelegate {
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        // Show the quicklook preview only after the complete rendering (preventing a flickering glitch).
+        webView.isHidden = false
+        self.view.window?.makeFirstResponder(webView)
+    }
 
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if keyPath == "estimatedProgress", let w = self.webView, w.estimatedProgress == 1 {
-            // Show the webview only when loading is complete.
-            self.progressIndicatorView.stopAnimation(self)
-            self.webView?.isHidden = false
-        }
+    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        webView.isHidden = false
     }
 }
 

Application/ViewController.swift

@@ -4,16 +4,14 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Source Code Syntax Highlight Quicklook extension</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Source Code Syntax Highlight Quicklook extension</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
@@ -23,7 +21,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>

QLExtension/Info.plist

@@ -25,7 +25,7 @@ import Quartz
 import WebKit
 import OSLog
 
-import SourceCodeSyntaxHighlightXPCService
+import Syntax_Highlight_XPC_Service
 
 class MyDraggingView: NSTextView {
     var trackArea: NSTrackingArea? = nil

QLExtension/PreviewViewController.swift

@@ -34,7 +34,7 @@ On MacOs every file extension is associated to an [Uniform Type Identifier (UTI)
 
 For this reason, this application supports many UTIs even if they are apparently redundant. 
 
-Apparently the operating system does not allow to manage some file formats including (but not limited to) .xml, .plist, .html.
+Apparently the operating system does not allow to manage some file formats including (but not limited to) .xml, .plist, .html, .ts, .dart.
 
 
 ## Application preferences