Skip to content

Folded cells run-in-section #205315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 28, 2024
Merged

Folded cells run-in-section #205315

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33225eb
initial functionality, needs css tweaks
Yoyokrazy Feb 15, 2024
ba3de05
Merge branch 'main' into milively/run-in-fold
Yoyokrazy Feb 26, 2024
e225714
update button css + add executing spinner
Yoyokrazy Feb 26, 2024
55ef12e
mutable disposable to avoid leaking listeners
Yoyokrazy Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/vs/workbench/contrib/notebook/browser/media/notebookFolding.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
.monaco-workbench .notebookOverlay > .cell-list-container .notebook-folded-hint {
position: absolute;
user-select: none;
display: flex;
align-items: center;
}

.monaco-workbench .notebookOverlay > .cell-list-container .notebook-folded-hint-label {
Expand All @@ -55,6 +57,22 @@
opacity: 0.7;
}

.monaco-workbench .notebookOverlay > .cell-list-container .folded-cell-run-section-button {
position: relative;
left: 0px;
padding: 2px;
border-radius: 5px;
margin-right: 4px;
height: 16px;
width: 16px;
z-index: var(--z-index-notebook-cell-expand-part-button);
}

.monaco-workbench .notebookOverlay > .cell-list-container .folded-cell-run-section-button:hover {
background-color: var(--vscode-editorStickyScrollHover-background);
cursor: pointer;
}

.monaco-workbench .notebookOverlay .cell-editor-container .monaco-editor .margin-view-overlays .codicon-folding-expanded,
.monaco-workbench .notebookOverlay .cell-editor-container .monaco-editor .margin-view-overlays .codicon-folding-collapsed {
margin-left: 0;
Expand Down
42 changes: 41 additions & 1 deletion src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,17 @@ import { FoldingController } from 'vs/workbench/contrib/notebook/browser/control
import { CellEditState, CellFoldingState, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
import { executingStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
import { NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';

export class FoldedCellHint extends CellContentPart {

constructor(
private readonly _notebookEditor: INotebookEditor,
private readonly _container: HTMLElement,
@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService
) {
super();
}
Expand All @@ -35,7 +40,8 @@ export class FoldedCellHint extends CellContentPart {
} else if (element.foldingState === CellFoldingState.Collapsed) {
const idx = this._notebookEditor.getViewModel().getCellIndex(element);
const length = this._notebookEditor.getViewModel().getFoldedLength(idx);
DOM.reset(this._container, this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));

DOM.reset(this._container, this.getRunFoldedSectionButton({ start: idx, end: idx + length }), this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
DOM.show(this._container);

const foldHintTop = element.layoutInfo.previewHeight;
Expand Down Expand Up @@ -67,6 +73,40 @@ export class FoldedCellHint extends CellContentPart {
return expandIcon;
}

private getRunFoldedSectionButton(range: ICellRange): HTMLElement {
const runAllContainer = DOM.$('span.folded-cell-run-section-button');
const cells = this._notebookEditor.getCellsInRange(range);

const isRunning = cells.some(cell => {
const cellExecution = this._notebookExecutionStateService.getCellExecution(cell.uri);
return cellExecution && cellExecution.state === NotebookCellExecutionState.Executing;
});

const runAllIcon = isRunning ?
ThemeIcon.modify(executingStateIcon, 'spin') :
Codicon.play;
runAllContainer.classList.add(...ThemeIcon.asClassNameArray(runAllIcon));

this._register(DOM.addDisposableListener(runAllContainer, DOM.EventType.CLICK, () => {
this._notebookEditor.executeNotebookCells(cells);
}));

this._register(this._notebookExecutionStateService.onDidChangeExecution(() => {
const isRunning = cells.some(cell => {
const cellExecution = this._notebookExecutionStateService.getCellExecution(cell.uri);
return cellExecution && cellExecution.state === NotebookCellExecutionState.Executing;
});

const runAllIcon = isRunning ?
ThemeIcon.modify(executingStateIcon, 'spin') :
Codicon.play;
runAllContainer.className = '';
runAllContainer.classList.add('folded-cell-run-section-button', ...ThemeIcon.asClassNameArray(runAllIcon));
}));

return runAllContainer;
}

override updateInternalLayoutNow(element: MarkupCellViewModel) {
this.update(element);
}
Expand Down
7 changes: 6 additions & 1 deletion src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewMod
import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel';
import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';

const $ = DOM.$;

Expand Down Expand Up @@ -109,6 +110,8 @@ abstract class AbstractCellRenderer {
export class MarkupCellRenderer extends AbstractCellRenderer implements IListRenderer<MarkupCellViewModel, MarkdownCellRenderTemplate> {
static readonly TEMPLATE_ID = 'markdown_cell';

private _notebookExecutionStateService: INotebookExecutionStateService;

constructor(
notebookEditor: INotebookEditorDelegate,
dndController: CellDragAndDropController,
Expand All @@ -120,8 +123,10 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
@IMenuService menuService: IMenuService,
@IKeybindingService keybindingService: IKeybindingService,
@INotificationService notificationService: INotificationService,
@INotebookExecutionStateService notebookExecutionStateService: INotebookExecutionStateService
) {
super(instantiationService, notebookEditor, contextMenuService, menuService, configurationService, keybindingService, notificationService, contextKeyServiceProvider, 'markdown', dndController);
this._notebookExecutionStateService = notebookExecutionStateService;
}

get templateId() {
Expand Down Expand Up @@ -169,7 +174,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
templateDisposables.add(scopedInstaService.createInstance(CellChatPart, this.notebookEditor, cellChatPart)),
templateDisposables.add(scopedInstaService.createInstance(CellEditorStatusBar, this.notebookEditor, container, editorPart, undefined)),
templateDisposables.add(new CellFocusIndicator(this.notebookEditor, titleToolbar, focusIndicatorTop, focusIndicatorLeft, focusIndicatorRight, focusIndicatorBottom)),
templateDisposables.add(new FoldedCellHint(this.notebookEditor, DOM.append(container, $('.notebook-folded-hint')))),
templateDisposables.add(new FoldedCellHint(this.notebookEditor, DOM.append(container, $('.notebook-folded-hint')), this._notebookExecutionStateService)),
templateDisposables.add(new CellDecorations(rootContainer, decorationContainer)),
templateDisposables.add(scopedInstaService.createInstance(CellComments, this.notebookEditor, cellCommentPartContainer)),
templateDisposables.add(new CollapsedCellInput(this.notebookEditor, cellInputCollapsedContainer)),
Expand Down