Skip to content

Commit b482c0e

Browse files
authored
Merge pull request microsoft#256770 from microsoft/tyriar/copilot_tab
Set run in terminal icon to chat and remove Copilot name
2 parents e7be6e9 + c952adb commit b482c0e

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -531,16 +531,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
531531
const defaultProfile = (await this._terminalProfileResolverService.getDefaultProfile({ remoteAuthority: this.remoteAuthority, os }));
532532
this.shellLaunchConfig.executable = defaultProfile.path;
533533
this.shellLaunchConfig.args = defaultProfile.args;
534-
if (this.shellLaunchConfig.isExtensionOwnedTerminal) {
535-
// Only use default icon and color and env if they are undefined in the SLC
536-
this.shellLaunchConfig.icon ??= defaultProfile.icon;
537-
this.shellLaunchConfig.color ??= defaultProfile.color;
538-
this.shellLaunchConfig.env ??= defaultProfile.env;
539-
} else {
540-
this.shellLaunchConfig.icon = defaultProfile.icon;
541-
this.shellLaunchConfig.color = defaultProfile.color;
542-
this.shellLaunchConfig.env = defaultProfile.env;
543-
}
534+
// Only use default icon and color and env if they are undefined in the SLC
535+
this.shellLaunchConfig.icon ??= defaultProfile.icon;
536+
this.shellLaunchConfig.color ??= defaultProfile.color;
537+
this.shellLaunchConfig.env ??= defaultProfile.env;
544538
}
545539

546540
// Resolve the shell type ahead of time to allow features that depend upon it to work

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import { DeferredPromise, disposableTimeout, timeout } from '../../../../../base/common/async.js';
77
import type { CancellationToken } from '../../../../../base/common/cancellation.js';
8+
import { Codicon } from '../../../../../base/common/codicons.js';
89
import { CancellationError } from '../../../../../base/common/errors.js';
910
import { DisposableStore } from '../../../../../base/common/lifecycle.js';
1011
import { ThemeIcon } from '../../../../../base/common/themables.js';
@@ -70,8 +71,7 @@ export class ToolTerminalCreator {
7071
private _createCopilotTerminal() {
7172
return this._terminalService.createTerminal({
7273
config: {
73-
name: 'Copilot',
74-
icon: ThemeIcon.fromId('copilot'),
74+
icon: ThemeIcon.fromId(Codicon.chatSparkle.id),
7575
hideFromUser: true,
7676
env: {
7777
GIT_PAGER: 'cat', // avoid making `git diff` interactive when called from copilot

0 commit comments

Comments
 (0)