Skip to content

Commit bf53fde

Browse files
jriekenjrieken
committed
move browser things back so that services and dependents are registered properly
1 parent 481d7bb commit bf53fde

File tree

3 files changed

+71
-58
lines changed

3 files changed

+71
-58
lines changed

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
7+
import { registerAction2 } from 'vs/platform/actions/common/actions';
8+
import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
9+
import * as InlineChatActions from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
10+
import { IInlineChatService, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
11+
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
12+
import { InlineChatServiceImpl } from 'vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl';
13+
import { Registry } from 'vs/platform/registry/common/platform';
14+
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
15+
import { InlineChatNotebookContribution } from 'vs/workbench/contrib/inlineChat/browser/inlineChatNotebook';
16+
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
17+
import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl';
18+
import { InlineChatAccessibleViewContribution } from 'vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView';
19+
import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService';
20+
import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
21+
import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
22+
23+
24+
// --- browser
25+
26+
registerSingleton(IInlineChatService, InlineChatServiceImpl, InstantiationType.Delayed);
27+
registerSingleton(IInlineChatSessionService, InlineChatSessionServiceImpl, InstantiationType.Delayed);
28+
registerSingleton(IInlineChatSavingService, InlineChatSavingServiceImpl, InstantiationType.Delayed);
29+
30+
registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
31+
registerEditorContribution(INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, InlineChatActions.InlineAccessibilityHelpContribution, EditorContributionInstantiation.Eventually);
32+
33+
registerAction2(InlineChatActions.CloseAction);
34+
registerAction2(InlineChatActions.ConfigureInlineChatAction);
35+
// registerAction2(InlineChatActions.UnstashSessionAction);
36+
registerAction2(InlineChatActions.MakeRequestAction);
37+
registerAction2(InlineChatActions.StopRequestAction);
38+
registerAction2(InlineChatActions.ReRunRequestAction);
39+
registerAction2(InlineChatActions.DiscardHunkAction);
40+
registerAction2(InlineChatActions.DiscardAction);
41+
registerAction2(InlineChatActions.DiscardToClipboardAction);
42+
registerAction2(InlineChatActions.DiscardUndoToNewFileAction);
43+
registerAction2(InlineChatActions.CancelSessionAction);
44+
45+
registerAction2(InlineChatActions.ArrowOutUpAction);
46+
registerAction2(InlineChatActions.ArrowOutDownAction);
47+
registerAction2(InlineChatActions.FocusInlineChat);
48+
registerAction2(InlineChatActions.PreviousFromHistory);
49+
registerAction2(InlineChatActions.NextFromHistory);
50+
registerAction2(InlineChatActions.ViewInChatAction);
51+
registerAction2(InlineChatActions.ExpandMessageAction);
52+
registerAction2(InlineChatActions.ContractMessageAction);
53+
54+
registerAction2(InlineChatActions.ToggleDiffForChange);
55+
registerAction2(InlineChatActions.FeebackHelpfulCommand);
56+
registerAction2(InlineChatActions.FeebackUnhelpfulCommand);
57+
registerAction2(InlineChatActions.ReportIssueForBugCommand);
58+
registerAction2(InlineChatActions.AcceptChanges);
59+
60+
registerAction2(InlineChatActions.CopyRecordings);
61+
62+
const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
63+
workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
64+
workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatAccessibleViewContribution, LifecyclePhase.Eventually);

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

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,67 +6,15 @@
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 { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
10-
import * as InlineChatActions from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
119
import * as StartSessionAction from './inlineChatActions';
12-
import { IInlineChatService, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
13-
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
14-
import { InlineChatServiceImpl } from 'vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl';
15-
import { Registry } from 'vs/platform/registry/common/platform';
16-
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
17-
import { InlineChatNotebookContribution } from 'vs/workbench/contrib/inlineChat/browser/inlineChatNotebook';
18-
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
19-
import { InlineChatSavingServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl';
20-
import { InlineChatAccessibleViewContribution } from 'vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView';
21-
import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService';
22-
import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
23-
import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
2410

25-
// --- electron-browser
26-
registerEditorContribution(InlineChatQuickVoice.ID, InlineChatQuickVoice, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
27-
registerAction2(StartAction);
28-
registerAction2(StopAction);
29-
registerAction2(CancelAction);
30-
31-
// --- browser
32-
33-
registerSingleton(IInlineChatService, InlineChatServiceImpl, InstantiationType.Delayed);
34-
registerSingleton(IInlineChatSessionService, InlineChatSessionServiceImpl, InstantiationType.Delayed);
35-
registerSingleton(IInlineChatSavingService, InlineChatSavingServiceImpl, InstantiationType.Delayed);
36-
37-
registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
38-
registerEditorContribution(INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, InlineChatActions.InlineAccessibilityHelpContribution, EditorContributionInstantiation.Eventually);
11+
// start and hold for voice
3912

4013
registerAction2(StartSessionAction.StartSessionAction);
41-
registerAction2(InlineChatActions.CloseAction);
42-
registerAction2(InlineChatActions.ConfigureInlineChatAction);
43-
// registerAction2(InlineChatActions.UnstashSessionAction);
44-
registerAction2(InlineChatActions.MakeRequestAction);
45-
registerAction2(InlineChatActions.StopRequestAction);
46-
registerAction2(InlineChatActions.ReRunRequestAction);
47-
registerAction2(InlineChatActions.DiscardHunkAction);
48-
registerAction2(InlineChatActions.DiscardAction);
49-
registerAction2(InlineChatActions.DiscardToClipboardAction);
50-
registerAction2(InlineChatActions.DiscardUndoToNewFileAction);
51-
registerAction2(InlineChatActions.CancelSessionAction);
5214

53-
registerAction2(InlineChatActions.ArrowOutUpAction);
54-
registerAction2(InlineChatActions.ArrowOutDownAction);
55-
registerAction2(InlineChatActions.FocusInlineChat);
56-
registerAction2(InlineChatActions.PreviousFromHistory);
57-
registerAction2(InlineChatActions.NextFromHistory);
58-
registerAction2(InlineChatActions.ViewInChatAction);
59-
registerAction2(InlineChatActions.ExpandMessageAction);
60-
registerAction2(InlineChatActions.ContractMessageAction);
15+
// quick voice
6116

62-
registerAction2(InlineChatActions.ToggleDiffForChange);
63-
registerAction2(InlineChatActions.FeebackHelpfulCommand);
64-
registerAction2(InlineChatActions.FeebackUnhelpfulCommand);
65-
registerAction2(InlineChatActions.ReportIssueForBugCommand);
66-
registerAction2(InlineChatActions.AcceptChanges);
67-
68-
registerAction2(InlineChatActions.CopyRecordings);
69-
70-
const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
71-
workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
72-
workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatAccessibleViewContribution, LifecyclePhase.Eventually);
17+
registerEditorContribution(InlineChatQuickVoice.ID, InlineChatQuickVoice, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
18+
registerAction2(StartAction);
19+
registerAction2(StopAction);
20+
registerAction2(CancelAction);

‎src/vs/workbench/workbench.common.main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ import 'vs/workbench/contrib/speech/common/speech.contribution';
182182

183183
// Chat
184184
import 'vs/workbench/contrib/chat/browser/chat.contribution';
185+
import 'vs/workbench/contrib/inlineChat/browser/inlineChat.contribution';
185186

186187
// Interactive
187188
import 'vs/workbench/contrib/interactive/browser/interactive.contribution';

0 commit comments

Comments
 (0)