Skip to content

Prevent duplicate model picker icons#325200

Merged
justschen merged 5 commits into
mainfrom
copilot/fix-double-icon-issue
Jul 10, 2026
Merged

Prevent duplicate model picker icons#325200
justschen merged 5 commits into
mainfrom
copilot/fix-double-icon-issue

Conversation

Copilot AI commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Models with warning status displayed both the provider and warning icons.

Duplicate model icons

  • Prefer the model status icon when present.
  • Fall back to the provider-specific icon otherwise.
  • Add regression coverage for icon precedence.

Copilot AI requested review from Copilot and removed request for Copilot July 9, 2026 22:13
Copilot AI linked an issue Jul 9, 2026 that may be closed by this pull request
Co-authored-by: justschen <54879025+justschen@users.noreply.github.com>
Copilot AI requested review from Copilot and removed request for Copilot July 9, 2026 22:23
Copilot AI changed the title [WIP] Fix double icon display for models with warnings Prevent duplicate model picker icons Jul 9, 2026
Copilot AI requested a review from justschen July 9, 2026 22:25
@justschen

Copy link
Copy Markdown
Collaborator

@copilot we should actually prefer to show the warning icon always when there is grounds to show that icon

Co-authored-by: justschen <54879025+justschen@users.noreply.github.com>
Copilot AI requested review from Copilot and removed request for Copilot July 10, 2026 02:29

Copilot AI commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

@copilot we should actually prefer to show the warning icon always when there is grounds to show that icon

Updated in 6841a97: warning metadata now always selects the warning icon, including when warning text is present alongside another status icon.

@justschen justschen marked this pull request as ready for review July 10, 2026 03:52
Copilot AI review requested due to automatic review settings July 10, 2026 03:52
@justschen justschen enabled auto-merge (squash) July 10, 2026 03:53

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Prevents duplicate icons in the chat model picker by selecting one icon based on precedence.

Changes:

  • Adds centralized model-picker icon selection.
  • Uses one icon in the selected-model label.
  • Adds regression coverage.
Show a summary per file
File Description
chatModelPicker.ts Implements icon precedence and removes duplicate rendering.
chatModelPicker.test.ts Tests warning-icon selection.

Review details

  • Files reviewed: 2/2 changed files
  • Comments generated: 1
  • Review effort level: Medium

Comment thread src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.ts Outdated
Co-authored-by: justschen <54879025+justschen@users.noreply.github.com>
Copilot AI requested a review from justschen July 10, 2026 04:04
benvillalobos
benvillalobos previously approved these changes Jul 10, 2026
@justschen

Copy link
Copy Markdown
Collaborator

@copilot resolve the merge conflicts in this pull request

…on-issue

# Conflicts:
#	src/vs/workbench/contrib/chat/test/browser/widget/input/chatModelPicker.test.ts

Co-authored-by: justschen <54879025+justschen@users.noreply.github.com>

Copilot AI commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in chatModelPicker.test.ts by keeping both the getModelPickerIcon and getModelHoverContent imports added by each side, and merged origin/main into the branch in e653f31.

Copilot AI requested a review from justschen July 10, 2026 16:37
@justschen justschen merged commit 0f1678f into main Jul 10, 2026
29 checks passed
@justschen justschen deleted the copilot/fix-double-icon-issue branch July 10, 2026 19:07
@vs-code-engineering vs-code-engineering Bot added this to the 1.129.0 milestone Jul 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

double icon for models

5 participants