Refactoring.

Author: johnno1962

App/InjectionNext.xcodeproj/project.pbxproj

@@ -998,8 +998,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Quick/Nimble.git";
 			requirement = {
-				branch = main;
-				kind = branch;
+				kind = upToNextMinorVersion;
+				minimumVersion = 13.2.0;
 			};
 		};
 		BBEB87102C74FD930044578A /* XCRemoteSwiftPackageReference "Quick" */ = {

App/InjectionNext/FrontendServer.swift

@@ -137,7 +137,8 @@ class FrontendServer: InjectionServer {
 
     static func processFrontendCommandFrom(feed: SimpleSocket) throws {
         guard feed.readString() == "1.0" else {
-           return NSLog(APP_PREFIX+"Re-patch compiler to update script version")
+            return _ = Self.frontendRecompiler()
+                .error("Unpatch then repatch compiler to update script version")
         }
         guard let projectRoot = feed.readString(),
               let frontendPath = feed.readString(),
@@ -177,7 +178,7 @@ class FrontendServer: InjectionServer {
             }
         }
 
-        MonitorXcode.compileQueue.async {
+        NextCompiler.compileQueue.async {
             let recompiler = Self.frontendRecompiler(platform: platform)
             FrontendServer.loggedFrontend = frontendPath
 
@@ -205,16 +206,7 @@ class FrontendServer: InjectionServer {
                       URL(fileURLWithPath: source).lastPathComponent)
                 let update = NextCompiler.Compilation(arguments: args,
                       swiftFiles: swiftFiles, workingDir: projectRoot)
-
-                recompiler.compilations[source] = update
-                let clientRecompiler = FrontendServer.frontendRecompiler()
-                if source == clientRecompiler.pendingSource {
-                    MonitorXcode.compileQueue.async {
-                        if FrontendServer.frontendRecompiler().inject(source: source) {
-                            clientRecompiler.pendingSource = nil
-                        }
-                    }
-                }
+                recompiler.store(compilation: update, for: source)
             }
         }
     }

App/InjectionNext/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>10905</string>
+	<string>10930</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

App/InjectionNext/InjectionHybrid.swift

@@ -52,7 +52,7 @@ class InjectionHybrid: InjectionBase {
             return
         }
         Self.pendingInjections.append(source)
-        MonitorXcode.compileQueue.async {
+        NextCompiler.compileQueue.async {
             self.injectNext(fallback: recompiler)
         }
     }
@@ -62,7 +62,7 @@ class InjectionHybrid: InjectionBase {
             guard let source = Self.pendingInjections.first else { return nil }
             Self.pendingInjections.removeFirst()
             if !Self.pendingInjections.isEmpty {
-                MonitorXcode.compileQueue.async {
+                NextCompiler.compileQueue.async {
                     self.injectNext(fallback: fallback)
                 }
             }

App/InjectionNext/MonitorXcode.swift

@@ -21,8 +21,6 @@ class MonitorXcode {
 
     // Currently running Xcode process
     static weak var runningXcode: MonitorXcode?
-    // One compilation at a time.
-    static let compileQueue = DispatchQueue(label: "InjectionCompile")
     // Trying to avoid fragmenting memory
     var lastFilelist: String?, lastArguments: [String]?, lastSource: String?
     // The service to recompile and inject a source file.
@@ -219,21 +217,12 @@ class MonitorXcode {
                 let update = NextCompiler.Compilation(arguments: args,
                     swiftFiles: swiftFiles, workingDir: workingDir)
 
-                // The folling line should be on the compileQueue
-                // but it seems to provoke a Swift compiler bug.
-                self.recompiler.compilations[source] = update
-                Self.compileQueue.async {
-                    if source == self.recompiler.pendingSource {
-                        print("Delayed injection of "+source)
-                        self.recompiler.pendingSource = nil
-                        _ = self.recompiler.inject(source: source)
-                    }
-                }
+                recompiler.store(compilation: update, for: source)
             } else if line ==
                 "  key.request: source.request.indexer.editor-did-save-file,",
                 let _ = xcodeStdout.readLine(), let source = readQuotedString() {
                 print("Injecting saved file "+source)
-                Self.compileQueue.async {
+                NextCompiler.compileQueue.async {
                     _ = self.recompiler.inject(source: source)
                 }
             }

App/InjectionNext/NextCompiler.swift

@@ -36,6 +36,8 @@ class NextCompiler {
         var workingDir: String
     }
 
+    // One compilation at a time.
+    static let compileQueue = DispatchQueue(label: "InjectionCompile")
     /// Base for temporary files
     let tmpbase = "/tmp/injectionNext"
     /// Injection pending if information was not available and last error
@@ -58,6 +60,18 @@ class NextCompiler {
     func error(_ err: Error) -> Bool {
         error("Internal app error: \(err)")
     }
+    
+    func store(compilation: Compilation, for source: String) {
+        Self.compileQueue.async {
+            self.compilations[source] = compilation
+            if source == self.pendingSource {
+                print("Delayed injection of "+source)
+                if self.inject(source: source) {
+                    self.pendingSource = nil
+                }
+            }
+        }
+    }
 
     /// Main entry point called by MonitorXcode
     func inject(source: String) -> Bool {