From 689e1ca7d01d86feeab3026d3f3ebac35eb45ec8 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 15 Mar 2019 16:25:13 +0100 Subject: [PATCH] add 'callHierarchy.mode' setting with 'tree' or 'columns' --- .../browser/callHierarchy.contribution.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts index 8b7a4a51bee..f2cc2b8018d 100644 --- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts +++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts @@ -12,8 +12,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { CallHierarchyTreePeekWidget, CallHierarchyColumnPeekWidget } from 'vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek'; import { Range } from 'vs/editor/common/core/range'; import { Event } from 'vs/base/common/event'; - -const tree = true; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; registerAction({ id: 'editor.showCallHierarchy', @@ -28,6 +27,7 @@ registerAction({ const instaService = accessor.get(IInstantiationService); const editorService = accessor.get(ICodeEditorService); + const configService = accessor.get(IConfigurationService); const editor = editorService.getActiveCodeEditor(); if (!editor || !editor.hasModel()) { @@ -47,11 +47,12 @@ registerAction({ return; } + let mode = configService.getValue<'tree' | 'columns'>('callHierarchy.mode'); let widget: CallHierarchyTreePeekWidget | CallHierarchyColumnPeekWidget; - if (tree) { - widget = instaService.createInstance(CallHierarchyTreePeekWidget, editor, provider, CallHierarchyDirection.CallsTo, rootItem); - } else { + if (mode === 'columns') { widget = instaService.createInstance(CallHierarchyColumnPeekWidget, editor, provider, CallHierarchyDirection.CallsTo, rootItem); + } else { + widget = instaService.createInstance(CallHierarchyTreePeekWidget, editor, provider, CallHierarchyDirection.CallsTo, rootItem); } const listener = Event.any(editor.onDidChangeModel, editor.onDidChangeModelLanguage)(_ => widget.dispose());