some 💄 and removal of conflicting keybinding, microsoft#15533

AiverReaver · Aug 19, 2021 · d6adc42 · d6adc42
1 parent 5bb4142
commit d6adc42
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts
@@ -14,7 +14,6 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { PeekContext } from 'vs/editor/contrib/peekView/peekView';
 import { localize } from 'vs/nls';
 import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
@@ -184,11 +183,6 @@ registerAction2(class extends EditorAction2 {
  PeekContext.notInPeekEditor
  ),
  },
- keybinding: {
- when: EditorContextKeys.editorTextFocus,
- weight: KeybindingWeight.WorkbenchContrib,
- primary: KeyMod.Shift + KeyMod.Alt + KeyCode.KEY_H // TODO: to specify a proper keybinding?
- },
  precondition: ContextKeyExpr.and(
  _ctxHasTypeHierarchyProvider,
  PeekContext.notInPeekEditor

diff --git a/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts b/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
@@ -26,8 +26,8 @@ export const enum TypeHierarchyDirection {
 export interface TypeHierarchyItem {
  _sessionId: string;
  _itemId: string;
- name: string;
  kind: SymbolKind;
+ name: string;
  detail?: string;
  uri: URI;
  range: IRange;