Skip to content

Commit 8f58c42

Browse files
Revised chat input placeholder text (microsoft#256554)
* Revised chat input placeholder text * revised placeholder text and removed @ button in ask mode * fix merge conflict --------- Co-authored-by: Justin Chen <[email protected]> Co-authored-by: Your Name <[email protected]>
1 parent 3df0be6 commit 8f58c42

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,7 @@ export function registerChatActions() {
915915
id: MenuId.ChatExecute,
916916
when: ContextKeyExpr.and(
917917
ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask),
918+
ContextKeyExpr.not('config.chat.emptyChatState.enabled'),
918919
ChatContextKeys.lockedToCodingAgent.negate()
919920
),
920921
group: 'navigation',

src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../comm
2020
import { chatSlashCommandBackground, chatSlashCommandForeground } from '../../common/chatColors.js';
2121
import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from '../../common/chatParserTypes.js';
2222
import { ChatRequestParser } from '../../common/chatRequestParser.js';
23-
import { ChatModeKind } from '../../common/constants.js';
2423
import { IChatWidget } from '../chat.js';
2524
import { ChatWidget } from '../chatWidget.js';
2625
import { dynamicVariableDecorationType } from './chatDynamicVariables.js';
@@ -133,11 +132,7 @@ class InputEditorDecorations extends Disposable {
133132
const mode = this.widget.input.currentModeObs.get();
134133
let description = mode.description.get();
135134
if (this.configurationService.getValue<boolean>('chat.emptyChatState.enabled')) {
136-
if (mode.kind === ChatModeKind.Ask) {
137-
description += ` ${localize('askPlaceholderHint', "# to add context, @ for extensions, / for commands")}`;
138-
} else if (mode.kind === ChatModeKind.Edit || mode.kind === ChatModeKind.Agent) {
139-
description += ` ${localize('editPlaceholderHint', "# to add context")}`;
140-
}
135+
description = localize('chatPlaceholderHint', "Add Context (#), Extensions (@), Commands (/)");
141136
}
142137

143138
const decoration: IDecorationOptions[] = [

src/vs/workbench/contrib/chat/common/chatModes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ export class BuiltinChatMode implements IChatMode {
334334
export namespace ChatMode {
335335
export const Ask = new BuiltinChatMode(ChatModeKind.Ask, 'Ask', localize('chatDescription', "Ask a question."));
336336
export const Edit = new BuiltinChatMode(ChatModeKind.Edit, 'Edit', localize('editsDescription', "Edit files."));
337-
export const Agent = new BuiltinChatMode(ChatModeKind.Agent, 'Agent', localize('agentDescription', "Build autonomously."));
337+
export const Agent = new BuiltinChatMode(ChatModeKind.Agent, 'Agent', localize('agentDescription', "Provide instructions."));
338338
}
339339

340340
export function isBuiltinChatMode(mode: IChatMode): boolean {

0 commit comments

Comments
 (0)