From 963d364269e34f5332100fec1c598f7a65158106 Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 18 Jun 2018 16:24:39 +0200 Subject: [PATCH] fixes #52198 --- .../parts/debug/electron-browser/callStackView.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts index 36a064b1969..8b626653218 100644 --- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts @@ -27,6 +27,8 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet'; +import { getPathLabel } from 'vs/base/common/labels'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; const $ = dom.$; @@ -397,6 +399,7 @@ class CallStackRenderer implements IRenderer { constructor( @IWorkspaceContextService private contextService: IWorkspaceContextService, + @IEnvironmentService private environmentService: IEnvironmentService ) { // noop } @@ -476,7 +479,7 @@ class CallStackRenderer implements IRenderer { } else if (templateId === CallStackRenderer.ERROR_TEMPLATE_ID) { this.renderError(element, templateData); } else if (templateId === CallStackRenderer.LOAD_MORE_TEMPLATE_ID) { - this.renderLoadMore(element, templateData); + this.renderLoadMore(templateData); } } @@ -506,7 +509,7 @@ class CallStackRenderer implements IRenderer { data.label.title = element; } - private renderLoadMore(element: any, data: ILoadMoreTemplateData): void { + private renderLoadMore(data: ILoadMoreTemplateData): void { data.label.textContent = nls.localize('loadMoreStackFrames', "Load More Stack Frames"); } @@ -515,7 +518,8 @@ class CallStackRenderer implements IRenderer { dom.toggleClass(data.stackFrame, 'label', stackFrame.presentationHint === 'label'); dom.toggleClass(data.stackFrame, 'subtle', stackFrame.presentationHint === 'subtle'); - data.file.title = stackFrame.source.raw.path || stackFrame.source.name; + const path = stackFrame.source.raw.path || stackFrame.source.name; + data.file.title = getPathLabel(path, this.environmentService); if (stackFrame.source.raw.origin) { data.file.title += `\n${stackFrame.source.raw.origin}`; } -- GitLab