Skip to content

Commit b4ba00f

Browse files
committed
move start actions back to /browser/, inline command id strings
microsoft/vscode-copilot#3857
1 parent f5442d1 commit b4ba00f

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browse
2020
import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
2121
import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
2222

23+
import { StartSessionAction, HoldToSpeak } from '../browser/inlineChatActions2';
24+
registerAction2(StartSessionAction);
25+
registerAction2(HoldToSpeak);
26+
2327

2428
// --- browser
2529

src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts renamed to src/vs/workbench/contrib/inlineChat/browser/inlineChatActions2.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
1010
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
1111
import { InlineChatController, InlineChatRunOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
1212
import { AbstractInlineChatAction } from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
13-
import { LOCALIZED_START_INLINE_CHAT_STRING, START_INLINE_CHAT } from '../browser/inlineChatActions';
13+
import { LOCALIZED_START_INLINE_CHAT_STRING, START_INLINE_CHAT } from './inlineChatActions';
1414
import { disposableTimeout } from 'vs/base/common/async';
1515
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
1616
import { ICommandService } from 'vs/platform/commands/common/commands';
1717
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
18-
import { StartVoiceChatAction, StopListeningAction } from 'vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions';
1918
import { IChatExecuteActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
2019
import { CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
2120
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -96,13 +95,13 @@ function holdForSpeech(accessor: ServicesAccessor, ctrl: InlineChatController |
9695
let listening = false;
9796
const handle = disposableTimeout(() => {
9897
// start VOICE input
99-
commandService.executeCommand(StartVoiceChatAction.ID, { voice: { disableTimeout: true } } satisfies IChatExecuteActionContext);
98+
commandService.executeCommand('workbench.action.chat.startVoiceChat', { voice: { disableTimeout: true } } satisfies IChatExecuteActionContext);
10099
listening = true;
101100
}, 250);
102101

103102
holdMode.finally(() => {
104103
if (listening) {
105-
commandService.executeCommand(StopListeningAction.ID).finally(() => {
104+
commandService.executeCommand('workbench.action.chat.stopListening').finally(() => {
106105
ctrl!.acceptInput();
107106
});
108107
}

src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
77
import { registerAction2 } from 'vs/platform/actions/common/actions';
88
import { CancelAction, InlineChatQuickVoice, StartAction, StopAction } from 'vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatQuickVoice';
9-
import { StartSessionAction, HoldToSpeak } from './inlineChatActions';
109

11-
// start and hold for voice
12-
13-
registerAction2(StartSessionAction);
14-
registerAction2(HoldToSpeak);
1510

1611
// quick voice
1712

0 commit comments

Comments
 (0)