Merge branch 'feature/suggestion-white-list' into develop

Author: intitni

Copilot for Xcode/SettingsView.swift

@@ -2,29 +2,34 @@ import LaunchAgentManager
 import Preferences
 import SwiftUI
 
-final class Settings: ObservableObject {
-    @AppStorage(\.quitXPCServiceOnXcodeAndAppQuit)
-    var quitXPCServiceOnXcodeAndAppQuit: Bool
-    @AppStorage(\.realtimeSuggestionToggle)
-    var realtimeSuggestionToggle: Bool
-    @AppStorage(\.realtimeSuggestionDebounce)
-    var realtimeSuggestionDebounce: Double
-    @AppStorage(\.suggestionPresentationMode)
-    var suggestionPresentationMode: Preferences.PresentationMode
-    @AppStorage(\.suggestionWidgetPositionMode)
-    var suggestionWidgetPositionMode: SuggestionWidgetPositionMode
-    @AppStorage(\.widgetColorScheme)
-    var widgetColorScheme: WidgetColorScheme
-    @AppStorage(\.acceptSuggestionWithAccessibilityAPI)
-    var acceptSuggestionWithAccessibilityAPI: Bool
-    init() {}
-}
-
 struct SettingsView: View {
+    final class Settings: ObservableObject {
+        @AppStorage(\.quitXPCServiceOnXcodeAndAppQuit)
+        var quitXPCServiceOnXcodeAndAppQuit: Bool
+        @AppStorage(\.realtimeSuggestionToggle)
+        var realtimeSuggestionToggle: Bool
+        @AppStorage(\.realtimeSuggestionDebounce)
+        var realtimeSuggestionDebounce: Double
+        @AppStorage(\.suggestionPresentationMode)
+        var suggestionPresentationMode: Preferences.PresentationMode
+        @AppStorage(\.suggestionWidgetPositionMode)
+        var suggestionWidgetPositionMode: SuggestionWidgetPositionMode
+        @AppStorage(\.widgetColorScheme)
+        var widgetColorScheme: WidgetColorScheme
+        @AppStorage(\.acceptSuggestionWithAccessibilityAPI)
+        var acceptSuggestionWithAccessibilityAPI: Bool
+        @AppStorage(\.disableSuggestionFeatureGlobally)
+        var disableSuggestionFeatureGlobally: Bool
+        @AppStorage(\.suggestionFeatureEnabledProjectList)
+        var suggestionFeatureEnabledProjectList: [String]
+        init() {}
+    }
+
     @StateObject var settings = Settings()
     @State var editingRealtimeSuggestionDebounce: Double = UserDefaults.shared
         .value(for: \.realtimeSuggestionDebounce)
     @Environment(\.updateChecker) var updateChecker
+    @State var isSuggestionFeatureEnabledListPickerOpen = false
 
     var body: some View {
         Section {
@@ -90,6 +95,21 @@ struct SettingsView: View {
                 }
                 .toggleStyle(.switch)
 
+                HStack {
+                    Toggle(isOn: $settings.disableSuggestionFeatureGlobally) {
+                        Text("Disable suggestion feature globally")
+                    }
+                    .toggleStyle(.switch)
+
+                    Button("Enabled Projects") {
+                        isSuggestionFeatureEnabledListPickerOpen = true
+                    }
+                }.sheet(isPresented: $isSuggestionFeatureEnabledListPickerOpen) {
+                    SuggestionFeatureEnabledProjectListView(
+                        isOpen: $isSuggestionFeatureEnabledListPickerOpen
+                    )
+                }
+
                 HStack {
                     Slider(value: $editingRealtimeSuggestionDebounce, in: 0...2, step: 0.1) {
                         Text("Real-time suggestion fetch debounce")
@@ -109,7 +129,7 @@ struct SettingsView: View {
                             .fill(Color.white.opacity(0.2))
                     )
                 }
-                
+
                 Toggle(isOn: $settings.acceptSuggestionWithAccessibilityAPI) {
                     Text("Use accessibility API to accept suggestion in widget")
                 }
@@ -119,9 +139,136 @@ struct SettingsView: View {
     }
 }
 
+struct SuggestionFeatureEnabledProjectListView: View {
+    final class Settings: ObservableObject {
+        @AppStorage(\.suggestionFeatureEnabledProjectList)
+        var suggestionFeatureEnabledProjectList: [String]
+
+        init(suggestionFeatureEnabledProjectList: AppStorage<[String]>? = nil) {
+            if let list = suggestionFeatureEnabledProjectList {
+                _suggestionFeatureEnabledProjectList = list
+            }
+        }
+    }
+
+    var isOpen: Binding<Bool>
+    @State var isAddingNewProject = false
+    @StateObject var settings = Settings()
+
+    var body: some View {
+        VStack {
+            HStack {
+                Button(action: {
+                    self.isOpen.wrappedValue = false
+                }) {
+                    Image(systemName: "xmark.circle.fill")
+                        .foregroundStyle(.secondary)
+                        .padding()
+                }
+                .buttonStyle(.plain)
+                Text("Enabled Projects")
+                Spacer()
+                Button(action: {
+                    isAddingNewProject = true
+                }) {
+                    Image(systemName: "plus.circle.fill")
+                        .foregroundStyle(.secondary)
+                        .padding()
+                }
+                .buttonStyle(.plain)
+            }
+            .background(.black.opacity(0.2))
+
+            List {
+                ForEach(
+                    settings.suggestionFeatureEnabledProjectList,
+                    id: \.self
+                ) { project in
+                    HStack {
+                        Text(project)
+                            .contextMenu {
+                                Button("Remove") {
+                                    settings.suggestionFeatureEnabledProjectList.removeAll(
+                                        where: { $0 == project }
+                                    )
+                                }
+                            }
+                        Spacer()
+                        
+                        Button(action: {
+                            settings.suggestionFeatureEnabledProjectList.removeAll(
+                                where: { $0 == project }
+                            )
+                        }) {
+                            Image(systemName: "trash.fill")
+                                .foregroundStyle(.secondary)
+                        }
+                        .buttonStyle(.plain)
+                    }
+                }
+            }
+            .overlay {
+                if settings.suggestionFeatureEnabledProjectList.isEmpty {
+                    Text("""
+                    Empty
+                    Add project with "+" button
+                    Or right clicking the circular widget
+                    """)
+                    .multilineTextAlignment(.center)
+                }
+            }
+        }
+        .frame(width: 300, height: 400)
+        .sheet(isPresented: $isAddingNewProject) {
+            SuggestionFeatureAddEnabledProjectView(isOpen: $isAddingNewProject, settings: settings)
+        }
+    }
+}
+
+struct SuggestionFeatureAddEnabledProjectView: View {
+    var isOpen: Binding<Bool>
+    var settings: SuggestionFeatureEnabledProjectListView.Settings
+    @State var rootPath = ""
+
+    var body: some View {
+        VStack {
+            Text("Enter the root path of the project. Do not use `~` to replace /Users/yourUserName.")
+            TextField("Root path", text: $rootPath)
+            HStack {
+                Spacer()
+                Button("Cancel") {
+                    isOpen.wrappedValue = false
+                }
+                Button("Add") {
+                    settings.suggestionFeatureEnabledProjectList.append(rootPath)
+                    isOpen.wrappedValue = false
+                }
+            }.buttonStyle(.copilot)
+        }
+        .padding()
+        .frame(minWidth: 500)
+    }
+}
+
+// MARK: - Previews
+
 struct SettingsView_Preview: PreviewProvider {
     static var previews: some View {
         SettingsView()
             .background(.purple)
     }
 }
+
+struct SuggestionFeatureEnabledProjectListView_Preview: PreviewProvider {
+    static var previews: some View {
+        SuggestionFeatureEnabledProjectListView(
+            isOpen: .constant(true),
+            settings: .init(suggestionFeatureEnabledProjectList: .init(wrappedValue: [
+                "hello/2",
+                "hello/3",
+                "hello/4",
+            ], "SuggestionFeatureEnabledProjectListView_Preview"))
+        )
+        .background(.purple)
+    }
+}

Core/Sources/Preferences/Keys.swift

@@ -133,6 +133,24 @@ public struct UserDefaultPreferenceKeys {
     public var forceOrderWidgetToFront: HideCommonPrecedingSpacesInSuggestion {
         .init()
     }
+    
+    public struct DisableSuggestionFeatureGlobally: UserDefaultPreferenceKey {
+        public let defaultValue = false
+        public let key = "DisableSuggestionFeatureGlobally"
+    }
+    
+    public var disableSuggestionFeatureGlobally: DisableSuggestionFeatureGlobally {
+        .init()
+    }
+    
+    public struct SuggestionFeatureEnabledProjectList: UserDefaultPreferenceKey {
+        public let defaultValue: [String] = []
+        public let key = "SuggestionFeatureEnabledProjectList"
+    }
+    
+    public var suggestionFeatureEnabledProjectList: SuggestionFeatureEnabledProjectList {
+        .init()
+    }
 
     public var disableLazyVStack: FeatureFlags.DisableLazyVStack { .init() }
 }

Core/Sources/Preferences/UserDefaults.swift

@@ -22,6 +22,26 @@ extension String: UserDefaultsStorable {}
 extension Data: UserDefaultsStorable {}
 extension URL: UserDefaultsStorable {}
 
+extension Array: RawRepresentable where Element: Codable {
+    public init?(rawValue: String) {
+        guard let data = rawValue.data(using: .utf8),
+              let result = try? JSONDecoder().decode([Element].self, from: data)
+        else {
+            return nil
+        }
+        self = result
+    }
+
+    public var rawValue: String {
+        guard let data = try? JSONEncoder().encode(self),
+              let result = String(data: data, encoding: .utf8)
+        else {
+            return "[]"
+        }
+        return result
+    }
+}
+
 public extension UserDefaults {
     // MARK: - Normal Types
 

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -183,7 +183,16 @@ public class RealtimeSuggestionController {
 
             guard UserDefaults.shared.value(for: \.realtimeSuggestionToggle)
             else { return }
-
+            
+            if UserDefaults.shared.value(for: \.disableSuggestionFeatureGlobally),
+               let fileURL = try? await Environment.fetchCurrentFileURL(),
+               let (workspace, _) = try? await Workspace
+               .fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL)
+            {
+                let isEnabled = workspace.isSuggestionFeatureEnabled
+                if !isEnabled { return }
+            }
+            
             if Task.isCancelled { return }
 
             Logger.service.info("Prefetch suggestions.")