Clean up keys

Author: intitni

Core/Sources/Preferences/Keys.swift

@@ -9,96 +9,79 @@ public protocol UserDefaultPreferenceKey {
 public struct UserDefaultPreferenceKeys {
     public init() {}
 
+    // MARK: - Node Path
+
     public struct NodePath: UserDefaultPreferenceKey {
         public let defaultValue: String = ""
         public let key = "NodePath"
     }
 
     public var nodePath: NodePath { .init() }
 
+    // MARK: - Realtime Suggestion
+
     public struct RealtimeSuggestionToggle: UserDefaultPreferenceKey {
         public let defaultValue: Bool = false
         public let key = "RealtimeSuggestionToggle"
     }
 
     public var realtimeSuggestionToggle: RealtimeSuggestionToggle { .init() }
 
+    // MARK: - Realtime Suggestion Debounce
+
     public struct RealtimeSuggestionDebounce: UserDefaultPreferenceKey {
         public let defaultValue: Double = 1
         public let key = "RealtimeSuggestionDebounce"
     }
 
     public var realtimeSuggestionDebounce: RealtimeSuggestionDebounce { .init() }
 
+    // MARK: - Quit XPC Service On Xcode And App Quit
+
     public struct QuitXPCServiceOnXcodeAndAppQuit: UserDefaultPreferenceKey {
         public let defaultValue = true
         public let key = "QuitXPCServiceOnXcodeAndAppQuit"
     }
 
     public var quitXPCServiceOnXcodeAndAppQuit: QuitXPCServiceOnXcodeAndAppQuit { .init() }
 
+    // MARK: - Suggestion Presentation Mode
+
     public struct SuggestionPresentationMode: UserDefaultPreferenceKey {
         public let defaultValue = PresentationMode.floatingWidget
         public let key = "SuggestionPresentationMode"
     }
 
     public var suggestionPresentationMode: SuggestionPresentationMode { .init() }
 
+    // MARK: - Automatically Check For Update
+
     public struct AutomaticallyCheckForUpdate: UserDefaultPreferenceKey {
         public let defaultValue = false
         public let key = "AutomaticallyCheckForUpdate"
     }
 
     public var automaticallyCheckForUpdate: AutomaticallyCheckForUpdate { .init() }
 
+    // MARK: - Suggestion Widget Position Mode
+
     public struct SuggestionWidgetPositionModeKey: UserDefaultPreferenceKey {
         public let defaultValue = SuggestionWidgetPositionMode.fixedToBottom
         public let key = "SuggestionWidgetPositionMode"
     }
 
     public var suggestionWidgetPositionMode: SuggestionWidgetPositionModeKey { .init() }
 
+    // MARK: - Widget Color Scheme
+
     public struct WidgetColorSchemeKey: UserDefaultPreferenceKey {
         public let defaultValue = WidgetColorScheme.dark
         public let key = "WidgetColorScheme"
     }
 
     public var widgetColorScheme: WidgetColorSchemeKey { .init() }
 
-    public struct OpenAIAPIKey: UserDefaultPreferenceKey {
-        public let defaultValue = ""
-        public let key = "OpenAIAPIKey"
-    }
-
-    public var openAIAPIKey: OpenAIAPIKey { .init() }
-
-    public struct ChatGPTEndpoint: UserDefaultPreferenceKey {
-        public let defaultValue = ""
-        public let key = "ChatGPTEndpoint"
-    }
-
-    public var chatGPTEndpoint: ChatGPTEndpoint { .init() }
-
-    public struct ChatGPTModel: UserDefaultPreferenceKey {
-        public let defaultValue = Preferences.ChatGPTModel.gpt35Turbo.rawValue
-        public let key = "ChatGPTModel"
-    }
-
-    public var chatGPTModel: ChatGPTModel { .init() }
-
-    public struct ChatGPTMaxToken: UserDefaultPreferenceKey {
-        public let defaultValue = 2048
-        public let key = "ChatGPTMaxToken"
-    }
-
-    public var chatGPTMaxToken: ChatGPTMaxToken { .init() }
-
-    public struct ChatGPTLanguage: UserDefaultPreferenceKey {
-        public let defaultValue = ""
-        public let key = "ChatGPTLanguage"
-    }
-
-    public var chatGPTLanguage: ChatGPTLanguage { .init() }
+    // MARK: - Accept Suggestion with Accessibility API
 
     public struct AcceptSuggestionWithAccessibilityAPI: UserDefaultPreferenceKey {
         public let defaultValue = false
@@ -109,13 +92,17 @@ public struct UserDefaultPreferenceKeys {
         .init()
     }
 
+    // MARK: - Use Global Chat
+
     public struct UseGlobalChat: UserDefaultPreferenceKey {
         public let defaultValue = false
         public let key = "UseGlobalChat"
     }
 
     public var useGlobalChat: UseGlobalChat { .init() }
 
+    // MARK: - Hide Common Preceding Spaces in Suggestion
+
     public struct HideCommonPrecedingSpacesInSuggestion: UserDefaultPreferenceKey {
         public let defaultValue = false
         public let key = "HideCommonPrecedingSpacesInSuggestion"
@@ -125,6 +112,8 @@ public struct UserDefaultPreferenceKeys {
         .init()
     }
 
+    // MARK: - Force Order Widget to Front
+
     public struct ForceOrderWidgetToFront: UserDefaultPreferenceKey {
         public let defaultValue = true
         public let key = "ForceOrderWidgetToFront"
@@ -134,6 +123,8 @@ public struct UserDefaultPreferenceKeys {
         .init()
     }
 
+    // MARK: - Disable Suggestion Feature Globally
+
     public struct DisableSuggestionFeatureGlobally: UserDefaultPreferenceKey {
         public let defaultValue = false
         public let key = "DisableSuggestionFeatureGlobally"
@@ -143,6 +134,8 @@ public struct UserDefaultPreferenceKeys {
         .init()
     }
 
+    // MARK: - Suggestion Feature Enabled Project List
+
     public struct SuggestionFeatureEnabledProjectList: UserDefaultPreferenceKey {
         public let defaultValue: [String] = []
         public let key = "SuggestionFeatureEnabledProjectList"
@@ -152,6 +145,8 @@ public struct UserDefaultPreferenceKeys {
         .init()
     }
 
+    // MARK: - Prompt to Code Feature Provider
+
     public struct PromptToCodeFeatureProviderKey: UserDefaultPreferenceKey {
         public let defaultValue: PromptToCodeFeatureProvider = .openAI
         public let key = "PromptToCodeFeatureProvider"
@@ -161,6 +156,8 @@ public struct UserDefaultPreferenceKeys {
         .init()
     }
 
+    // MARK: - Prefer Widget to Stay Inside Editor When Width Greater Than
+
     public struct PreferWidgetToStayInsideEditorWhenWidthGreaterThan: UserDefaultPreferenceKey {
         public let defaultValue = 1400 as Double
         public let key = "PreferWidgetToStayInsideEditorWhenWidthGreaterThan"
@@ -169,12 +166,45 @@ public struct UserDefaultPreferenceKeys {
     public var preferWidgetToStayInsideEditorWhenWidthGreaterThan: PreferWidgetToStayInsideEditorWhenWidthGreaterThan {
         .init()
     }
+}
 
-    public var disableLazyVStack: FeatureFlags.DisableLazyVStack { .init() }
-    public var preCacheOnFileOpen: FeatureFlags.PreCacheOnFileOpen { .init() }
-    public var runNodeWithInteractiveLoggedInShell: FeatureFlags
-        .RunNodeWithInteractiveLoggedInShell { .init() }
-    public var useCustomScrollViewWorkaround: FeatureFlags.UseCustomScrollViewWorkaround { .init() }
+// MARK: - OpenAI Account Settings
+
+public extension UserDefaultPreferenceKeys {
+    struct OpenAIAPIKey: UserDefaultPreferenceKey {
+        public let defaultValue = ""
+        public let key = "OpenAIAPIKey"
+    }
+
+    var openAIAPIKey: OpenAIAPIKey { .init() }
+
+    struct ChatGPTEndpoint: UserDefaultPreferenceKey {
+        public let defaultValue = ""
+        public let key = "ChatGPTEndpoint"
+    }
+
+    var chatGPTEndpoint: ChatGPTEndpoint { .init() }
+
+    struct ChatGPTModel: UserDefaultPreferenceKey {
+        public let defaultValue = Preferences.ChatGPTModel.gpt35Turbo.rawValue
+        public let key = "ChatGPTModel"
+    }
+
+    var chatGPTModel: ChatGPTModel { .init() }
+
+    struct ChatGPTMaxToken: UserDefaultPreferenceKey {
+        public let defaultValue = 2048
+        public let key = "ChatGPTMaxToken"
+    }
+
+    var chatGPTMaxToken: ChatGPTMaxToken { .init() }
+
+    struct ChatGPTLanguage: UserDefaultPreferenceKey {
+        public let defaultValue = ""
+        public let key = "ChatGPTLanguage"
+    }
+
+    var chatGPTLanguage: ChatGPTLanguage { .init() }
 }
 
 public enum FeatureFlags {
@@ -192,9 +222,17 @@ public enum FeatureFlags {
         public let defaultValue = true
         public let key = "FeatureFlag-RunNodeWithInteractiveLoggedInShell"
     }
-    
+
     public struct UseCustomScrollViewWorkaround: UserDefaultPreferenceKey {
         public let defaultValue = true
         public let key = "FeatureFlag-UseCustomScrollViewWorkaround"
     }
 }
+
+public extension UserDefaultPreferenceKeys {
+    var disableLazyVStack: FeatureFlags.DisableLazyVStack { .init() }
+    var preCacheOnFileOpen: FeatureFlags.PreCacheOnFileOpen { .init() }
+    var runNodeWithInteractiveLoggedInShell: FeatureFlags
+        .RunNodeWithInteractiveLoggedInShell { .init() }
+    var useCustomScrollViewWorkaround: FeatureFlags.UseCustomScrollViewWorkaround { .init() }
+}