Skip to content

Commit 14e0a84

Browse files
committed
Merge branch 'feature/custom-chat-tab' into develop
2 parents ea3b823 + 5569f84 commit 14e0a84

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

Core/Sources/SuggestionWidget/FeatureReducers/ChatPanel.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public struct ChatPanel {
8080
case chatTab(id: String, action: ChatTabItem.Action)
8181
}
8282

83+
@Dependency(\.chatTabPool) var chatTabPool
8384
@Dependency(\.suggestionWidgetControllerDependency) var suggestionWidgetControllerDependency
8485
@Dependency(\.xcodeInspector) var xcodeInspector
8586
@Dependency(\.activatePreviousActiveXcode) var activatePreviouslyActiveXcode
@@ -197,6 +198,7 @@ public struct ChatPanel {
197198
return max(nextIndex, 0)
198199
}()
199200
state.chatTabGroup.tabInfo.removeAll { $0.id == id }
201+
chatTabPool.getTab(of: id)?.close()
200202
if state.chatTabGroup.tabInfo.isEmpty {
201203
state.isPanelDisplayed = false
202204
}

Tool/Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ let package = Package(
7777
url: "https://github.com/intitni/generative-ai-swift",
7878
branch: "support-setting-base-url"
7979
),
80-
.package(url: "https://github.com/intitni/CopilotForXcodeKit", from: "0.7.1"),
80+
// .package(url: "https://github.com/intitni/CopilotForXcodeKit", from: "0.7.1"),
81+
.package(path: "../../../CopilotForXcodeKit"),
8182

8283
// TreeSitter
8384
.package(url: "https://github.com/intitni/SwiftTreeSitter.git", branch: "main"),

Tool/Sources/ChatTab/ChatTab.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ open class BaseChatTab {
148148

149149
if let tab = self as? (any ChatTabType) {
150150
tab.start()
151+
chatTabStore.send(.tabContentUpdated)
151152
}
152153
}
153154
}

0 commit comments

Comments
 (0)