Simplify codeblock rendering in chat markdown - #305845
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors chat markdown/codeblock rendering by removing the shared CodeBlockModelCollection layer and shifting code block text-model creation/updates into CodeBlockPart, with corresponding updates across chat/inline-chat/tool-invocation rendering paths. It also adds a focused unit test suite for ChatMarkdownContentPart codeblock behavior (multi-block indexing, php prefixing, etc.).
Changes:
- Remove
CodeBlockModelCollectionand stop threading it through chat rendering contexts/view models. - Update
ChatMarkdownContentPartand tool-related parts to pass raw code text intoCodeBlockPart, which now owns its text model lifecycle. - Add
ChatMarkdownContentPartbrowser tests to validate multi-codeblock rendering and text handling.
Reviewed changes
Copilot reviewed 26 out of 26 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/vs/workbench/test/browser/componentFixtures/chatTerminalCollapsible.fixture.ts | Updates fixture render context to match removed codeBlockModelCollection. |
| src/vs/workbench/test/browser/componentFixtures/chatQuestionCarousel.fixture.ts | Updates fixture render context to match removed codeBlockModelCollection. |
| src/vs/workbench/test/browser/componentFixtures/chatProgressContentPart.fixture.ts | Updates fixture render context to match removed codeBlockModelCollection. |
| src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts | Switches inline-chat codeblock lookup to rely on rendered codeblock infos + IModelService. |
| src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatToolProgressPart.test.ts | Removes CodeBlockModelCollection usage from tool progress part tests. |
| src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts | Removes CodeBlockModelCollection usage from thinking part tests. |
| src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts | Removes CodeBlockModelCollection usage from subagent part tests. |
| src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatMarkdownContentPart.test.ts | New unit tests for markdown content part codeblock extraction/rendering behavior. |
| src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts | Deletes the shared codeblock model collection implementation. |
| src/vs/workbench/contrib/chat/common/model/chatViewModel.ts | Removes codeBlockModelCollection from ChatViewModel construction/state. |
| src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts | Stops creating/clearing/passing CodeBlockModelCollection; updates ChatViewModel instantiation accordingly. |
| src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts | Removes optional codeBlockModelCollection option/plumbing. |
| src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts | Removes codeblock content provider/collection wiring; uses synchronous uri on codeblock infos. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts | Updates tool invocation part construction after removing CodeBlockModelCollection dependency. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts | Reworks tool-confirmation code editor creation to use CodeBlockPart-owned models instead of inlineTextModels/model collection. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts | Updates terminal tool progress markdown rendering call sites for new ChatMarkdownContentPart signature. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts | Removes custom URI/model creation; relies on CodeBlockPart to create/manage the model from text. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart.ts | Makes CodeBlockPart create/update its own text model (stable URI) from provided text. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolOutputContentSubPart.ts | Updates tool output code blocks to pass text directly and use CodeBlockPart-generated URI. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts | Updates collapsible IO codeblocks to pass text directly (no explicit model creation). |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts | Removes CodeBlockModelCollection parameter plumbing. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts | Moves codeblock text processing (vulns/php prefix/codemapper URI extraction) into markdown rendering and passes text to codeblocks. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts.ts | Removes codeBlockModelCollection from render context type and updates comments. |
| src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts | Updates markdown part creation call signature after removing codeBlockModelCollection. |
| src/vs/workbench/contrib/chat/browser/chat.ts | Removes uriPromise from IChatCodeBlockInfo contract. |
| src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionHoverWidget.ts | Updates hover widget view model creation to no longer allocate a per-widget CodeBlockModelCollection. |
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
roblourens
marked this pull request as ready for review
March 30, 2026 17:30
roblourens
enabled auto-merge (squash)
March 30, 2026 17:30
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: Johannes Rieken (@jrieken)Matched files:
|
Henning Dieterichs (hediet)
approved these changes
Mar 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #305974