Fix

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodePanel.swift

@@ -173,41 +173,48 @@ public struct PromptToCodePanel {
                                         range: snippet.attachedRange,
                                         references: context.references,
                                         topics: context.topics
-                                    )).timedDebounce(for: 0.4)
+                                    )).map {
+                                        switch $0 {
+                                        case let .code(code):
+                                            return (code: code, description: "")
+                                        case let .explanation(explanation):
+                                            return (code: "", description: explanation)
+                                        }
+                                    }.timedDebounce(for: 0.4) { lhs, rhs in
+                                        (
+                                            code: lhs.code + rhs.code,
+                                            description: lhs.description + rhs.description
+                                        )
+                                    }
 
                                     do {
                                         for try await response in stream {
                                             try Task.checkCancellation()
-
-                                            switch response {
-                                            case let .code(code):
-                                                await send(.snippetPanel(.element(
-                                                    id: snippet.id,
-                                                    action: .modifyCodeChunkReceived(
-                                                        code: code,
-                                                        description: ""
-                                                    )
-                                                )))
-                                            case let .explanation(explanation):
-                                                await send(.snippetPanel(.element(
-                                                    id: snippet.id,
-                                                    action: .modifyCodeChunkReceived(
-                                                        code: "",
-                                                        description: explanation
-                                                    )
-                                                )))
-                                            }
+                                            await send(.snippetPanel(.element(
+                                                id: snippet.id,
+                                                action: .modifyCodeChunkReceived(
+                                                    code: response.code,
+                                                    description: response.description
+                                                )
+                                            )))
                                         }
+                                        await send(.snippetPanel(.element(
+                                            id: snippet.id,
+                                            action: .modifyCodeFinished
+                                        )))
                                     } catch is CancellationError {
+                                        await send(.snippetPanel(.element(
+                                            id: snippet.id,
+                                            action: .modifyCodeFinished
+                                        )))
                                         throw CancellationError()
                                     } catch {
-                                        try Task.checkCancellation()
                                         if (error as NSError).code == NSURLErrorCancelled {
                                             await send(.snippetPanel(.element(
                                                 id: snippet.id,
-                                                action: .modifyCodeFailed(error: "Cancelled")
+                                                action: .modifyCodeFinished
                                             )))
-                                            return
+                                            throw CancellationError()
                                         }
                                         await send(.snippetPanel(.element(
                                             id: snippet.id,

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanelView.swift

@@ -288,12 +288,8 @@ extension PromptToCodePanelView {
                     let isResponding = store.promptToCodeState.isGenerating
                     let isCodeEmpty = store.promptToCodeState.snippets
                         .allSatisfy(\.modifiedCode.isEmpty)
-                    let isDescriptionEmpty = store.promptToCodeState.snippets
-                        .allSatisfy(\.description.isEmpty)
                     var isRespondingButCodeIsReady: Bool {
-                        isResponding
-                            && !isCodeEmpty
-                            && !isDescriptionEmpty
+                        isResponding && !isCodeEmpty
                     }
                     if !isResponding || isRespondingButCodeIsReady {
                         HStack {
@@ -619,20 +615,23 @@ extension PromptToCodePanelView {
 
             var body: some View {
                 WithPerceptionTracking {
-                    VStack(spacing: 0) {
+                    VStack(alignment: .leading, spacing: 0) {
                         SnippetTitleBar(
                             store: store,
                             language: language,
                             codeForegroundColor: codeForegroundColor,
                             isAttached: isAttached
                         )
+
+                        DescriptionContent(store: store, codeForegroundColor: codeForegroundColor)
+
                         CodeContent(
                             store: store,
                             language: language,
                             isGenerating: isGenerating,
                             codeForegroundColor: codeForegroundColor
                         )
-                        DescriptionContent(store: store, codeForegroundColor: codeForegroundColor)
+
                         ErrorMessage(store: store)
                     }
                 }
@@ -1146,7 +1145,12 @@ extension PromptToCodePanelView {
                 ChatMessage.Reference(
                     title: "Foo",
                     content: "struct Foo { var foo: Int }",
-                    kind: .symbol(.struct, uri: "file:///path/to/file.txt", startLine: 13, endLine: 13)
+                    kind: .symbol(
+                        .struct,
+                        uri: "file:///path/to/file.txt",
+                        startLine: 13,
+                        endLine: 13
+                    )
                 ),
             ],
         )),

Tool/Sources/CustomAsyncAlgorithms/TimedDebounce.swift

@@ -46,18 +46,27 @@ public extension AsyncSequence {
     ///
     /// In the future when we drop macOS 12 support we should just use chunked from AsyncAlgorithms.
     func timedDebounce(
-        for duration: TimeInterval
+        for duration: TimeInterval,
+        reducer: @escaping @Sendable (Element, Element) -> Element
     ) -> AsyncThrowingStream<Element, Error> {
         return AsyncThrowingStream { continuation in
             Task {
-                let function = TimedDebounceFunction(duration: duration) { value in
-                    continuation.yield(value)
-                }
+                let storage = TimedDebounceStorage<Element>()
+                var lastTimeStamp = Date()
                 do {
                     for try await value in self {
-                        await function(value)
+                        await storage.reduce(value, reducer: reducer)
+                        let now = Date()
+                        if now.timeIntervalSince(lastTimeStamp) >= duration {
+                            lastTimeStamp = now
+                            if let value = await storage.consume() {
+                                continuation.yield(value)
+                            }
+                        }
+                    }
+                    if let value = await storage.consume() {
+                        continuation.yield(value)
                     }
-                    await function.finish()
                     continuation.finish()
                 } catch {
                     continuation.finish(throwing: error)
@@ -67,3 +76,19 @@ public extension AsyncSequence {
     }
 }
 
+private actor TimedDebounceStorage<Element> {
+    var value: Element?
+    func reduce(_ value: Element, reducer: (Element, Element) -> Element) async {
+        if let existing = self.value {
+            self.value = reducer(existing, value)
+        } else {
+            self.value = value
+        }
+    }
+
+    func consume() -> Element? {
+        defer { value = nil }
+        return value
+    }
+}
+