Release 2.1.0 with macOS Monterey optimisation, support for plain files and VCS plugin.

Author: sbarex

.gitmodules

@@ -1,3 +1,5 @@
 [submodule "highlight-wrapper/highlight"]
 	path = highlight-wrapper/highlight
-	url = https://gitlab.com/saalen/highlight.git
+	url = https://gitlab.com/sbarex/highlight.git
+	ignore = dirty
+	branch = master

Application/AboutViewController.swift

@@ -136,11 +136,11 @@ hr {
                 NSWorkspace.shared.open(url)
                 decisionHandler(.cancel)
             } else {
-                print("Open it locally")
+                // print("Open it locally")
                 decisionHandler(.allow)
             }
         } else {
-            print("not a user click")
+            // print("not a user click")
             decisionHandler(.allow)
         }
     }
@@ -150,7 +150,7 @@ hr {
         view.window?.standardWindowButton(.zoomButton)?.isHidden = true
         view.window?.standardWindowButton(.miniaturizeButton)?.isHidden = true
         view.window?.titlebarAppearsTransparent = true
-        if #available(OSX 11.0, *) {
+        if #available(macOS 11.0, *) {
             view.window?.toolbarStyle = .unifiedCompact
             view.window?.titlebarSeparatorStyle = .none
         }

Application/AppDelegate.swift

@@ -63,7 +63,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {
         }
 
         // Insert code here to initialize your application
-        if #available(OSX 10.12.2, *) {
+        if #available(macOS 10.12.2, *) {
             NSApplication.shared.isAutomaticCustomizeTouchBarMenuItemEnabled = true
         }
 
@@ -140,6 +140,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {
 
         var fileTypes: [UTI] = []
         for type in supportedTypes {
+            guard !Settings.plainUTIs.contains(type) else {
+                continue
+            }
             let uti = UTI(type)
             if uti.isValid {
                 fileTypes.append(uti)
@@ -222,5 +225,31 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {
             }
         })
     }
+    
+    class func initSyntaxPopup(_ popupButton: NSPopUpButton?, availableSyntax: [String: HighlightWrapper.Language], extraItems extra: [String] = []) {
+        guard let popupButton = popupButton else {
+            return
+        }
+        popupButton.removeAllItems()
+        for item in extra {
+            popupButton.addItem(withTitle: item)
+        }
+        
+        guard availableSyntax.count > 0 else {
+            return
+        }
+        if !extra.isEmpty {
+            popupButton.menu?.addItem(NSMenuItem.separator())
+        }
+        let keys = availableSyntax.keys.sorted{$0.compare($1, options: .caseInsensitive) == .orderedAscending }
+        for desc in keys {
+            let m = NSMenuItem(title: desc, action: nil, keyEquivalent: "")
+            m.toolTip = desc
+            if let lang = availableSyntax[desc] {
+                m.toolTip! += " [." + lang.extensions.joined(separator: ", .") + "]"
+            }
+            popupButton.menu?.addItem(m)
+        }
+    }
 }
 

Application/Assets.xcassets/aA.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "aA.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Application/Assets.xcassets/aA.imageset/aA.pdf

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "doc.plaintext.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Application/Assets.xcassets/doc.plaintext.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "re.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Application/Assets.xcassets/doc.plaintext.imageset/doc.plaintext.pdf

@@ -295,7 +295,7 @@ class CustomTypeViewController: NSViewController, DropSensorDelegate, NSTableVie
                 view.imageView?.toolTip = "Not supported."
             case .highlight:
                 view.imageView?.image = NSImage(named: NSImage.statusPartiallyAvailableName)
-                view.imageView?.toolTip = "Supported but not handled."
+                view.imageView?.toolTip = "Potentially supported but not handled."
             case .unknown:
                 view.imageView?.image = NSImage(named: NSImage.statusNoneName)
                 view.imageView?.toolTip = "Unknown status."

Application/Assets.xcassets/line.horizontal.3.decrease.circle.imageset/Contents.json renamed to Application/Assets.xcassets/line.3.horizontal.decrease.circle.imageset/Contents.json

@@ -89,7 +89,9 @@ class HighlightWrapper {
             }
 
             for i in 0 ..< Int(n) {
-                let t = c_themes.advanced(by: i).pointee!.pointee
+                guard let t = c_themes.advanced(by: i).pointee?.pointee else {
+                    continue
+                }
 
                 highlight_get_theme(t.path, context, Themes.callback)
             }
@@ -409,7 +411,9 @@ class HighlightWrapper {
             let plugins = Unmanaged<Plugins>.fromOpaque(context!).takeUnretainedValue()
 
             for i in 0 ..< Int(n) {
-                let p = c_plugins.advanced(by: i).pointee!.pointee
+                guard let p = c_plugins.advanced(by: i).pointee?.pointee else {
+                    continue
+                }
                 plugins.plugins.append(Plugin(name: String(cString: p.name), desc: String(cString: p.desc), path: String(cString: p.path)))
             }
         }

Application/Assets.xcassets/line.horizontal.3.decrease.circle.imageset/line.horizontal.3.decrease.circle.pdf renamed to Application/Assets.xcassets/line.3.horizontal.decrease.circle.imageset/line.horizontal.3.decrease.circle.pdf

@@ -299,6 +299,24 @@
 				</array>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>dyn.ah62d4rv4ge81u5pu</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Adobe Extensible Metadata Platform file (XMP)</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.seriflabs.xmp</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>xmp</string>
+				</array>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeConformsTo</key>
 			<array>
@@ -350,6 +368,24 @@
 				</array>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.item</string>
+				<string>dyn.ah62d4rv4ge81g7xfrv4gn</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Svelte source file</string>
+			<key>UTTypeIdentifier</key>
+			<string>dev.svelte.source</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>svelte</string>
+				</array>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeConformsTo</key>
 			<array>
@@ -672,6 +708,11 @@
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.source-code</string>
+				<string>public.plain-text</string>
+				<string>public.text</string>
+				<string>public.data</string>
+				<string>public.item</string>
+				<string>public.content</string>
 				<string>dyn.ah62d4rv4ge80s52</string>
 			</array>
 			<key>UTTypeDescription</key>
@@ -1224,13 +1265,13 @@
 			</dict>
 		</dict>
 		<dict>
-			<key>UTTypeDescription</key>
-			<string>Outline Processor Markup Language (OPML) file</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.item</string>
 				<string>dyn.ah62d4rv4ge8086drru</string>
 			</array>
+			<key>UTTypeDescription</key>
+			<string>Outline Processor Markup Language (OPML) file</string>
 			<key>UTTypeIdentifier</key>
 			<string>org.opml.source</string>
 			<key>UTTypeTagSpecification</key>

Application/Assets.xcassets/re.imageset/Contents.json

@@ -540,7 +540,7 @@ class BrowseCell: NSTableCellView, NSTextFieldDelegate {
         openPanel.canCreateDirectories = false
         openPanel.showsTagField = false
         openPanel.allowsOtherFileTypes = true
-        if #available(OSX 11.0, *) {
+        if #available(macOS 11.0, *) {
             openPanel.allowedContentTypes = [UTType.script, UTType.shellScript, UTType.executable, UTType.unixExecutable]
         } else {
             openPanel.allowedFileTypes = ["public.script", "public.shell-script", "public.executable", "public.unix-executable"]