提交 6539701d 编写于 作者: S Sandeep Somavarapu

Fix #51998

上级 52280ab2
......@@ -204,7 +204,7 @@ export class MarkersPanel extends Panel {
filter: new Viewer.DataFilter(),
renderer,
controller,
accessibilityProvider: new Viewer.MarkersTreeAccessibilityProvider(),
accessibilityProvider: this.instantiationService.createInstance(Viewer.MarkersTreeAccessibilityProvider),
dnd
}, {
twistiePixels: 20,
......
......@@ -21,6 +21,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IDisposable } from 'vs/base/common/lifecycle';
import { getPathLabel } from 'vs/base/common/labels';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
interface IResourceMarkersTemplateData {
resourceLabel: ResourceLabel;
......@@ -256,9 +257,16 @@ export class Renderer implements IRenderer {
export class MarkersTreeAccessibilityProvider implements IAccessibilityProvider {
constructor(
@IWorkspaceContextService private contextService: IWorkspaceContextService,
@IEnvironmentService private environmentService: IEnvironmentService
) {
}
public getAriaLabel(tree: ITree, element: any): string {
if (element instanceof ResourceMarkers) {
return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.name, element.filteredCount);
const path = getPathLabel(element.uri, this.environmentService, this.contextService) || element.uri.fsPath;
return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.filteredCount, element.name, paths.dirname(path));
}
if (element instanceof Marker) {
return Messages.MARKERS_TREE_ARIA_LABEL_MARKER(element);
......
......@@ -45,7 +45,7 @@ export default class Messages {
public static readonly MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln: number, col: number): string => { return nls.localize('markers.panel.at.ln.col.number', "({0}, {1})", '' + ln, '' + col); };
public static readonly MARKERS_TREE_ARIA_LABEL_RESOURCE = (fileName: string, noOfProblems: number): string => { return nls.localize('problems.tree.aria.label.resource', "{0} with {1} problems", fileName, noOfProblems); };
public static readonly MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems: number, fileName: string, folder: string): string => { return nls.localize('problems.tree.aria.label.resource', "{0} problems in file {1} of folder {2}", noOfProblems, fileName, folder); };
public static readonly MARKERS_TREE_ARIA_LABEL_MARKER = (marker: Marker): string => {
const relatedInformationMessage = marker.resourceRelatedInformation.length ? nls.localize('problems.tree.aria.label.marker.relatedInformation', " This problem has references to {0} locations.", marker.resourceRelatedInformation.length) : '';
switch (marker.raw.severity) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册