Skip to content

fix for chat tips #304899

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

Open
meganrogge wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −9
Open

fix for chat tips #304899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions src/vs/workbench/contrib/chat/browser/chatTipService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,14 +849,10 @@ export class ChatTipService extends Disposable implements IChatTipService {
return;
}
const enabledCommandSet = new Set(enabledCommands);
const dismissCommandSet = new Set(tip.dismissWhenCommandsClicked);
this._tipCommandListener.value = this._commandService.onDidExecuteCommand(e => {
if (enabledCommandSet.has(e.commandId) && this._shownTip?.id === tip.id) {
this._logTipTelemetry(tip.id, 'commandClicked', e.commandId);
if (dismissCommandSet.has(e.commandId)) {
this.dismissTip();
}
this.hideTipsForSession();
this.dismissTip();
}
});
}
Expand Down
24 changes: 20 additions & 4 deletions src/vs/workbench/contrib/chat/test/browser/chatTipService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { Range } from '../../../../../editor/common/core/range.js';
import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
import { localChatSessionType } from '../../common/chatSessionsService.js';
import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID } from '../../browser/actions/chatActions.js';
import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID, GENERATE_PROMPT_COMMAND_ID } from '../../browser/actions/chatActions.js';

class MockContextKeyServiceWithRulesMatching extends MockContextKeyService {
override contextMatchesRules(rules: ContextKeyExpression): boolean {
Expand Down Expand Up @@ -1484,13 +1484,29 @@ suite('ChatTipService', () => {
commandExecutedEmitter.fire({ commandId: 'workbench.action.openSettings', args: [] });

assert.strictEqual(dismissed, true, `${tipId} should dismiss when its settings command is clicked`);
assert.strictEqual(service.getWelcomeTip(contextKeyService), undefined, 'Tips should hide for the rest of the session after actioning a tip');
assert.notStrictEqual(service.getWelcomeTip(contextKeyService)?.id, tipId, `${tipId} should not be shown again after actioning its command link`);

service.resetSession();
assertTipNeverShown(service, tipId);
const nextService = createService();
assertTipNeverShown(nextService, tipId);
});
}

test('dismisses createPrompt tip after clicking its command link', () => {
const service = createService();
contextKeyService.createKey(ChatContextKeys.chatSessionType.key, localChatSessionType);

const tip = findTipById(service, 'tip.createPrompt');
assert.ok(tip, 'Should show tip.createPrompt before command click');
assert.ok(tip.enabledCommands?.includes(GENERATE_PROMPT_COMMAND_ID), 'Tip should enable the create prompt command');

commandExecutedEmitter.fire({ commandId: GENERATE_PROMPT_COMMAND_ID, args: [] });

assert.notStrictEqual(service.getWelcomeTip(contextKeyService)?.id, 'tip.createPrompt', 'tip.createPrompt should not be shown again after actioning its command link');

const nextService = createService();
assertTipNeverShown(nextService, 'tip.createPrompt');
});

test('logs telemetry when tip is shown', () => {
const events: { eventName: string; data: Record<string, unknown> }[] = [];
instantiationService.stub(ITelemetryService, {
Expand Down
Loading