fix microsoft#107763.

rebornix · rebornix · commit 0fc9b2574605 · 2020-09-30T16:40:37.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts b/src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts
@@ -223,6 +223,9 @@ registerAction2(class extends Action2 {
 			} else {
 				controller.setFoldingStateDown(index, CellFoldingState.Collapsed, levels);
 			}
+
+			const viewIndex = editor.viewModel!.getNearestVisibleCellIndexUpwards(index);
+			editor.selectElement(editor.viewModel!.viewCells[viewIndex]);
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
@@ -460,6 +460,30 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 		return this._viewCells.indexOf(cell as CellViewModel);
 	}
 
+	/**
+	 * If this._viewCells[index] is visible then return index
+	 */
+	getNearestVisibleCellIndexUpwards(index: number) {
+		for (let i = this._hiddenRanges.length - 1; i >= 0; i--) {
+			const cellRange = this._hiddenRanges[i];
+			const foldStart = cellRange.start - 1;
+			const foldEnd = cellRange.end;
+
+			if (foldStart > index) {
+				continue;
+			}
+
+			if (foldStart <= index && foldEnd >= index) {
+				return index;
+			}
+
+			// foldStart <= index, foldEnd < index
+			break;
+		}
+
+		return index;
+	}
+
 	getNextVisibleCellIndex(index: number) {
 		for (let i = 0; i < this._hiddenRanges.length; i++) {
 			const cellRange = this._hiddenRanges[i];

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,9 @@ registerAction2(class extends Action2 {`
`223`	`223`	`} else {`
`224`	`224`	`controller.setFoldingStateDown(index, CellFoldingState.Collapsed, levels);`
`225`	`225`	`}`
	`226`	`+`
	`227`	`+ const viewIndex = editor.viewModel!.getNearestVisibleCellIndexUpwards(index);`
	`228`	`+ editor.selectElement(editor.viewModel!.viewCells[viewIndex]);`
`226`	`229`	`}`
`227`	`230`	`}`
`228`	`231`	`});`