Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small chat renderer cleanup #219597

Merged
merged 1 commit into from
Jul 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -567,43 +567,44 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
return true;
}

let isFullyRendered = false;
if (element.isCanceled) {
this.traceLayout('doNextProgressiveRender', `canceled, index=${index}`);
element.renderData = undefined;
this.basicRenderElement(element, index, templateData);
isFullyRendered = true;
// TODO Maybe return here, shouldn't need to fire onDidChangeItemHeight here
} else {
this.traceLayout('doNextProgressiveRender', `START progressive render, index=${index}, renderData=${JSON.stringify(element.renderData)}`);
const contentForThisTurn = this.getNextProgressiveRenderContent(element);
const partsToRender = this.diff(templateData.renderedParts ?? [], contentForThisTurn, element);
isFullyRendered = partsToRender.every(part => part === null);
return true;
}

if (isFullyRendered && element.isComplete) {
let isFullyRendered = false;
this.traceLayout('doNextProgressiveRender', `START progressive render, index=${index}, renderData=${JSON.stringify(element.renderData)}`);
const contentForThisTurn = this.getNextProgressiveRenderContent(element);
const partsToRender = this.diff(templateData.renderedParts ?? [], contentForThisTurn, element);
isFullyRendered = partsToRender.every(part => part === null);

if (isFullyRendered) {
if (element.isComplete) {
// Response is done and content is rendered, so do a normal render
this.traceLayout('doNextProgressiveRender', `END progressive render, index=${index} and clearing renderData, response is complete`);
element.renderData = undefined;
this.basicRenderElement(element, index, templateData);
// TODO return here
} else if (!isFullyRendered) {
this.traceLayout('doNextProgressiveRender', `doing progressive render, ${partsToRender.length} parts to render`);
this.renderChatContentDiff(partsToRender, contentForThisTurn, element, templateData);
} else {
// Nothing new to render, not done, keep waiting
this.traceLayout('doNextProgressiveRender', 'caught up with the stream- no new content to render');
return false;
return true;
}

// Nothing new to render, not done, keep waiting
this.traceLayout('doNextProgressiveRender', 'caught up with the stream- no new content to render');
return false;
}

// Some render happened - update the height
// Do an actual progressive render
this.traceLayout('doNextProgressiveRender', `doing progressive render, ${partsToRender.length} parts to render`);
this.renderChatContentDiff(partsToRender, contentForThisTurn, element, templateData);

const height = templateData.rowContainer.offsetHeight;
element.currentRenderedHeight = height;
if (!isInRenderElement) {
this._onDidChangeItemHeight.fire({ element, height: templateData.rowContainer.offsetHeight });
}

return isFullyRendered;
return false;
}

private renderChatContentDiff(partsToRender: ReadonlyArray<IChatRendererContent | null>, contentForThisTurn: ReadonlyArray<IChatRendererContent>, element: IChatResponseViewModel, templateData: IChatListItemTemplate): void {
Expand Down
Loading