mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
debug: adopt uri display service
This commit is contained in:
parent
db9ce80baf
commit
c99654e046
|
@ -16,7 +16,7 @@ import { ltrim } from 'vs/base/common/strings';
|
|||
|
||||
export interface IUriDisplayService {
|
||||
_serviceBrand: any;
|
||||
getLabel(resource: URI, relative: boolean): string;
|
||||
getLabel(resource: URI, relative?: boolean): string;
|
||||
registerFormater(schema: string, formater: UriDisplayRules): IDisposable;
|
||||
}
|
||||
|
||||
|
|
|
@ -16,11 +16,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
|
|||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { Constants } from 'vs/editor/common/core/uint';
|
||||
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
|
||||
import { getPathLabel } from 'vs/base/common/labels';
|
||||
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { basename } from 'vs/base/common/paths';
|
||||
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
|
||||
import { IVirtualDelegate, IListContextMenuEvent, IRenderer } from 'vs/base/browser/ui/list/list';
|
||||
|
@ -36,6 +32,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
|
|||
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
|
||||
import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
|
||||
import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
|
||||
import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
|
||||
|
||||
const $ = dom.$;
|
||||
|
||||
|
@ -287,8 +284,7 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
|
|||
|
||||
constructor(
|
||||
@IDebugService private debugService: IDebugService,
|
||||
@IWorkspaceContextService private contextService: IWorkspaceContextService,
|
||||
@IEnvironmentService private environmentService: IEnvironmentService,
|
||||
@IUriDisplayService private uriDisplayService: IUriDisplayService,
|
||||
@ITextFileService private textFileService: ITextFileService
|
||||
) {
|
||||
// noop
|
||||
|
@ -327,12 +323,12 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
|
|||
data.context = breakpoint;
|
||||
dom.toggleClass(data.breakpoint, 'disabled', !this.debugService.getModel().areBreakpointsActivated());
|
||||
|
||||
data.name.textContent = basename(getPathLabel(breakpoint.uri, this.environmentService, this.contextService));
|
||||
data.name.textContent = resources.basenameOrAuthority(breakpoint.uri);
|
||||
data.lineNumber.textContent = breakpoint.lineNumber.toString();
|
||||
if (breakpoint.column) {
|
||||
data.lineNumber.textContent += `:${breakpoint.column}`;
|
||||
}
|
||||
data.filePath.textContent = getPathLabel(resources.dirname(breakpoint.uri), this.environmentService, this.contextService);
|
||||
data.filePath.textContent = this.uriDisplayService.getLabel(resources.dirname(breakpoint.uri), true);
|
||||
data.checkbox.checked = breakpoint.enabled;
|
||||
|
||||
const { message, className } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
|
||||
|
|
|
@ -27,8 +27,7 @@ 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';
|
||||
import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
|
||||
|
||||
const $ = dom.$;
|
||||
|
||||
|
@ -399,7 +398,7 @@ class CallStackRenderer implements IRenderer {
|
|||
|
||||
constructor(
|
||||
@IWorkspaceContextService private contextService: IWorkspaceContextService,
|
||||
@IEnvironmentService private environmentService: IEnvironmentService
|
||||
@IUriDisplayService private uriDisplayService: IUriDisplayService
|
||||
) {
|
||||
// noop
|
||||
}
|
||||
|
@ -518,8 +517,7 @@ class CallStackRenderer implements IRenderer {
|
|||
dom.toggleClass(data.stackFrame, 'label', stackFrame.presentationHint === 'label');
|
||||
dom.toggleClass(data.stackFrame, 'subtle', stackFrame.presentationHint === 'subtle');
|
||||
|
||||
const path = stackFrame.source.raw.path || stackFrame.source.name;
|
||||
data.file.title = getPathLabel(path, this.environmentService);
|
||||
data.file.title = stackFrame.source.inMemory ? stackFrame.source.name : this.uriDisplayService.getLabel(stackFrame.source.uri);
|
||||
if (stackFrame.source.raw.origin) {
|
||||
data.file.title += `\n${stackFrame.source.raw.origin}`;
|
||||
}
|
||||
|
|
|
@ -24,8 +24,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
|
|||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||
import { LinkDetector } from 'vs/workbench/parts/debug/browser/linkDetector';
|
||||
import { handleANSIOutput } from 'vs/workbench/parts/debug/browser/debugANSIHandling';
|
||||
import { getPathLabel } from 'vs/base/common/labels';
|
||||
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
|
||||
|
||||
const $ = dom.$;
|
||||
|
||||
|
@ -98,7 +97,7 @@ export class ReplExpressionsRenderer implements IRenderer {
|
|||
constructor(
|
||||
@IEditorService private editorService: IEditorService,
|
||||
@IInstantiationService private instantiationService: IInstantiationService,
|
||||
@IEnvironmentService private environmentService: IEnvironmentService
|
||||
@IUriDisplayService private uriDisplayService: IUriDisplayService
|
||||
) {
|
||||
this.linkDetector = this.instantiationService.createInstance(LinkDetector);
|
||||
}
|
||||
|
@ -261,7 +260,7 @@ export class ReplExpressionsRenderer implements IRenderer {
|
|||
|
||||
dom.addClass(templateData.value, (element.severity === severity.Warning) ? 'warn' : (element.severity === severity.Error) ? 'error' : (element.severity === severity.Ignore) ? 'ignore' : 'info');
|
||||
templateData.source.textContent = element.sourceData ? `${element.sourceData.source.name}:${element.sourceData.lineNumber}` : '';
|
||||
templateData.source.title = element.sourceData ? getPathLabel(element.sourceData.source.uri, this.environmentService) : '';
|
||||
templateData.source.title = element.sourceData ? this.uriDisplayService.getLabel(element.sourceData.source.uri) : '';
|
||||
templateData.getReplElementSource = () => element.sourceData;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue