Rebase against the upstream dd4c9da

vscode-upstream-sha1: dd4c9da
che-incubator · Aug 7, 2023 · 5ab3b5a · 5ab3b5a
2 parents 649ecbe + dd4c9da
commit 5ab3b5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/code/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/code/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -34,6 +34,7 @@ import { CompletionItem, Context as SuggestContext, suggestWidgetStatusbarMenu }
 import { canExpandCompletionItem, SuggestDetailsOverlay, SuggestDetailsWidget } from './suggestWidgetDetails';
 import { getAriaId, ItemRenderer } from './suggestWidgetRenderer';
 import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
+import { status } from 'vs/base/browser/ui/aria/aria';
 
 /**
  * Suggest widget colors
@@ -463,6 +464,7 @@ export class SuggestWidget implements IDisposable {
 				this._details.hide();
 				this._show();
 				this._focusedItem = undefined;
+				status(SuggestWidget.LOADING_MESSAGE);
 				break;
 			case State.Empty:
 				this.element.domNode.classList.add('message');
@@ -472,6 +474,7 @@ export class SuggestWidget implements IDisposable {
 				this._details.hide();
 				this._show();
 				this._focusedItem = undefined;
+				status(SuggestWidget.NO_SUGGESTIONS_MESSAGE);
 				break;
 			case State.Open:
 				dom.hide(this._messageElement);

diff --git a/code/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts b/code/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
@@ -174,7 +174,7 @@ class CallHierarchyController implements IEditorContribution {
 
 registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, EditorContributionInstantiation.Eager); // eager because it needs to define a context key
 
-registerAction2(class extends EditorAction2 {
+registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
 
 	constructor() {
 		super({
@@ -197,7 +197,8 @@ registerAction2(class extends EditorAction2 {
 			precondition: ContextKeyExpr.and(
 				_ctxHasCallHierarchyProvider,
 				PeekContext.notInPeekEditor
-			)
+			),
+			f1: true
 		});
 	}
 

diff --git a/code/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts b/code/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts
@@ -172,7 +172,7 @@ class TypeHierarchyController implements IEditorContribution {
 registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, EditorContributionInstantiation.Eager); // eager because it needs to define a context key
 
 // Peek
-registerAction2(class extends EditorAction2 {
+registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
 
 	constructor() {
 		super({
@@ -190,7 +190,8 @@ registerAction2(class extends EditorAction2 {
 			precondition: ContextKeyExpr.and(
 				_ctxHasTypeHierarchyProvider,
 				PeekContext.notInPeekEditor
-			)
+			),
+			f1: true
 		});
 	}