Skip to content

Commit 304c83e

Browse files
authored
fix inline chat accessibility help (microsoft#223529)
fix microsoft#223333
1 parent 55b36b5 commit 304c83e

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ import { AccessibleDiffViewerNext } from 'vs/editor/browser/widget/diffEditor/co
1313
import { INLINE_CHAT_ID } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
1414
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
1515
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
16-
import { CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from 'vs/workbench/contrib/chat/common/chatContextKeys';
16+
import { CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST, CONTEXT_CHAT_LOCATION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
1717
import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
18+
import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
1819

1920
export class ChatAccessibilityHelp implements IAccessibleViewImplentation {
2021
readonly priority = 105;
2122
readonly name = 'panelChat';
2223
readonly type = AccessibleViewType.Help;
23-
readonly when = ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST);
24+
readonly when = ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST));
2425
getProvider(accessor: ServicesAccessor) {
2526
const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
2627
return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'panelChat');

src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vs/workbench/contrib/chat/common/ch
2525
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
2626
import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
2727
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
28+
import { InlineChatAccessibilityHelp } from 'vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp';
2829

2930

3031
// --- browser
@@ -94,8 +95,8 @@ const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegist
9495
workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
9596

9697
registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
97-
9898
AccessibleViewRegistry.register(new InlineChatAccessibleView());
99+
AccessibleViewRegistry.register(new InlineChatAccessibilityHelp());
99100

100101

101102
// MARK - Menu Copier

src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ import { AccessibleViewType } from 'vs/platform/accessibility/browser/accessible
99
import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
1010
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1111
import { getChatAccessibilityHelpProvider } from 'vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp';
12-
import { CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
12+
import { CONTEXT_CHAT_INPUT_HAS_FOCUS } from 'vs/workbench/contrib/chat/common/chatContextKeys';
13+
import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
1314

1415
export class InlineChatAccessibilityHelp implements IAccessibleViewImplentation {
1516
readonly priority = 106;
1617
readonly name = 'inlineChat';
1718
readonly type = AccessibleViewType.Help;
18-
readonly when = ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED);
19+
readonly when = ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CONTEXT_CHAT_INPUT_HAS_FOCUS);
1920
getProvider(accessor: ServicesAccessor) {
2021
const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
2122
if (!codeEditor) {

0 commit comments

Comments
 (0)