From 1ba9ce403d2d5e9cec5c4e9c4aa5767c656f381c Mon Sep 17 00:00:00 2001 From: meganrogge Date: Thu, 3 Aug 2023 12:02:54 -0700 Subject: [PATCH] clean up --- extensions/javascript/syntaxes/Readme.md | 1 - .../contrib/accessibility/browser/accessibleView.ts | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions/javascript/syntaxes/Readme.md b/extensions/javascript/syntaxes/Readme.md index c12505936c8..bc29199fd73 100644 --- a/extensions/javascript/syntaxes/Readme.md +++ b/extensions/javascript/syntaxes/Readme.md @@ -8,4 +8,3 @@ The script does the following changes: - fileTypes .tsx -> .js & .jsx - scopeName scope.tsx -> scope.js - update all rule names .tsx -> .js - diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts index ff4ec3f4c3f..123a64fc0d6 100644 --- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts +++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts @@ -200,6 +200,7 @@ class AccessibleView extends Disposable { break; case 'list': label = token.items?.map(i => i.text).join(', '); + break; } if (label) { symbols.push({ label, ariaLabel: localize('symbolLabel', "{0} {1}", token.type, label), iconClass: token.type }); @@ -209,8 +210,8 @@ class AccessibleView extends Disposable { } showSymbol(provider: IAccessibleContentProvider, symbol: IAccessibleViewSymbol): void { - const index = provider.provideContent().split('\n').findIndex(line => line.includes(symbol.label.split('\n')[0])); - if (index >= 0) { + const index = provider.provideContent().split('\n').findIndex(line => line.includes(symbol.label.split('\n')[0])) ?? -1; + if (index) { this.show(provider); this._editorWidget.revealLine(index + 1); this._editorWidget.setSelection({ startLineNumber: index + 1, startColumn: 1, endLineNumber: index + 1, endColumn: 1 }); @@ -472,6 +473,9 @@ class AccessibleViewSymbolQuickPick { } show(provider: IAccessibleContentProvider): void { + if (provider.options.language !== 'markdown') { + return; + } const quickPick = this._quickInputService.createQuickPick(); const picks = []; const symbols = this._accessibleView.getSymbols();