Update names of settings keys

Author: intitni

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/LegacyActiveDocumentChatContextCollector.swift

@@ -30,7 +30,7 @@ public struct LegacyActiveDocumentChatContextCollector: ChatContextCollector {
             {
                 let lines = content.editorContent?.lines.count ?? 0
                 let maxLine = UserDefaults.shared
-                    .value(for: \.maxEmbeddableFileInChatContextLineCount)
+                    .value(for: \.maxFocusedCodeLineCount)
                 if lines <= maxLine {
                     return """
                     File Content:```\(content.language.rawValue)
@@ -48,7 +48,7 @@ public struct LegacyActiveDocumentChatContextCollector: ChatContextCollector {
                 }
             }
 
-            if UserDefaults.shared.value(for: \.useSelectionScopeByDefaultInChatContext) {
+            if UserDefaults.shared.value(for: \.useCodeScopeByDefaultInChatContext) {
                 return """
                 Selected Code \
                 (start from line \(selectionRange.start.line)):```\(content.language.rawValue)

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -104,7 +104,7 @@ private struct StopRespondingButton: View {
 }
 
 private struct Instruction: View {
-    @AppStorage(\.useSelectionScopeByDefaultInChatContext)
+    @AppStorage(\.useCodeScopeByDefaultInChatContext)
     var useCodeScopeByDefaultInChatContext
 
     var body: some View {

Core/Sources/ChatService/DynamicContextController.swift

@@ -35,7 +35,7 @@ final class DynamicContextController {
     func updatePromptToMatchContent(systemPrompt: String, content: String) async throws {
         var content = content
         var scopes = Self.parseScopes(&content)
-        if UserDefaults.shared.value(for: \.useSelectionScopeByDefaultInChatContext) {
+        if UserDefaults.shared.value(for: \.useCodeScopeByDefaultInChatContext) {
             scopes.insert("code")
         } else {
             scopes.insert("file")

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -10,12 +10,10 @@ struct ChatSettingsView: View {
         @AppStorage(\.chatGPTMaxMessageCount) var chatGPTMaxMessageCount
         @AppStorage(\.chatFontSize) var chatFontSize
         @AppStorage(\.chatCodeFontSize) var chatCodeFontSize
-        @AppStorage(\.embedFileContentInChatContextIfNoSelection)
-        var embedFileContentInChatContextIfNoSelection
-        @AppStorage(\.maxEmbeddableFileInChatContextLineCount)
-        var maxEmbeddableFileInChatContextLineCount
-        @AppStorage(\.useSelectionScopeByDefaultInChatContext)
-        var useSelectionScopeByDefaultInChatContext
+        @AppStorage(\.maxFocusedCodeLineCount)
+        var maxFocusedCodeLineCount
+        @AppStorage(\.useCodeScopeByDefaultInChatContext)
+        var useCodeScopeByDefaultInChatContext
 
         @AppStorage(\.chatFeatureProvider) var chatFeatureProvider
         @AppStorage(\.chatGPTModel) var chatGPTModel
@@ -188,21 +186,17 @@ struct ChatSettingsView: View {
     @ViewBuilder
     var contextForm: some View {
         Form {
-            Toggle(isOn: $settings.useSelectionScopeByDefaultInChatContext) {
-                Text("Use selection scope by default in chat context.")
-            }
-
-            Toggle(isOn: $settings.embedFileContentInChatContextIfNoSelection) {
-                Text("Embed file content in chat context if no code is selected.")
+            Toggle(isOn: $settings.useCodeScopeByDefaultInChatContext) {
+                Text("Use @code scope by default in chat context.")
             }
 
             HStack {
                 TextField(text: .init(get: {
-                    "\(Int(settings.maxEmbeddableFileInChatContextLineCount))"
+                    "\(Int(settings.maxFocusedCodeLineCount))"
                 }, set: {
-                    settings.maxEmbeddableFileInChatContextLineCount = Int($0) ?? 0
+                    settings.maxFocusedCodeLineCount = Int($0) ?? 0
                 })) {
-                    Text("Max embeddable file")
+                    Text("Max focused code line count in chat context")
                 }
                 .textFieldStyle(.roundedBorder)
 

Tool/Sources/Preferences/Keys.swift

@@ -274,11 +274,11 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: false, key: "EmbedFileContentInChatContextIfNoSelection")
     }
 
-    var maxEmbeddableFileInChatContextLineCount: PreferenceKey<Int> {
+    var maxFocusedCodeLineCount: PreferenceKey<Int> {
         .init(defaultValue: 100, key: "MaxEmbeddableFileInChatContextLineCount")
     }
 
-    var useSelectionScopeByDefaultInChatContext: PreferenceKey<Bool> {
+    var useCodeScopeByDefaultInChatContext: PreferenceKey<Bool> {
         .init(defaultValue: true, key: "UseSelectionScopeByDefaultInChatContext")
     }