Skip to content

Commit 9cd554c

Browse files
authored
Background - update icon and don't use default for the branch picker (#3771)
1 parent b3900e7 commit 9cd554c

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ export class CopilotCLIChatSessionContentProvider extends Disposable implements
431431
options[ISOLATION_OPTION_ID] = {
432432
id: isolationMode,
433433
name: isolationMode === 'worktree' ? l10n.t('Worktree') : l10n.t('Workspace'),
434-
icon: new vscode.ThemeIcon(isolationMode === 'worktree' ? 'git-branch' : 'folder')
434+
icon: new vscode.ThemeIcon(isolationMode === 'worktree' ? 'worktree' : 'folder')
435435
};
436436
}
437437
const shouldShowBranch = !isIsolationOptionFeatureEnabled(this.configurationService) || _sessionIsolation.get(copilotcliSessionId) === 'worktree';
@@ -501,7 +501,7 @@ export class CopilotCLIChatSessionContentProvider extends Disposable implements
501501
options[ISOLATION_OPTION_ID] = {
502502
id: isWorktree ? 'worktree' : 'workspace',
503503
name: isWorktree ? l10n.t('Worktree') : l10n.t('Workspace'),
504-
icon: new vscode.ThemeIcon(isWorktree ? 'git-branch' : 'folder'),
504+
icon: new vscode.ThemeIcon(isWorktree ? 'worktree' : 'folder'),
505505
locked: true
506506
};
507507
}
@@ -528,7 +528,7 @@ export class CopilotCLIChatSessionContentProvider extends Disposable implements
528528
description: l10n.t('Pick Isolation Mode'),
529529
items: [
530530
{ id: 'workspace', name: l10n.t('Workspace'), icon: new vscode.ThemeIcon('folder') },
531-
{ id: 'worktree', name: l10n.t('Worktree'), icon: new vscode.ThemeIcon('git-branch') },
531+
{ id: 'worktree', name: l10n.t('Worktree'), icon: new vscode.ThemeIcon('worktree') },
532532
]
533533
});
534534
}
@@ -612,7 +612,7 @@ export class CopilotCLIChatSessionContentProvider extends Disposable implements
612612
id: ref.name!,
613613
name: ref.name!,
614614
icon: new vscode.ThemeIcon('git-branch'),
615-
default: isHead
615+
// default: isHead
616616
};
617617
if (isHead) {
618618
headItem = item;
@@ -975,7 +975,7 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
975975
// Also lock the isolation option if set
976976
const selectedIsolation = _sessionIsolation.get(id);
977977
if (selectedIsolation && isIsolationOptionFeatureEnabled(this.configurationService)) {
978-
changes.push({ optionId: ISOLATION_OPTION_ID, value: { id: selectedIsolation, name: selectedIsolation === 'worktree' ? l10n.t('Worktree') : l10n.t('Workspace'), icon: new vscode.ThemeIcon(selectedIsolation === 'worktree' ? 'git-branch' : 'folder'), locked: true } });
978+
changes.push({ optionId: ISOLATION_OPTION_ID, value: { id: selectedIsolation, name: selectedIsolation === 'worktree' ? l10n.t('Worktree') : l10n.t('Workspace'), icon: new vscode.ThemeIcon(selectedIsolation === 'worktree' ? 'worktree' : 'folder'), locked: true } });
979979
}
980980
this.contentProvider.notifySessionOptionsChange(resource, changes);
981981
}

0 commit comments

Comments
 (0)