Add BrowserChatTab

intitni · intitni · commit 37ec23eda59a · 2023-07-11T19:04:00.000+08:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Pro"]
+	path = Pro
+	url = git@github.com:intitni/CopilotForXcodePro.git
diff --git a/Copilot for Xcode.xcodeproj/project.pbxproj b/Copilot for Xcode.xcodeproj/project.pbxproj
@@ -162,6 +162,7 @@
 		C861E61F2994F6390056CB02 /* ServiceDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceDelegate.swift; sourceTree = "<group>"; };
 		C8758E6F29F04BFF00D29C1C /* CustomCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomCommand.swift; sourceTree = "<group>"; };
 		C8758E7129F04CF100D29C1C /* SeparatorCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeparatorCommand.swift; sourceTree = "<group>"; };
+		C87903302A5D2E6400FE6F42 /* Pro */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Pro; sourceTree = "<group>"; };
 		C87B03A3293B24AB00C77EAE /* Copilot-for-Xcode-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Copilot-for-Xcode-Info.plist"; sourceTree = SOURCE_ROOT; };
 		C87B03A4293B261200C77EAE /* AcceptSuggestionCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcceptSuggestionCommand.swift; sourceTree = "<group>"; };
 		C87B03A6293B261900C77EAE /* RejectSuggestionCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RejectSuggestionCommand.swift; sourceTree = "<group>"; };
@@ -257,6 +258,7 @@
 				C83E3F3E2A38C66D0071506D /* Python */,
 				C81D181E2A1B509B006C1B70 /* Tool */,
 				C8189B282938979000C9DCDA /* Core */,
+				C87903302A5D2E6400FE6F42 /* Pro */,
 				C8189B182938972F00C9DCDA /* Copilot for Xcode */,
 				C81458922939EFDC00135263 /* EditorExtension */,
 				C8216B71298036EC00AD38C7 /* Helper */,
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -56,7 +56,7 @@ let package = Package(
             url: "https://github.com/pointfreeco/swift-composable-architecture",
             from: "0.55.0"
         ),
