add TrickerX dmg

Author: Lei Wang

Codable/SourceEditorCommand.swift

@@ -13,29 +13,44 @@ import XcodeKit
 class SourceEditorCommand: NSObject, XCSourceEditorCommand {
 
     func perform(with invocation: XCSourceEditorCommandInvocation, completionHandler: @escaping (Error?) -> Void ) -> Void {
+        
         let textRange = invocation.buffer.selections.firstObject as! XCSourceTextRange
         var startLine = textRange.start.line
 
-        let endRegex = """
-            .*\\{
-            """
-        let isPropertyRegex = ".*(let|var)\\s+.\\w+\\s*:(?!(.*(\\(|\\{|\\=)))"
-        let propertyRegex = "\\w+\\s*(:)"
+        let endRegex = ".+\\s*:\\s*.*\\{"
+        let propertyRegex = ".*(let|var)\\s+\\w+\\s*(:|=).+"
+        let propertyNamePartRegex = "\\w+\\s*(:|=)"
+        let propertyNameRegex = "\\w+"
         let uppercase = "A"..."Z"
 
-        var enumCase: [(key: String, value: String)] = []
+        var openBracketCount: Int = 0
+        let openBracketRegex = "\\}"
+        let closeBracketRegex = "\\{"
+        let isClosureRegex = "->"
 
+        var enumCase: [(key: String, value: String)] = []
+
         while startLine >= 0 {
             guard let lineText = invocation.buffer.lines[startLine] as? String else { startLine -= 1; continue }
-            if lineText.isMatch(endRegex) {
+            
+            openBracketCount += lineText.match(regex: openBracketRegex).count
+            if openBracketCount > 0 {
+                openBracketCount -= lineText.match(regex: closeBracketRegex).count
+                startLine -= 1
+                continue
+            }else if lineText.isMatch(endRegex) {
                 break
             }
-            var propertyName: String = lineText.match(regex: isPropertyRegex)
-            if propertyRegex.isEmpty {
+            guard !lineText.isMatch(isClosureRegex) else {
                 startLine -= 1
                 continue
             }
-            propertyName = propertyName.match(regex: propertyRegex).replacingOccurrences(of: ":", with: "")
+            var propertyName: String = lineText.match(regex: propertyRegex)
+            if propertyName.isEmpty {
+                startLine -= 1
+                continue
+            }
+            propertyName = propertyName.match(regex: propertyNamePartRegex).match(regex: propertyNameRegex)
             var rawValue = ""
             var previousWordIsUppercase = false
             for character in propertyName {
@@ -52,9 +67,7 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
                 }
 
             }
-            if !rawValue.isEmpty {
-                enumCase.append((key: propertyName, value: rawValue))
-            }
+            enumCase.append((key: propertyName, value: rawValue))
             startLine -= 1
         }
 
@@ -80,17 +93,16 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
             writeLine += 1
             let key = caseTuple.key
             let value = caseTuple.value
-            var text = "\(indentSpaces)\(caseIndentSpaces)case \(key)"
-            if !value.isEmpty, key != value {
-                text += " = \"\(value)\""
+            writeText = "\(indentSpaces)\(caseIndentSpaces)case \(key)"
+            if key != value, !value.isEmpty {
+                writeText += " = \"\(value)\""
             }
-            writeText = text
             invocation.buffer.lines.insert(writeText, at: writeLine)
             updateSelectionIndexs.append(writeLine)
         }
-        let endText = "\(indentSpaces)}"
+        writeText = "\(indentSpaces)}"
         writeLine += 1
-        invocation.buffer.lines.insert(endText, at: writeLine)
+        invocation.buffer.lines.insert(writeText, at: writeLine)
 
         let textRanges = updateSelectionIndexs.map { (index) -> XCSourceTextRange in
             let sourceTextRange = XCSourceTextRange()
@@ -99,7 +111,6 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
             return sourceTextRange
         }
 
-        
         invocation.buffer.selections.setArray(textRanges)
 
         completionHandler(nil)

TrickerX.xcodeproj/project.pbxproj

@@ -382,6 +382,7 @@
 				DEVELOPMENT_TEAM = ZRW9N2A955;
 				INFOPLIST_FILE = TrickerX/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rayternet.TrickerX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
@@ -399,6 +400,7 @@
 				DEVELOPMENT_TEAM = ZRW9N2A955;
 				INFOPLIST_FILE = TrickerX/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rayternet.TrickerX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;

TrickerX.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate

@@ -69,16 +69,19 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "2">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <PathRunnable
+         runnableDebuggingMode = "0"
+         FilePath = "/&lt;placeholder&gt;">
+      </PathRunnable>
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "71B8528C1FC834F80084F597"
             BuildableName = "TrickerX.app"
             BlueprintName = "TrickerX"
             ReferencedContainer = "container:TrickerX.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

TrickerX.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/Codable.xcscheme

@@ -20,6 +20,8 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

TrickerX/Info.plist

@@ -9,7 +9,7 @@
 import Cocoa
 
 class ViewController: NSViewController {
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()