Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chat - actions support for status headers #245203

Merged
merged 4 commits into from
Apr 1, 2025
Merged

chat - actions support for status headers #245203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fc8569
chat - actions support for status headers
bpasero Apr 1, 2025
1f585e8
.
bpasero Apr 1, 2025
50e0e0e
.
bpasero Apr 1, 2025
ff73914
.
bpasero Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/vs/editor/browser/services/hoverService/hover.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
box-shadow: 0 2px 8px var(--vscode-widget-shadow);
}

.monaco-workbench .workbench-hover .monaco-action-bar .action-item .codicon {
/* Given our font-size, adjust action icons accordingly */
width: 13px;
height: 13px;
}

.monaco-workbench .workbench-hover hr {
border-bottom: none;
}
Expand All @@ -26,6 +32,12 @@
font-size: 12px;
}

.monaco-workbench .workbench-hover.compact .monaco-action-bar .action-item .codicon {
/* Given our font-size, adjust action icons accordingly */
width: 12px;
height: 12px;
}

.monaco-workbench .workbench-hover.compact .hover-contents {
padding: 2px 8px;
}
Expand Down
41 changes: 31 additions & 10 deletions src/vs/workbench/contrib/chat/browser/chatStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { ILanguageService } from '../../../../editor/common/languages/language.j
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
import { Button } from '../../../../base/browser/ui/button/button.js';
import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from '../../../../base/common/actions.js';
import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, IAction, toAction } from '../../../../base/common/actions.js';
import { parseLinkedText } from '../../../../base/common/linkedText.js';
import { Link } from '../../../../platform/opener/browser/link.js';
import { IOpenerService } from '../../../../platform/opener/common/opener.js';
Expand All @@ -38,6 +38,10 @@ import { IChatStatusItemService, ChatStatusEntry } from './chatStatusItemService
import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
import { Codicon } from '../../../../base/common/codicons.js';
import { URI } from '../../../../base/common/uri.js';

const gaugeBackground = registerColor('gauge.background', {
dark: inputValidationInfoBorder,
Expand Down Expand Up @@ -93,7 +97,8 @@ registerColor('gauge.errorForeground', {
const defaultChat = {
extensionId: product.defaultChatAgent?.extensionId ?? '',
completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? ''
nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
};

export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
Expand Down Expand Up @@ -282,14 +287,18 @@ class ChatStatusDashboard extends Disposable {
disposables.add(token.onCancellationRequested(() => disposables.dispose()));

let needsSeparator = false;
const addSeparator = (label: string | undefined) => {
const addSeparator = (label?: string, action?: IAction) => {
if (needsSeparator) {
this.element.appendChild($('hr'));
needsSeparator = false;
}

if (label) {
this.element.appendChild($('div.header', undefined, label));
if (label || action) {
const header = this.element.appendChild($('div.header', undefined, label ?? ''));

if (action) {
const toolbar = disposables.add(new ActionBar(header));
toolbar.push([action], { icon: true, label: false });
}
}

needsSeparator = true;
Expand All @@ -299,7 +308,13 @@ class ChatStatusDashboard extends Disposable {
if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate, chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;

addSeparator(localize('usageTitle', "Copilot Free Plan Usage"));
addSeparator(localize('usageTitle', "Copilot Free Plan Usage"), toAction({
id: 'workbench.action.openChatSettings',
label: localize('quotaLabel', "Manage Copilot"),
tooltip: localize('quotaTooltip', "Manage Copilot"),
class: ThemeIcon.asClassName(Codicon.settings),
run: () => this.runCommandAndClose(() => this.openerService.open(URI.parse(defaultChat.manageSettingsUrl))),
}));

const chatQuotaIndicator = this.createQuotaIndicator(this.element, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
const completionsQuotaIndicator = this.createQuotaIndicator(this.element, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
Expand Down Expand Up @@ -328,7 +343,7 @@ class ChatStatusDashboard extends Disposable {
// Contributions
{
for (const item of this.chatStatusItemService.getEntries()) {
addSeparator(undefined);
addSeparator();
const chatItemDisposables = disposables.add(new MutableDisposable());

let rendered = this.renderContributedChatStatusItem(item);
Expand All @@ -350,7 +365,13 @@ class ChatStatusDashboard extends Disposable {

// Settings
{
addSeparator(localize('settingsTitle', "Settings"));
addSeparator(localize('settingsTitle', "Settings"), this.chatEntitlementService.sentiment === ChatSentiment.Installed ? toAction({
id: 'workbench.action.openChatSettings',
label: localize('settingsLabel', "Settings"),
tooltip: localize('settingsTooltip', "Open Settings"),
class: ThemeIcon.asClassName(Codicon.settingsGear),
run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
}) : undefined);

this.createSettings(this.element, disposables);
}
Expand All @@ -360,7 +381,7 @@ class ChatStatusDashboard extends Disposable {
const newUser = isNewUser(this.chatEntitlementService);
const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
if (newUser || signedOut) {
addSeparator(undefined);
addSeparator();

this.element.appendChild($('div.description', undefined, newUser ? localize('activateDescription', "Set up Copilot to use AI features.") : localize('signInDescription', "Sign in to use Copilot AI features.")));

Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/contrib/chat/browser/media/chatStatus.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@
}

.chat-status-bar-entry-tooltip div.header {
display: flex;
align-items: center;
color: var(--vscode-descriptionForeground);
margin-bottom: 4px;
font-weight: 600;
}

.chat-status-bar-entry-tooltip div.header .monaco-action-bar {
margin-left: auto;
}

.chat-status-bar-entry-tooltip div.description {
color: var(--vscode-descriptionForeground);
}
Expand Down
Loading