Skip to content

Commit b7c66c0

Browse files
committed
help menu fixes/polish
1 parent b92985d commit b7c66c0

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class AccessibilityHelpProvider extends Disposable implements IAccessibleContent
5959
provideContent(): string {
6060
const options = this._editor.getOptions();
6161
const content = [];
62-
content.push(AccessibilityHelpNLS.accessibilityHelpTitle);
6362

6463
if (options.get(EditorOption.inDiffEditor)) {
6564
if (options.get(EditorOption.readOnly)) {
@@ -105,7 +104,7 @@ class EditorAccessibilityHelpContribution extends Disposable {
105104
static ID: 'editorAccessibilityHelpContribution';
106105
constructor() {
107106
super();
108-
this._register(AccessibilityHelpAction.addImplementation(100, 'editor', async accessor => {
107+
this._register(AccessibilityHelpAction.addImplementation(95, 'editor', async accessor => {
109108
const codeEditorService = accessor.get(ICodeEditorService);
110109
const accessibleViewService = accessor.get(IAccessibleViewService);
111110
const instantiationService = accessor.get(IInstantiationService);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
88
import { Disposable } from 'vs/base/common/lifecycle';
99
import { ThemeIcon } from 'vs/base/common/themables';
1010
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
11-
import { EditorAction, EditorAction2, EditorContributionInstantiation, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
11+
import { EditorAction, EditorAction2, ServicesAccessor, registerEditorAction } from 'vs/editor/browser/editorExtensions';
1212
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
13+
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
1314
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
1415
import { localize } from 'vs/nls';
1516
import { Action2, IAction2Options, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
@@ -27,6 +28,8 @@ import { CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_PROVIDER_EXISTS
2728
import { IChatDetail, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
2829
import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
2930
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
31+
import { Registry } from 'vs/platform/registry/common/platform';
32+
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
3033

3134
export const CHAT_CATEGORY = { value: localize('chat.category', "Chat"), original: 'Chat' };
3235

@@ -111,7 +114,9 @@ export function registerChatActions() {
111114
}, CONTEXT_IN_CHAT_INPUT));
112115
}
113116
}
114-
registerEditorContribution(ChatAccessibilityHelpContribution.ID, ChatAccessibilityHelpContribution, EditorContributionInstantiation.AfterFirstRender);
117+
118+
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
119+
workbenchRegistry.registerWorkbenchContribution(ChatAccessibilityHelpContribution, LifecyclePhase.Eventually);
115120

116121
registerAction2(class FocusChatInputAction extends Action2 {
117122
constructor() {

src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const presentation: IJSONSchema = {
150150
focus: {
151151
type: 'boolean',
152152
default: false,
153-
description: nls.localize('JsonSchema.tasks.presentation.focus', 'Controls whether the panel takes focus. Default is false. If set to true the panel is revealed as well.')
153+
description: nls.localize('JsonSchema.tasks.presentation.focus', 'Controls whether the panel takes focus. Default is false. If set to true the panel is revealed as well. May be overridden by option: "reveal: silent"')
154154
},
155155
revealProblems: {
156156
type: 'string',

0 commit comments

Comments
 (0)