Merge branch 'feature/auto-close-tabs' into develop

Author: intitni

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -43,6 +43,7 @@
 		C89E75C32A46FB32000DD64F /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C89E75C22A46FB32000DD64F /* AppDelegate+Menu.swift */; };
 		C8C8B60929AFA35F00034BEE /* CopilotForXcodeExtensionService.app in Embed XPCService */ = {isa = PBXBuildFile; fileRef = C861E60E2994F6070056CB02 /* CopilotForXcodeExtensionService.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		C8DCF00029CE11D500FDDDD7 /* ChatWithSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */; };
+		C8DD9CB12BC673F80036641C /* CloseIdleTabsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */; };
 		C8F1032B2A7A39D700D28F4F /* launchAgent.plist in Copy Launch Agent */ = {isa = PBXBuildFile; fileRef = C8F103292A7A365000D28F4F /* launchAgent.plist */; };
 /* End PBXBuildFile section */
 
@@ -197,6 +198,7 @@
 		C89E75C22A46FB32000DD64F /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = "<group>"; };
 		C8CD828229B88006008D044D /* TestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan.xctestplan; sourceTree = "<group>"; };
 		C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWithSelection.swift; sourceTree = "<group>"; };
+		C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloseIdleTabsCommand.swift; sourceTree = "<group>"; };
 		C8F103292A7A365000D28F4F /* launchAgent.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = launchAgent.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -264,6 +266,7 @@
 				C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */,
 				C8758E6F29F04BFF00D29C1C /* CustomCommand.swift */,
 				C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */,
+				C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */,
 				C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */,
 				C81458972939EFDC00135263 /* Info.plist */,
 				C81458982939EFDC00135263 /* EditorExtension.entitlements */,
