Skip to content

Commit b607d75

Browse files
meganroggemeganrogge
committed
move things around
1 parent bbed4d1 commit b607d75

File tree

6 files changed

+44
-41
lines changed

6 files changed

+44
-41
lines changed

‎src/vs/base/common/iconLabels.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import { IMatch, matchesFuzzy } from 'vs/base/common/filters';
77
import { ltrim } from 'vs/base/common/strings';
88
import { ThemeIcon } from 'vs/base/common/themables';
9-
109
const iconStartMarker = '$(';
1110

1211
const iconsRegex = new RegExp(`\\$\\(${ThemeIcon.iconNameExpression}(?:${ThemeIcon.iconModifierExpression})?\\)`, 'g'); // no capturing groups
@@ -48,6 +47,8 @@ export function getCodiconAriaLabel(text: string | undefined) {
4847
}
4948

5049

50+
51+
5152
export interface IParsedLabelWithIcons {
5253
readonly text: string;
5354
readonly iconOffsets?: readonly number[];

‎src/vs/editor/common/languages.ts

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,39 @@ export const enum SymbolKind {
11431143
TypeParameter = 25
11441144
}
11451145

1146+
export const symbolKindNames: { [symbol: number]: string } = {
1147+
[SymbolKind.Array]: localize('Array', "array"),
1148+
[SymbolKind.Boolean]: localize('Boolean', "boolean"),
1149+
[SymbolKind.Class]: localize('Class', "class"),
1150+
[SymbolKind.Constant]: localize('Constant', "constant"),
1151+
[SymbolKind.Constructor]: localize('Constructor', "constructor"),
1152+
[SymbolKind.Enum]: localize('Enum', "enumeration"),
1153+
[SymbolKind.EnumMember]: localize('EnumMember', "enumeration member"),
1154+
[SymbolKind.Event]: localize('Event', "event"),
1155+
[SymbolKind.Field]: localize('Field', "field"),
1156+
[SymbolKind.File]: localize('File', "file"),
1157+
[SymbolKind.Function]: localize('Function', "function"),
1158+
[SymbolKind.Interface]: localize('Interface', "interface"),
1159+
[SymbolKind.Key]: localize('Key', "key"),
1160+
[SymbolKind.Method]: localize('Method', "method"),
1161+
[SymbolKind.Module]: localize('Module', "module"),
1162+
[SymbolKind.Namespace]: localize('Namespace', "namespace"),
1163+
[SymbolKind.Null]: localize('Null', "null"),
1164+
[SymbolKind.Number]: localize('Number', "number"),
1165+
[SymbolKind.Object]: localize('Object', "object"),
1166+
[SymbolKind.Operator]: localize('Operator', "operator"),
1167+
[SymbolKind.Package]: localize('Package', "package"),
1168+
[SymbolKind.Property]: localize('Property', "property"),
1169+
[SymbolKind.String]: localize('String', "string"),
1170+
[SymbolKind.Struct]: localize('Struct', "struct"),
1171+
[SymbolKind.TypeParameter]: localize('TypeParameter', "type parameter"),
1172+
[SymbolKind.Variable]: localize('Variable', "variable"),
1173+
};
1174+
1175+
export function getAriaLabelForSymbol(symbolName: string, kind: SymbolKind): string {
1176+
return localize('symbolAriaLabel', '{0} Symbol: {1}', symbolName, symbolKindNames[kind]);
1177+
}
1178+
11461179
export const enum SymbolTag {
11471180
Deprecated = 1,
11481181
}
@@ -1190,13 +1223,6 @@ export namespace SymbolKinds {
11901223
}
11911224
return icon;
11921225
}
1193-
1194-
/**
1195-
* @internal
1196-
*/
1197-
export function asAriaLabel(label: string, kind: SymbolKind): string {
1198-
return localize('symbolAriaLabel', "{0} Symbol: {1}", label, SymbolKinds.toIcon(kind).id.replaceAll('symbol-', ''));
1199-
}
12001226
}
12011227

