resolve comments

Signed-off-by: Wouter01 <[email protected]>

Author: Wouter01

CodeEdit/Features/Extensions/Commands+ForEach.swift

@@ -13,18 +13,18 @@ import SwiftUI
 
 /// A structure that builds commandmenus on demand from an underlying collection of data.
 /// Maximum 10 items are supported.
-public struct CommandsForEach<Data: RandomAccessCollection, Content: Commands>: Commands where Data.Index == Int {
+struct CommandsForEach<Data: RandomAccessCollection, Content: Commands>: Commands where Data.Index == Int {
 
-    public var data: Data
+    var data: Data
 
-    public var content: (Data.Element) -> Content
+    var content: (Data.Element) -> Content
 
-    public init(_ data: Data, @CommandsBuilder content: @escaping (Data.Element) -> Content) {
+    init(_ data: Data, @CommandsBuilder content: @escaping (Data.Element) -> Content) {
         self.data = data
         self.content = content
     }
 
-    public var body: some Commands {
+    var body: some Commands {
         switch data.count {
         case 0:
             EmptyCommands()

CodeEdit/Features/Extensions/ExtensionInfo.swift

@@ -17,6 +17,12 @@ struct ExtensionInfo: Identifiable, Hashable {
 
     let isDebug: Bool
 
+    var bundleURL: URL
+
+    var bundle: Bundle?
+
+    var pid: Int32
+
     var id: String {
         endpoint.bundleIdentifier
     }
@@ -29,12 +35,6 @@ struct ExtensionInfo: Identifiable, Hashable {
         bundle?.infoDictionary?["CFBundleShortVersionString"] as? String
     }
 
-    var bundleURL: URL
-
-    var bundle: Bundle?
-
-    var pid: Int32
-
     func restart() {
         kill(pid, SIGKILL)
     }
@@ -52,30 +52,45 @@ struct ExtensionInfo: Identifiable, Hashable {
             connection.invalidate()
         }
 
-        self.pid = try await connection.withContinuation { (service: XPCWrappable, continuation) in
+        self.pid = try await ExtensionInfo.getProcessID(connection)
+        self.isDebug = try await ExtensionInfo.getDebugState(connection)
+        self.availableFeatures = try await ExtensionInfo.getAvailableFeatures(connection)
+        self.bundleURL = try await ExtensionInfo.getBundleURL(connection)
+        self.bundle = Bundle(url: bundleURL)
+    }
+}
+
+// Functions to get basic information about extension
+extension ExtensionInfo {
+    static private func getProcessID(_ connection: NSXPCConnection) async throws -> pid_t {
+        try await connection.withContinuation { (service: XPCWrappable, continuation) in
             service.getExtensionProcessIdentifier {
                 continuation.resumingHandler($0, .none)
             }
         }
+    }
 
-        self.isDebug = try await connection.withContinuation { (service: XPCWrappable, continuation) in
+    static private func getDebugState(_ connection: NSXPCConnection) async throws -> Bool {
+        try await connection.withContinuation { (service: XPCWrappable, continuation) in
             service.isDebug {
                 continuation.resumingHandler($0, .none)
             }
         }
+    }
 
+    static private func getAvailableFeatures(_ connection: NSXPCConnection) async throws -> [ExtensionKind] {
         let encodedAvailableFeatures = try await connection.withContinuation { (service: XPCWrappable, continuation) in
             service.getExtensionKinds(reply: continuation.resumingHandler)
         }
+        return try JSONDecoder().decode([ExtensionKind].self, from: encodedAvailableFeatures)
+    }
 
-        self.availableFeatures = try JSONDecoder().decode([ExtensionKind].self, from: encodedAvailableFeatures)
-
+    static private func getBundleURL(_ connection: NSXPCConnection) async throws -> URL {
         let bundleURLEncoded = try await connection.withContinuation { (service: XPCWrappable, continuation) in
             service.getExtensionURL(reply: continuation.resumingHandler)
         }
 
-        self.bundleURL = try JSONDecoder().decode(URL.self, from: bundleURLEncoded)
-        self.bundle = Bundle(url: bundleURL)
+        return try JSONDecoder().decode(URL.self, from: bundleURLEncoded)
     }
 }
 

CodeEdit/Features/Extensions/ExtensionSceneView.swift

@@ -18,13 +18,11 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
     let sceneID: String
 
     init(with appExtension: AppExtensionIdentity, sceneID: String) {
-        print("Setting appextension to", appExtension)
         self.appExtension = appExtension
         self.sceneID = sceneID
     }
 
     func makeNSViewController(context: Context) -> EXHostViewController {
-        print("Making...")
         let controller = EXHostViewController()
         controller.delegate = context.coordinator
         controller.configuration = .some(.init(appExtension: appExtension, sceneID: sceneID))
@@ -33,7 +31,6 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
     }
 
     func updateNSViewController(_ nsViewController: EXHostViewController, context: Context) {
-        print("Updating....", appExtension, sceneID)
         nsViewController.configuration = .init(appExtension: appExtension, sceneID: sceneID)
         context.coordinator.updateEnvironment(context.environment._ceEnvironment)
     }
@@ -47,7 +44,7 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
         }
     }
 
-    public class Coordinator: NSObject, EXHostViewControllerDelegate, EnvironmentPublisherObjc {
+    class Coordinator: NSObject, EXHostViewControllerDelegate, EnvironmentPublisherObjc {
         var isOnline: Bool = false
         var toPublish: Data?
         var openWindow: (String) -> Void
@@ -56,28 +53,25 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
             self.openWindow = openWindow
         }
 
-        public var connection: NSXPCConnection?
+        var connection: NSXPCConnection?
 
-        public func publishEnvironment(data: Data) {
+        func publishEnvironment(data: Data) {
             @Decoded<Callbacks> var data = data
-            print("RECEIVED DATA")
             guard let $data else { return }
             switch $data {
             case .openWindow(let id):
                 openWindow(id)
             }
         }
 
-        public func updateEnvironment(@Encoded _ value: _CEEnvironment) {
+        func updateEnvironment(@Encoded _ value: _CEEnvironment) {
             guard let $value else { return }
 
             guard isOnline else {
                 toPublish = $value
                 return
             }
 
-            print("update: sending...")
-
             Task {
                 do {
                     try await connection!.withService { (service: EnvironmentPublisherObjc) in
@@ -89,13 +83,12 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
             }
         }
 
-        public func hostViewControllerWillDeactivate(_ viewController: EXHostViewController, error: Error?) {
+        func hostViewControllerWillDeactivate(_ viewController: EXHostViewController, error: Error?) {
             isOnline = false
             print("Host will deactivate", error as Any)
         }
 
-        public func hostViewControllerDidActivate(_ viewController: EXHostViewController) {
-            print("Host will activate")
+        func hostViewControllerDidActivate(_ viewController: EXHostViewController) {
             isOnline = true
             do {
                 self.connection = try viewController.makeXPCConnection()
@@ -104,7 +97,6 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
                 connection?.remoteObjectInterface = .init(with: EnvironmentPublisherObjc.self)
                 connection?.resume()
                 if let toPublish {
-                    print("Sending first environment: \(String(describing: String(data: toPublish, encoding: .utf8)))")
                     Task {
                         try? await connection?.withService { (service: EnvironmentPublisherObjc) in
                             service.publishEnvironment(data: toPublish)