Use TextMate highlighting in component fixtures - #335568
Merged
Henning Dieterichs (hediet) merged 6 commits intoSep 11, 2026
Merged
Conversation
Copilot started reviewing on behalf of
Henning Dieterichs (hediet)
September 10, 2026 21:33
View session
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
An undefined variable breaks compilation, fixtures receive the wrong token theme, and a test leaks global palette state.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Review tier: Balanced
Findings: 1
New issues introduced by this change (3)
| Severity | Finding |
|---|---|
 |
src/vs/workbench/test/browser/componentFixtures/fixtureUtils.ts — Undefined disposable store breaks theme loading |
 |
src/vs/workbench/test/browser/componentFixtures/fixtureSyntaxHighlighting.test.ts — Restore the token palette after this test |
|
src/vs/workbench/test/browser/componentFixtures/fixtureUtils.ts — Load the Dark 2026 palette instead of Dark Modern |
What changed in this PR
Adds real TextMate syntax highlighting to component fixtures using shipped grammars and Oniguruma.
Changes:
- Registers fixture languages and shared tokenizers.
- Adds theme-scoped token CSS and synchronous model tokenization.
- Adds resource loading and tokenizer lifecycle tests.
| File | Description |
|---|---|
fixtureUtils.ts |
Integrates syntax highlighting into fixture setup. |
fixtureSyntaxHighlighting.ts |
Implements shared TextMate tokenizer registration and styling. |
fixtureSyntaxHighlighting.test.ts |
Tests tokenization, themes, and disposal. |
fixtureResourceLoader.ts |
Loads grammar and WASM resources. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Henning Dieterichs (hediet)
force-pushed
the
hediet/component-fixture-textmate
branch
2 times, most recently
from
September 10, 2026 22:18
a3c4b02 to
f5bbca5
Compare
Contributor
Screenshot ChangesBase: Changed (92)
|
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedSingleComment/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedSingleComment/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/CollapsedMultiComment/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMultiComment/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedFeedback/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewOnly/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedMixedComments/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedReviewComment/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedReviewSuggestion/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedPRReviewOnly/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedAllSourcesMixed/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedFocusedPRReview/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedThreadedFeedback/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/ExpandedThreadedFeedback/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/HiddenWidget/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/LongFileTwoComments/Dark
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackEditorWidget/LongFileTwoComments/Light
| Before | After |
|---|---|
 |
 |
sessions/agentFeedback/agentFeedbackInputWidget/InEditor/Dark
| Before | After |
|---|---|
 |
 |
sessions/changes/agentsDiffEditor/CompactDiffWithFeedback/Dark
| Before | After |
|---|---|
 |
 |
sessions/changes/agentsDiffEditor/CompactDiffWithFeedback/Light
| Before | After |
|---|---|
 |
 |
sessions/changes/agentsDiffEditor/CompactDiffWithSubmitOverlay/Dark
| Before | After |
|---|---|
 |
 |
sessions/changes/agentsDiffEditor/CompactDiffWithSubmitOverlay/Light
| Before | After |
|---|---|
 |
 |
sessions/blockedSessionsList/BlockedSessionsList_TwoApprovals/Dark
| Before | After |
|---|---|
 |
 |
sessions/blockedSessionsList/BlockedSessionsList_FiveApprovals/Dark
| Before | After |
|---|---|
 |
 |
chat/chatAgentMerge/ExpandedMarkdownComment/Dark
| Before | After |
|---|---|
 |
 |
editor/codeEditor/CodeEditor/Dark
| Before | After |
|---|---|
 |
 |
editor/codeEditor/CodeEditor/Light
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/ColorDecorators/Dark
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/ColorDecorators/Light
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/SelectedColorDecorator/Dark
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/SelectedColorDecorator/Light
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/InlineProgress/Dark
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/InlineProgress/Light
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/InlayHints/Dark
| Before | After |
|---|---|
 |
 |
editor/injectedTextDecorations/InlayHints/Light
| Before | After |
|---|---|
 |
 |
editor/inlineChatAffordance/InlineChatAffordance/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineChatAffordance/InlineChatAffordance/Light
| Before | After |
|---|---|
 |
 |
editor/inlineChatZoneWidget/InlineChatZoneWidget/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineChatZoneWidget/InlineChatZoneWidget/Light
| Before | After |
|---|---|
 |
 |
