Skip to content

Commit 6095069

Browse files
authored
Merge pull request microsoft#254659 from microsoft/tyriar/254658
Simplify terminal initial hint
2 parents 6194395 + 8ca8924 commit 6095069

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
1818
import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
1919
import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
2020
import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
21-
import { IProductService } from '../../../../../platform/product/common/productService.js';
2221
import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
2322
import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
2423
import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
2524
import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
2625
import { IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
26+
import { ChatAgentLocation } from '../../../chat/common/constants.js';
2727
import { IDetachedTerminalInstance, ITerminalContribution, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService, IXtermTerminal } from '../../../terminal/browser/terminal.js';
2828
import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
2929
import { TerminalInstance } from '../../../terminal/browser/terminalInstance.js';
3030
import { TerminalInitialHintSettingId } from '../common/terminalInitialHintConfiguration.js';
3131
import './media/terminalInitialHint.css';
3232
import { TerminalChatCommandId } from './terminalChat.js';
33-
import { ChatAgentLocation } from '../../../chat/common/constants.js';
3433

3534
const $ = dom.$;
3635

@@ -215,12 +214,10 @@ class TerminalInitialHintWidget extends Disposable {
215214

216215
constructor(
217216
private readonly _instance: ITerminalInstance,
218-
@IChatAgentService private readonly _chatAgentService: IChatAgentService,
219217
@ICommandService private readonly _commandService: ICommandService,
220218
@IConfigurationService private readonly _configurationService: IConfigurationService,
221219
@IContextMenuService private readonly _contextMenuService: IContextMenuService,
222220
@IKeybindingService private readonly _keybindingService: IKeybindingService,
223-
@IProductService private readonly _productService: IProductService,
224221
@IStorageService private readonly _storageService: IStorageService,
225222
@ITelemetryService private readonly _telemetryService: ITelemetryService,
226223
@ITerminalService private readonly _terminalService: ITerminalService,
@@ -244,13 +241,7 @@ class TerminalInitialHintWidget extends Disposable {
244241
}
245242

246243
private _getHintInlineChat(agents: IChatAgent[]) {
247-
let providerName = (agents.length === 1 ? agents[0].fullName : undefined) ?? this._productService.nameShort;
248-
const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
249-
if (defaultAgent?.extensionId.value === agents[0].extensionId.value) {
250-
providerName = defaultAgent.fullName ?? providerName;
251-
}
252-
253-
let ariaLabel = `Ask ${providerName} something or start typing to dismiss.`;
244+
let ariaLabel = `Open chat.`;
254245

255246
const handleClick = () => {
256247
this._storageService.store(Constants.InitialHintHideStorageKey, true, StorageScope.APPLICATION, StorageTarget.USER);
@@ -285,7 +276,7 @@ class TerminalInitialHintWidget extends Disposable {
285276
const keybindingHintLabel = keybindingHint?.getLabel();
286277

287278
if (keybindingHint && keybindingHintLabel) {
288-
const actionPart = localize('emptyHintText', 'Press {0} to ask {1} to do something. ', keybindingHintLabel, providerName);
279+
const actionPart = localize('emptyHintText', 'Open chat {0}. ', keybindingHintLabel);
289280

290281
const [before, after] = actionPart.split(keybindingHintLabel).map((fragment) => {
291282
const hintPart = $('a', undefined, fragment);
@@ -316,7 +307,7 @@ class TerminalInitialHintWidget extends Disposable {
316307
comment: [
317308
'Preserve double-square brackets and their order',
318309
]
319-
}, '[[Ask {0} to do something]] or start typing to dismiss.', providerName);
310+
}, '[[Open chat]] or start typing to dismiss.');
320311
const rendered = renderFormattedText(hintMsg, { actionHandler: hintHandler });
321312
hintElement.appendChild(rendered);
322313
}

0 commit comments

Comments
 (0)