maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix #100206.

Browse source
This commit is contained in:
rebornix 2020-06-24 11:54:00 -07:00
parent c487e751c3
commit 2631143bfd
2 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
View file

@ -21,7 +21,6 @@ import { WorkbenchAsyncDataTree, IListService, IWorkbenchAsyncDataTreeOptions }
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IColorMapping } from 'vs/platform/theme/common/styler';
import { basename } from 'vs/base/common/resources';
export const COMMENTS_VIEW_ID = 'workbench.panel.comments';
export const COMMENTS_VIEW_TITLE = 'Comments';
@ -182,30 +181,7 @@ export class CommentsList extends WorkbenchAsyncDataTree<any, any> {
renderers,
dataSource,
{
accessibilityProvider: {
getAriaLabel(element: any): string {
if (element instanceof CommentsModel) {
return nls.localize('rootCommentsLabel', "Comments for current workspace");
}
if (element instanceof ResourceWithCommentThreads) {
return nls.localize('resourceWithCommentThreadsLabel', "Comments in {0}, full path {1}", basename(element.resource), element.resource.fsPath);
}
if (element instanceof CommentNode) {
return nls.localize('resourceWithCommentLabel',
"Comment from ${0} at line {1} column {2} in {3}, source: {4}",
element.comment.userName,
element.range.startLineNumber,
element.range.startColumn,
basename(element.resource),
element.comment.body.value
);
}
return '';
},
getWidgetAriaLabel(): string {
return COMMENTS_VIEW_TITLE;
}
},
accessibilityProvider: options.accessibilityProvider,
keyboardSupport: true,
identityProvider: {
getId: (element: any) => {

27
src/vs/workbench/contrib/comments/browser/commentsView.ts
View file

@ -6,6 +6,7 @@
import 'vs/css!./media/panel';
import * as nls from 'vs/nls';
import * as dom from 'vs/base/browser/dom';
import { basename } from 'vs/base/common/resources';
import { IAction, Action } from 'vs/base/common/actions';
import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults';
import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
@ -151,9 +152,29 @@ export class CommentsPanel extends ViewPane {
this.tree = this._register(this.instantiationService.createInstance(CommentsList, this.treeLabels, this.treeContainer, {
overrideStyles: { listBackground: this.getBackgroundColor() },
openOnFocus: true,
accessibilityProvider: { // TODO@rebornix implement a proper accessibility provider
getAriaLabel(element: any): string | null { return null; },
getWidgetAriaLabel(): string { return 'Comments'; }
accessibilityProvider: {
getAriaLabel(element: any): string {
if (element instanceof CommentsModel) {
return nls.localize('rootCommentsLabel', "Comments for current workspace");
}
if (element instanceof ResourceWithCommentThreads) {
return nls.localize('resourceWithCommentThreadsLabel', "Comments in {0}, full path {1}", basename(element.resource), element.resource.fsPath);
}
if (element instanceof CommentNode) {
return nls.localize('resourceWithCommentLabel',
"Comment from ${0} at line {1} column {2} in {3}, source: {4}",
element.comment.userName,
element.range.startLineNumber,
element.range.startColumn,
basename(element.resource),
element.comment.body.value
);
}
return '';
},
getWidgetAriaLabel(): string {
return COMMENTS_VIEW_TITLE;
}
}
}));