editor/inlineChatZoneWidget/InlineChatZoneWidgetTerminated/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineChatZoneWidget/InlineChatZoneWidgetTerminated/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/other/HintsToolbar/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/other/HintsToolbar/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/other/HintsToolbarHovered/Dark
| Before | After |
|---|---|
|
|
editor/inlineCompletions/other/HintsToolbarHovered/Light
| Before | After |
|---|---|
|
|
editor/inlineCompletions/other/JumpToHint/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/other/JumpToHint/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/other/NextFileEditSuggestion/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/other/NextFileEditSuggestion/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/SideBySideViewSmall/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/SideBySideViewSmall/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/SideBySideViewWide/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/SideBySideViewWide/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/WordReplacementView/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/WordReplacementView/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/DeletionView/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/DeletionView/Light
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/LineReplacementView/Dark
| Before | After |
|---|---|
 |
 |
editor/inlineCompletions/views/LineReplacementView/Light
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditor/Dark
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditor/Light
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorHideOriginalLineNumbers/Dark
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorHideOriginalLineNumbers/Light
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorIncrementalPending/Dark
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorIncrementalPending/Light
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorIncrementalResolved/Dark
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorIncrementalResolved/Light
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorDocumentSwapAfter/Dark
| Before | After |
|---|---|
 |
 |
editor/multiDiffEditor/MultiDiffEditorDocumentSwapAfter/Light
| Before | After |
|---|---|
 |
 |
editor/suggestWidget/MethodCompletions/Dark
| Before | After |
|---|---|
 |
 |
editor/suggestWidget/MethodCompletions/Light
| Before | After |
|---|---|
 |
 |
editor/suggestWidget/MethodCompletionsWithDetails/Dark
| Before | After |
|---|---|
 |
 |
editor/suggestWidget/MethodCompletionsWithDetails/Light
| Before | After |
|---|---|
 |
 |
editor/multiDiff/multiDiffEditorScroll/RealWidget/Dark
| Before | After |
|---|---|
 |
 |
editor/multiDiff/multiDiffEditorScroll/RealWidget/Light
| Before | After |
|---|---|
 |
 |
peekReference/PeekReferences/Dark
| Before | After |
|---|---|
 |
 |
peekReference/PeekReferences/Light
| Before | After |
|---|---|
 |
 |
agentSessionsViewer/ApprovalRowJson/Dark
| Before | After |
|---|---|
 |
 |
agentSessionsViewer/ApprovalRowJson/Light
| Before | After |
|---|---|
 |
 |
5 insignificant change(s) omitted (≤20 px, Δ≤2). See CI logs for details.
Michael Lively (Yoyokrazy)
previously approved these changes
Sep 10, 2026
Henning Dieterichs (hediet)
force-pushed
the
hediet/component-fixture-textmate
branch
from
September 11, 2026 09:13
f5bbca5 to
f3c65d0
Compare
Sandeep Somavarapu (sandy081)
previously approved these changes
Sep 11, 2026
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Henning Dieterichs (hediet)
force-pushed
the
hediet/component-fixture-textmate
branch
from
September 11, 2026 10:11
c9ac071 to
1d1b82c
Compare
Dirk Bäumer (dbaeumer)
previously approved these changes
Sep 11, 2026
Henning Dieterichs (hediet)
enabled auto-merge (rebase)
September 11, 2026 10:15
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Ulugbek Abdullaev (ulugbekna)
approved these changes
Sep 11, 2026
Henning Dieterichs (hediet)
deleted the
hediet/component-fixture-textmate
branch
September 11, 2026 10:57
|
Please don't rebase and merge, it doesn't show the PR number in commit history and unnecessary shows all the commits there, please use squash and merge it clearly shows the pr name and number, normal merge with commit is also okay but it is not as clear as squash because it shows branch name instead of PR title. In this screenshot we have all three examples 
|
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
The shared fixture Dark color theme remains Dark Modern in this PR. Switching the fixture default to Dark 2026 stays separate, and fully scoped multi-theme token palettes remain tracked by #335530.
Validation
npm run transpile-clientnpm exec eslint -- src\vs\workbench\test\browser\componentFixtures\fixtureResourceLoader.ts src\vs\workbench\test\browser\componentFixtures\fixtureSyntaxHighlighting.ts src\vs\workbench\test\browser\componentFixtures\fixtureSyntaxHighlighting.test.ts src\vs\workbench\test\browser\componentFixtures\fixtureUtils.ts.\scripts\test.bat --run src\vs\workbench\test\browser\componentFixtures\fixtureSyntaxHighlighting.test.ts(6 passing)