-    ],
+    ].pro,
     targets: [
         // MARK: - Main
 
@@ -88,7 +88,8 @@ let package = Package(
                 "PromptToCodeService",
                 "ServiceUpdateMigration",
                 "UserDefaultsObserver",
-                "ChatTab",
+                "ChatGPTChatTab",
+                .product(name: "ChatTab", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
@@ -223,12 +224,13 @@ let package = Package(
         ),
 
         .target(
-            name: "ChatTab",
+            name: "ChatGPTChatTab",
             dependencies: [
                 "SharedUIComponents",
                 "ChatService",
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
+                .product(name: "ChatTab", package: "Tool"),
                 .product(name: "MarkdownUI", package: "swift-markdown-ui"),
             ]
         ),
@@ -248,13 +250,14 @@ let package = Package(
         .target(
             name: "SuggestionWidget",
             dependencies: [
-                "ChatTab",
+                "ChatGPTChatTab",
                 "ActiveApplicationMonitor",
                 "AXNotificationStream",
                 "Environment",
                 "UserDefaultsObserver",
                 "XcodeInspector",
                 "SharedUIComponents",
+                .product(name: "ChatTab", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                 .product(name: "MarkdownUI", package: "swift-markdown-ui"),
@@ -391,3 +394,34 @@ let package = Package(
     ]
 )
 
+// MARK: - Pro
+
+extension [Target.Dependency] {
+    func pro(_ targetNames: [String]) -> [Target.Dependency] {
+        if isProIncluded() {
+            return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
+        }
+        return self
+    }
+}
+
+extension [Package.Dependency] {
+    var pro: [Package.Dependency] {
+        if isProIncluded() {
+            return self + [.package(path: "../Pro")]
+        }
+        return self
+    }
+}
+
+import Foundation
+
+func isProIncluded(file: StaticString = #file) -> Bool {
+    let filePath = "\(file)"
+    let url = URL(fileURLWithPath: filePath)
+        .deletingLastPathComponent()
+        .deletingLastPathComponent()
+        .appendingPathComponent("Pro/Package.swift")
+    return FileManager.default.fileExists(atPath: url.path)
+}
+
diff --git a/Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift b/Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift
@@ -1,4 +1,5 @@
 import ChatService
+import ChatTab
 import Combine
 import Foundation
 import SwiftUI
@@ -17,7 +18,7 @@ public class ChatGPTChatTab: ChatTab {
         self.service = service
         provider = .init(service: service)
         super.init(id: "Chat-" + provider.id.uuidString, title: "Chat")
-        
+
         provider.$history.sink { [weak self] _ in
             if let title = self?.provider.title {
                 self?.title = title
diff --git a/Core/Sources/ChatGPTChatTab/ChatPanel.swift b/Core/Sources/ChatGPTChatTab/ChatPanel.swift
diff --git a/Core/Sources/ChatGPTChatTab/ChatProvider.swift b/Core/Sources/ChatGPTChatTab/ChatProvider.swift
diff --git a/Core/Sources/ChatGPTChatTab/Styles.swift b/Core/Sources/ChatGPTChatTab/Styles.swift
diff --git a/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift.swift b/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift.swift
@@ -1,4 +1,5 @@
 import AppKit
+import ChatGPTChatTab
 import ChatTab
 import ComposableArchitecture
 import Environment
diff --git a/Core/Sources/Service/GUI/WidgetDataSource.swift b/Core/Sources/Service/GUI/WidgetDataSource.swift
@@ -1,6 +1,5 @@
 import ActiveApplicationMonitor
 import ChatService
-import ChatTab
 import ComposableArchitecture
 import Foundation
 import GitHubCopilotService
diff --git a/Core/Sources/SuggestionWidget/ChatWindowView.swift b/Core/Sources/SuggestionWidget/ChatWindowView.swift
@@ -1,5 +1,6 @@
 import ActiveApplicationMonitor
 import AppKit
+import ChatGPTChatTab
 import ChatTab
 import ComposableArchitecture
 import SwiftUI
@@ -31,9 +32,9 @@ struct ChatWindowView: View {
                     .fill(.tertiary)
                     .frame(width: 120, height: 4)
                     .frame(height: 16)
-                
+
                 Divider()
-                
+
                 ChatTabBar(store: store)
                     .frame(height: 26)
 
@@ -50,7 +51,7 @@ struct ChatWindowView: View {
                 }
                 .opacity(0)
                 .keyboardShortcut("M", modifiers: [.command])
-                
+
                 Button(action: {
                     viewStore.send(.closeActiveTabClicked)
                 }) {
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift
@@ -1,7 +1,6 @@
 import ActiveApplicationMonitor
 import AsyncAlgorithms
 import AXNotificationStream
-import ChatTab
 import ComposableArchitecture
 import Environment
 import Foundation
@@ -250,7 +249,7 @@ public struct WidgetFeature: ReducerProtocol {
                         else { continue }
                         guard await windows.fullscreenDetector.isOnActiveSpace else { continue }
                         let app = AXUIElementCreateApplication(activeXcode.processIdentifier)
-                        if let window = app.focusedWindow {
+                        if let _ = app.focusedWindow {
                             await windows.orderFront()
                         }
                     }
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetDataSource.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetDataSource.swift
@@ -1,4 +1,3 @@
-import ChatTab
 import Foundation
 
 public protocol SuggestionWidgetDataSource {
diff --git a/Pro b/Pro
@@ -0,0 +1 @@
+Subproject commit 18369522f6c861c877ed6fb33a8bdf406816ac0e
diff --git a/Tool/Package.swift b/Tool/Package.swift
@@ -13,6 +13,7 @@ let package = Package(
         .library(name: "Preferences", targets: ["Preferences", "Configs"]),
         .library(name: "Logger", targets: ["Logger"]),
         .library(name: "OpenAIService", targets: ["OpenAIService"]),
+        .library(name: "ChatTab", targets: ["ChatTab"]),
     ],
     dependencies: [
         // A fork of https://github.com/aespinilla/Tiktoken to allow loading from local files.
@@ -22,6 +23,10 @@ let package = Package(
         .package(url: "https://github.com/ChimeHQ/JSONRPC", exact: "0.6.0"),
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.6.0"),
         .package(url: "https://github.com/unum-cloud/usearch", from: "0.19.1"),
+        .package(
+            url: "https://github.com/pointfreeco/swift-composable-architecture",
+            from: "0.55.0"
+        ),
     ],
     targets: [
         // MARK: - Helpers
@@ -87,6 +92,16 @@ let package = Package(
             dependencies: ["OpenAIService"]
         ),
 
+        // MARK: - UI
+
+        .target(
+            name: "ChatTab",
+            dependencies: [.product(
+                name: "ComposableArchitecture",
+                package: "swift-composable-architecture"
+            )]
+        ),
+
         // MARK: - Tests
 
         .testTarget(
diff --git a/Tool/Sources/ChatTab/ChatTab.swift b/Tool/Sources/ChatTab/ChatTab.swift

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "Pro"]`
	`2`	`+ path = Pro`
	`3`	`+ url = git@github.com:intitni/CopilotForXcodePro.git`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import AppKit`
	`2`	`+import ChatGPTChatTab`
`2`	`3`	`import ChatTab`
`3`	`4`	`import ComposableArchitecture`
`4`	`5`	`import Environment`