@@ -525,6 +528,7 @@
 			files = (
 				C8DCF00029CE11D500FDDDD7 /* ChatWithSelection.swift in Sources */,
 				C81458942939EFDC00135263 /* SourceEditorExtension.swift in Sources */,
+				C8DD9CB12BC673F80036641C /* CloseIdleTabsCommand.swift in Sources */,
 				C8758E7029F04BFF00D29C1C /* CustomCommand.swift in Sources */,
 				C8758E7229F04CF100D29C1C /* SeparatorCommand.swift in Sources */,
 				C861A6A329E5503F005C41A3 /* PromptToCodeCommand.swift in Sources */,

Core/Package.swift

@@ -113,7 +113,9 @@ let package = Package(
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
-            ]
+            ].pro([
+                "ProClient",
+            ])
         ),
         .target(
             name: "Service",

Core/Sources/HostApp/FeatureSettings/XcodeSettingsView.swift

@@ -0,0 +1,20 @@
+import Foundation
+import SharedUIComponents
+import SwiftUI
+
+#if canImport(ProHostApp)
+import ProHostApp
+#endif
+
+struct XcodeSettingsView: View {
+    var body: some View {
+        VStack {
+            #if canImport(ProHostApp)
+            CloseXcodeIdleTabsSettingsView()
+            #endif
+
+            EmptyView()
+        }
+    }
+}
+

Core/Sources/HostApp/FeatureSettingsView.swift

@@ -35,6 +35,16 @@ struct FeatureSettingsView: View {
                 image: "paintbrush"
             )
 
+            ScrollView {
+                XcodeSettingsView().padding()
+            }
+            .sidebarItem(
+                tag: 3,
+                title: "Xcode",
+                subtitle: "Xcode related features",
+                image: "app"
+            )
+            
 //            #if canImport(ProHostApp)
 //            ScrollView {
 //                TerminalSettingsView().padding()

EditorExtension/CloseIdleTabsCommand.swift

@@ -0,0 +1,20 @@
+import Client
+import Foundation
+import SuggestionModel
+import XcodeKit
+
+class CloseIdleTabsCommand: NSObject, XCSourceEditorCommand, CommandType {
+    var name: String { "Close Idle Tabs" }
+
+    func perform(
+        with invocation: XCSourceEditorCommandInvocation,
+        completionHandler: @escaping (Error?) -> Void
+    ) {
+        completionHandler(nil)
+        Task {
+            let service = try getService()
+            _ = try await service.postNotification(name: "CloseIdleTabsOfXcodeWindow")
+        }
+    }
+}
+

EditorExtension/SourceEditorExtension.swift

@@ -3,6 +3,10 @@ import Foundation
 import Preferences
 import XcodeKit
 
+#if canImport(PreferencesPlus)
+import PreferencesPlus
+#endif
+
 class SourceEditorExtension: NSObject, XCSourceEditorExtension {
     var builtin: [[XCSourceEditorCommandDefinitionKey: Any]] {
         [
@@ -17,6 +21,18 @@ class SourceEditorExtension: NSObject, XCSourceEditorExtension {
         ].map(makeCommandDefinition)
     }
 
+    var optional: [[XCSourceEditorCommandDefinitionKey: Any]] {
+        var all = [[XCSourceEditorCommandDefinitionKey: Any]]()
+        
+        #if canImport(PreferencesPlus)
+        if UserDefaults.shared.value(for: \.enableCloseIdleTabCommandInXcodeMenu) {
+            all.append(CloseIdleTabsCommand().makeCommandDefinition())
+        }
+        #endif
+        
+        return all
+    }
+    
     var internalUse: [[XCSourceEditorCommandDefinitionKey: Any]] {
         [
             SeparatorCommand().named("------"),
@@ -34,7 +50,7 @@ class SourceEditorExtension: NSObject, XCSourceEditorExtension {
     }
 
     var commandDefinitions: [[XCSourceEditorCommandDefinitionKey: Any]] {
-        return builtin + custom + internalUse
+        return builtin + optional + custom + internalUse
     }
 
     func extensionDidFinishLaunching() {

Pro

@@ -21,6 +21,10 @@ public extension AXUIElement {
     var value: String {
         (try? copyValue(key: kAXValueAttribute)) ?? ""
     }
+    
+    var intValue: Int? {
+        (try? copyValue(key: kAXValueAttribute))
+    }
 
     var title: String {
         (try? copyValue(key: kAXTitleAttribute)) ?? ""

Tool/Sources/AXExtension/AXUIElement.swift

@@ -92,10 +92,10 @@ public final class Filespace {
     // MARK: Life Cycle
 
     public var isExpired: Bool {
-        Environment.now().timeIntervalSince(lastSuggestionUpdateTime) > 60 * 3
+        Environment.now().timeIntervalSince(lastUpdateTime) > 60 * 3
     }
 
-    private(set) var lastSuggestionUpdateTime: Date = Environment.now()
+    public private(set) var lastUpdateTime: Date = Environment.now()
     private var additionalProperties = FilespacePropertyValues()
     let fileSaveWatcher: FileSaveWatcher
     let onClose: (URL) -> Void
@@ -154,7 +154,7 @@ public final class Filespace {
     }
 
     public func refreshUpdateTime() {
-        lastSuggestionUpdateTime = Environment.now()
+        lastUpdateTime = Environment.now()
     }
 
     @WorkspaceActor

Tool/Sources/Workspace/Filespace.swift

@@ -72,9 +72,9 @@ public final class Workspace {
     public let workspaceURL: URL
     public let projectRootURL: URL
     public let openedFileRecoverableStorage: OpenedFileRecoverableStorage
-    public private(set) var lastSuggestionUpdateTime = Environment.now()
+    public private(set) var lastLastUpdateTime = Environment.now()
     public var isExpired: Bool {
-        Environment.now().timeIntervalSince(lastSuggestionUpdateTime) > 60 * 60 * 1
+        Environment.now().timeIntervalSince(lastLastUpdateTime) > 60 * 60 * 1
     }
 
     public private(set) var filespaces = [URL: Filespace]()
@@ -113,7 +113,7 @@ public final class Workspace {
     }
 
     public func refreshUpdateTime() {
-        lastSuggestionUpdateTime = Environment.now()
+        lastLastUpdateTime = Environment.now()
     }
 
     @WorkspaceActor
@@ -123,24 +123,18 @@ public final class Workspace {
             fileURL: fileURL,
             onSave: { [weak self] filespace in
                 guard let self else { return }
-                for plugin in self.plugins.values {
-                    plugin.didSaveFilespace(filespace)
-                }
+                self.didSaveFilespace(filespace)
             },
             onClose: { [weak self] url in
                 guard let self else { return }
-                for plugin in self.plugins.values {
-                    plugin.didCloseFilespace(url)
-                }
+                self.didCloseFilespace(url)
             }
         )
         if filespaces[fileURL] == nil {
             filespaces[fileURL] = filespace
         }
         if existedFilespace == nil {
-            for plugin in plugins.values {
-                plugin.didOpenFilespace(filespace)
-            }
+            didOpenFilespace(filespace)
         } else {
             filespace.refreshUpdateTime()
         }
@@ -154,10 +148,37 @@ public final class Workspace {
 
     @WorkspaceActor
     public func didUpdateFilespace(fileURL: URL, content: String) {
+        refreshUpdateTime()
         guard let filespace = filespaces[fileURL] else { return }
+        filespace.refreshUpdateTime()
         for plugin in plugins.values {
             plugin.didUpdateFilespace(filespace, content: content)
         }
     }
+
+    @WorkspaceActor
+    func didOpenFilespace(_ filespace: Filespace) {
+        refreshUpdateTime()
+        openedFileRecoverableStorage.openFile(fileURL: filespace.fileURL)
+        for plugin in plugins.values {
+            plugin.didOpenFilespace(filespace)
+        }
+    }
+
+    @WorkspaceActor
+    func didCloseFilespace(_ fileURL: URL) {
+        for plugin in self.plugins.values {
+            plugin.didCloseFilespace(fileURL)
+        }
+    }
+
+    @WorkspaceActor
+    func didSaveFilespace(_ filespace: Filespace) {
+        refreshUpdateTime()
+        filespace.refreshUpdateTime()
+        for plugin in plugins.values {
+            plugin.didSaveFilespace(filespace)
+        }
+    }
 }