12021228
export interface DocumentSymbol {

‎src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { format, trim } from 'vs/base/common/strings';
1414
import { IRange, Range } from 'vs/editor/common/core/range';
1515
import { ScrollType } from 'vs/editor/common/editorCommon';
1616
import { ITextModel } from 'vs/editor/common/model';
17-
import { DocumentSymbol, SymbolKind, SymbolKinds, SymbolTag } from 'vs/editor/common/languages';
17+
import { DocumentSymbol, SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol } from 'vs/editor/common/languages';
1818
import { IOutlineModelService } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
1919
import { AbstractEditorNavigationQuickAccessProvider, IEditorNavigationQuickAccessOptions, IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess';
2020
import { localize } from 'vs/nls';
@@ -316,7 +316,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
316316
kind: symbol.kind,
317317
score: symbolScore,
318318
label: symbolLabelWithIcon,
319-
ariaLabel: symbolLabel,
319+
ariaLabel: getAriaLabelForSymbol(symbol.name, symbol.kind),
320320
description: containerLabel,
321321
highlights: deprecated ? undefined : {
322322
label: symbolMatches,

‎src/vs/editor/standalone/browser/standaloneLanguages.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
778778
registerDocumentRangeSemanticTokensProvider: <any>registerDocumentRangeSemanticTokensProvider,
779779
registerInlineCompletionsProvider: <any>registerInlineCompletionsProvider,
780780
registerInlayHintsProvider: <any>registerInlayHintsProvider,
781+
getAriaLabelForSymbol: <any>languages.getAriaLabelForSymbol,
781782

782783
// enums
783784
DocumentHighlightKind: standaloneEnums.DocumentHighlightKind,

‎src/vs/monaco.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7455,6 +7455,8 @@ declare namespace monaco.languages {
74557455
TypeParameter = 25
74567456
}
74577457

7458+
export function getAriaLabelForSymbol(symbolName: string, kind: SymbolKind): string;
7459+
74587460
export enum SymbolTag {
74597461
Deprecated = 1
74607462
}

‎src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelega
1111
import { ITreeNode, ITreeRenderer, ITreeFilter } from 'vs/base/browser/ui/tree/tree';
1212
import { createMatches, FuzzyScore } from 'vs/base/common/filters';
1313
import { Range } from 'vs/editor/common/core/range';
14-
import { SymbolKind, SymbolKinds, SymbolTag } from 'vs/editor/common/languages';
14+
import { SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol, symbolKindNames } from 'vs/editor/common/languages';
1515
import { OutlineElement, OutlineGroup, OutlineModel } from 'vs/editor/contrib/documentSymbols/browser/outlineModel';
1616
import { localize } from 'vs/nls';
1717
import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
@@ -49,7 +49,7 @@ export class DocumentSymbolAccessibilityProvider implements IListAccessibilityPr
4949
if (element instanceof OutlineGroup) {
5050
return element.label;
5151
} else {
52-
return SymbolKinds.asAriaLabel(element.symbol.name, element.symbol.kind);
52+
return getAriaLabelForSymbol(element.symbol.name, element.symbol.kind);
5353
}
5454
}
5555
}
@@ -138,7 +138,7 @@ export class DocumentSymbolRenderer implements ITreeRenderer<OutlineElement, Fuz
138138
matches: createMatches(node.filterData),
139139
labelEscapeNewLines: true,
140140
extraClasses,
141-
title: localize('title.template', "{0} ({1})", element.symbol.name, DocumentSymbolRenderer._symbolKindNames[element.symbol.kind])
141+
title: localize('title.template', "{0} ({1})", element.symbol.name, symbolKindNames[element.symbol.kind])
142142
};
143143
if (this._configurationService.getValue(OutlineConfigKeys.icons)) {
144144
// add styles for the icons
@@ -195,34 +195,7 @@ export class DocumentSymbolRenderer implements ITreeRenderer<OutlineElement, Fuz
195195
}
196196
}
197197

198-
private static _symbolKindNames: { [symbol: number]: string } = {
199-
[SymbolKind.Array]: localize('Array', "array"),
200-
[SymbolKind.Boolean]: localize('Boolean', "boolean"),
201-
[SymbolKind.Class]: localize('Class', "class"),
202-
[SymbolKind.Constant]: localize('Constant', "constant"),
203-
[SymbolKind.Constructor]: localize('Constructor', "constructor"),
204-
[SymbolKind.Enum]: localize('Enum', "enumeration"),
205-
[SymbolKind.EnumMember]: localize('EnumMember', "enumeration member"),
206-
[SymbolKind.Event]: localize('Event', "event"),
207-
[SymbolKind.Field]: localize('Field', "field"),
208-
[SymbolKind.File]: localize('File', "file"),
209-
[SymbolKind.Function]: localize('Function', "function"),
210-
[SymbolKind.Interface]: localize('Interface', "interface"),
211-
[SymbolKind.Key]: localize('Key', "key"),
212-
[SymbolKind.Method]: localize('Method', "method"),
213-
[SymbolKind.Module]: localize('Module', "module"),
214-
[SymbolKind.Namespace]: localize('Namespace', "namespace"),
215-
[SymbolKind.Null]: localize('Null', "null"),
216-
[SymbolKind.Number]: localize('Number', "number"),
217-
[SymbolKind.Object]: localize('Object', "object"),
218-
[SymbolKind.Operator]: localize('Operator', "operator"),
219-
[SymbolKind.Package]: localize('Package', "package"),
220-
[SymbolKind.Property]: localize('Property', "property"),
221-
[SymbolKind.String]: localize('String', "string"),
222-
[SymbolKind.Struct]: localize('Struct', "struct"),
223-
[SymbolKind.TypeParameter]: localize('TypeParameter', "type parameter"),
224-
[SymbolKind.Variable]: localize('Variable', "variable"),
225-
};
198+
226199

227200
disposeTemplate(_template: DocumentSymbolTemplate): void {
228201
_template.iconLabel.dispose();

0 commit comments

Comments
 (0)