From b58957e67ee1e712cebf466b995adf4c5307b2bd Mon Sep 17 00:00:00 2001 From: Michael Lively Date: Tue, 30 Apr 2024 18:08:03 -0700 Subject: [PATCH] Improve readability/quality of #211741 (#211758) readability improvements --- .../contrib/outline/notebookOutline.ts | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts index 9374cc3661c16..8a88e4f352e28 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts @@ -301,22 +301,21 @@ class NotebookQuickPickProvider implements IQuickPickDataSource { const { hasFileIcons } = this._themeService.getFileIconTheme(); const showSymbols = this._configurationService.getValue(NotebookSetting.gotoSymbolsAllSymbols); + const isSymbol = (element: OutlineEntry) => !!element.symbolKind; + const isCodeCell = (element: OutlineEntry) => (element.cell.cellKind === CellKind.Code && element.level === NotebookOutlineConstants.NonHeaderOutlineLevel); // code cell entries are exactly level 7 by this constant for (let i = 0; i < bucket.length; i++) { const element = bucket[i]; - const nextElement = bucket[i + 1]; - - // this logic controls the following for code cells entries in quick pick: - if (element.cell.cellKind === CellKind.Code) { - // if we are showing all symbols, and - // - the next entry is a symbol, we DO NOT include the code cell entry (ie continue) - // - the next entry is not a symbol, we DO include the code cell entry (ie push as normal in the loop) - if (showSymbols && element.level === NotebookOutlineConstants.NonHeaderOutlineLevel && (nextElement?.level > NotebookOutlineConstants.NonHeaderOutlineLevel)) { - continue; - } - // if we are not showing all symbols, skip all entries with level > NonHeaderOutlineLevel (ie 8+) - else if (!showSymbols && element.level > NotebookOutlineConstants.NonHeaderOutlineLevel) { - continue; - } + const nextElement = bucket[i + 1]; // can be undefined + + if (!showSymbols + && isSymbol(element)) { + continue; + } + + if (showSymbols + && isCodeCell(element) + && nextElement && isSymbol(nextElement)) { + continue; } const useFileIcon = hasFileIcons && !element.symbolKind;