development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 02:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split markdown cell template from code cell template

Browse source
This commit is contained in:
Rob Lourens 2020-03-29 12:38:45 -07:00
parent 3349b15e84
commit e0685110a2
5 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/contrib/notebook/browser/contrib/notebookActions.ts
View file

@ -12,7 +12,7 @@ import { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext } fro
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { COPY_CELL_DOWN_COMMAND_ID, COPY_CELL_UP_COMMAND_ID, DELETE_CELL_COMMAND_ID, EDIT_CELL_COMMAND_ID, EXECUTE_CELL_COMMAND_ID, INSERT_CODE_CELL_ABOVE_COMMAND_ID, INSERT_CODE_CELL_BELOW_COMMAND_ID, INSERT_MARKDOWN_CELL_ABOVE_COMMAND_ID, INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID, MOVE_CELL_DOWN_COMMAND_ID, MOVE_CELL_UP_COMMAND_ID, SAVE_CELL_COMMAND_ID, NOTEBOOK_CELL_TYPE_CONTEXT_KEY, NOTEBOOK_EDITABLE_CONTEXT_KEY, NOTEBOOK_CELL_EDITABLE_CONTEXT_KEY, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE_CONTEXT_KEY } from 'vs/workbench/contrib/notebook/browser/constants';
import { CellRenderTemplate, CellEditState, ICellViewModel, INotebookEditor, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, CellRunState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { BaseCellRenderTemplate, CellEditState, ICellViewModel, INotebookEditor, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, CellRunState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { INotebookService } from 'vs/workbench/contrib/notebook/browser/notebookService';
import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@ -389,7 +389,7 @@ async function changeActiveCellToKind(kind: CellKind, accessor: ServicesAccessor
}
export interface INotebookCellActionContext {
cellTemplate?: CellRenderTemplate;
cellTemplate?: BaseCellRenderTemplate;
cell: ICellViewModel;
notebookEditor: INotebookEditor;
}

27
src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
View file

@ -243,21 +243,26 @@ export interface INotebookEditor {
hideFind(): void;
}
export interface CellRenderTemplate {
export interface BaseCellRenderTemplate {
container: HTMLElement;
cellContainer: HTMLElement;
editorContainer?: HTMLElement;
toolbar: ToolBar;
focusIndicator?: HTMLElement;
runToolbar?: ToolBar;
runButtonContainer?: HTMLElement;
executionOrderLabel?: HTMLElement;
editingContainer?: HTMLElement;
outputContainer?: HTMLElement;
editor?: CodeEditorWidget;
progressBar?: ProgressBar;
focusIndicator: HTMLElement;
disposables: DisposableStore;
toJSON(): void;
}
export interface MarkdownCellRenderTemplate extends BaseCellRenderTemplate {
editingContainer: HTMLElement;
}
export interface CodeCellRenderTemplate extends BaseCellRenderTemplate {
editorContainer: HTMLElement;
runToolbar: ToolBar;
runButtonContainer: HTMLElement;
executionOrderLabel: HTMLElement;
outputContainer: HTMLElement;
editor: CodeEditorWidget;
progressBar: ProgressBar;
}
export interface IOutputTransformContribution {

53
src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
View file

@ -24,9 +24,9 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { EDITOR_BOTTOM_PADDING, EDITOR_TOOLBAR_HEIGHT, EDITOR_TOP_PADDING, NOTEBOOK_CELL_EDITABLE_CONTEXT_KEY, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE_CONTEXT_KEY, NOTEBOOK_CELL_TYPE_CONTEXT_KEY, EDITOR_TOP_MARGIN } from 'vs/workbench/contrib/notebook/browser/constants';
import { EDITOR_BOTTOM_PADDING, EDITOR_TOOLBAR_HEIGHT, EDITOR_TOP_MARGIN, EDITOR_TOP_PADDING, NOTEBOOK_CELL_EDITABLE_CONTEXT_KEY, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE_CONTEXT_KEY, NOTEBOOK_CELL_TYPE_CONTEXT_KEY } from 'vs/workbench/contrib/notebook/browser/constants';
import { ExecuteCellAction, INotebookCellActionContext } from 'vs/workbench/contrib/notebook/browser/contrib/notebookActions';
import { CellEditState, CellRenderTemplate, CellRunState, ICellViewModel, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { BaseCellRenderTemplate, CellEditState, CellRunState, CodeCellRenderTemplate, ICellViewModel, INotebookEditor, MarkdownCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { CellMenus } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellMenus';
import { CodeCell } from 'vs/workbench/contrib/notebook/browser/view/renderers/codeCell';
import { StatefullMarkdownCell } from 'vs/workbench/contrib/notebook/browser/view/renderers/markdownCell';
@ -131,7 +131,7 @@ abstract class AbstractCellRenderer {
return actions;
}
protected setupCellToolbarActions(scopedContextKeyService: IContextKeyService, templateData: CellRenderTemplate, disposables: DisposableStore): void {
protected setupCellToolbarActions(scopedContextKeyService: IContextKeyService, templateData: BaseCellRenderTemplate, disposables: DisposableStore): void {
const cellMenu = this.instantiationService.createInstance(CellMenus);
const menu = disposables.add(cellMenu.getCellTitleMenu(scopedContextKeyService));
@ -156,7 +156,7 @@ abstract class AbstractCellRenderer {
}
}
export class MarkdownCellRenderer extends AbstractCellRenderer implements IListRenderer<MarkdownCellViewModel, CellRenderTemplate> {
export class MarkdownCellRenderer extends AbstractCellRenderer implements IListRenderer<MarkdownCellViewModel, MarkdownCellRenderTemplate> {
static readonly TEMPLATE_ID = 'markdown_cell';
private disposables: Map<ICellViewModel, DisposableStore> = new Map();
@ -176,11 +176,11 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
return MarkdownCellRenderer.TEMPLATE_ID;
}
renderTemplate(container: HTMLElement): CellRenderTemplate {
renderTemplate(container: HTMLElement): MarkdownCellRenderTemplate {
const codeInnerContent = document.createElement('div');
DOM.addClasses(codeInnerContent, 'cell', 'code');
const editorContainer = DOM.append(codeInnerContent, $('.markdown-editor-container'));
editorContainer.style.display = 'none';
const editingContainer = DOM.append(codeInnerContent, $('.markdown-editor-container'));
editingContainer.style.display = 'none';
const disposables = new DisposableStore();
const toolbar = this.createToolbar(container);
@ -195,17 +195,16 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
const focusIndicator = DOM.append(container, DOM.$('.notebook-cell-focus-indicator'));
return {
container: container,
container,
cellContainer: innerContent,
editingContainer: editorContainer,
editingContainer,
focusIndicator,
disposables,
toolbar,
toJSON: () => { return {}; }
};
}
renderElement(element: MarkdownCellViewModel, index: number, templateData: CellRenderTemplate, height: number | undefined): void {
renderElement(element: MarkdownCellViewModel, index: number, templateData: MarkdownCellRenderTemplate, height: number | undefined): void {
templateData.editingContainer!.style.display = 'none';
templateData.cellContainer.innerHTML = '';
let renderedHTML = element.getHTML();
@ -237,26 +236,25 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
this.setupCellToolbarActions(contextKeyService, templateData, elementDisposable);
}
templateData.toolbar!.context = <INotebookCellActionContext>{
templateData.toolbar.context = <INotebookCellActionContext>{
cell: element,
notebookEditor: this.notebookEditor,
$mid: 12
};
}
disposeTemplate(templateData: CellRenderTemplate): void {
// throw nerendererw Error('Method not implemented.');
disposeTemplate(templateData: MarkdownCellRenderTemplate): void {
templateData.disposables.clear();
}
disposeElement(element: ICellViewModel, index: number, templateData: CellRenderTemplate, height: number | undefined): void {
disposeElement(element: ICellViewModel, index: number, templateData: MarkdownCellRenderTemplate, height: number | undefined): void {
if (height) {
this.disposables.get(element)?.clear();
}
}
}
export class CodeCellRenderer extends AbstractCellRenderer implements IListRenderer<CodeCellViewModel, CellRenderTemplate> {
export class CodeCellRenderer extends AbstractCellRenderer implements IListRenderer<CodeCellViewModel, CodeCellRenderTemplate> {
static readonly TEMPLATE_ID = 'code_cell';
private disposables: Map<ICellViewModel, DisposableStore> = new Map();
@ -277,7 +275,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
return CodeCellRenderer.TEMPLATE_ID;
}
renderTemplate(container: HTMLElement): CellRenderTemplate {
renderTemplate(container: HTMLElement): CodeCellRenderTemplate {
const disposables = new DisposableStore();
const toolbar = this.createToolbar(container);
disposables.add(toolbar);
@ -324,18 +322,15 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
outputContainer,
editor,
disposables,
toJSON: () => { return {}; }
};
}
renderElement(element: CodeCellViewModel, index: number, templateData: CellRenderTemplate, height: number | undefined): void {
renderElement(element: CodeCellViewModel, index: number, templateData: CodeCellRenderTemplate, height: number | undefined): void {
if (height === undefined) {
return;
}
if (templateData.outputContainer) {
templateData.outputContainer!.innerHTML = '';
}
templateData.outputContainer.innerHTML = '';
this.disposables.get(element)?.clear();
if (!this.disposables.has(element)) {
@ -348,7 +343,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
this.renderedEditors.set(element, templateData.editor);
elementDisposable.add(element.onDidChangeLayout(() => {
templateData.focusIndicator!.style.height = `${element.layoutInfo.indicatorHeight}px`;
templateData.focusIndicator.style.height = `${element.layoutInfo.indicatorHeight}px`;
}));
elementDisposable.add(element.onDidChangeCellRunState(() => {
@ -362,7 +357,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
function renderExecutionOrder() {
const executionOrdeerLabel = typeof element.metadata?.executionOrder === 'number' ? `[ ${element.metadata.executionOrder} ]` :
'[ ]';
templateData.executionOrderLabel!.innerText = executionOrdeerLabel;
templateData.executionOrderLabel.innerText = executionOrdeerLabel;
}
const contextKeyService = this.contextKeyService.createScoped(templateData.container);
@ -390,16 +385,16 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
$mid: 12
};
templateData.toolbar.context = toolbarContext;
templateData.runToolbar!.context = toolbarContext;
templateData.runToolbar.context = toolbarContext;
}
disposeTemplate(templateData: CellRenderTemplate): void {
disposeTemplate(templateData: CodeCellRenderTemplate): void {
templateData.disposables.clear();
}
disposeElement(element: ICellViewModel, index: number, templateData: CellRenderTemplate, height: number | undefined): void {
disposeElement(element: ICellViewModel, index: number, templateData: CodeCellRenderTemplate, height: number | undefined): void {
this.disposables.get(element)?.clear();
this.renderedEditors.delete(element);
templateData.focusIndicator!.style.height = 'initial';
templateData.focusIndicator.style.height = 'initial';
}
}

22
src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
View file

@ -3,20 +3,20 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as nls from 'vs/nls';
import * as DOM from 'vs/base/browser/dom';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { getResizesObserver } from 'vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver';
import { IOutput, ITransformedDisplayOutputDto, IRenderOutput, CellOutputKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { CellRenderTemplate, INotebookEditor, CellFocusMode } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { raceCancellation } from 'vs/base/common/async';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
import { INotebookService } from 'vs/workbench/contrib/notebook/browser/notebookService';
import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
import { EDITOR_TOP_PADDING, EDITOR_BOTTOM_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
import { IModeService } from 'vs/editor/common/services/modeService';
import { debounce } from 'vs/base/common/decorators';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { IModeService } from 'vs/editor/common/services/modeService';
import * as nls from 'vs/nls';
import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
import { EDITOR_BOTTOM_PADDING, EDITOR_TOP_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
import { CellFocusMode, CodeCellRenderTemplate, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { INotebookService } from 'vs/workbench/contrib/notebook/browser/notebookService';
import { getResizesObserver } from 'vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver';
import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
import { CellOutputKind, IOutput, IRenderOutput, ITransformedDisplayOutputDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
interface IMimeTypeRenderer extends IQuickPickItem {
index: number;
@ -28,7 +28,7 @@ export class CodeCell extends Disposable {
constructor(
private notebookEditor: INotebookEditor,
private viewCell: CodeCellViewModel,
private templateData: CellRenderTemplate,
private templateData: CodeCellRenderTemplate,
@INotebookService private notebookService: INotebookService,
@IQuickInputService private readonly quickInputService: IQuickInputService,
@IModeService private readonly _modeService: IModeService

4
src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
View file

@ -8,7 +8,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { getResizesObserver } from 'vs/workbench/contrib/notebook/browser/view/renderers/sizeObserver';
import { INotebookEditor, CellRenderTemplate, CellFocusMode, CellEditState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { INotebookEditor, MarkdownCellRenderTemplate, CellFocusMode, CellEditState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { raceCancellation } from 'vs/base/common/async';
import { MarkdownCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel';
@ -26,7 +26,7 @@ export class StatefullMarkdownCell extends Disposable {
constructor(
private notebookEditor: INotebookEditor,
private viewCell: MarkdownCellViewModel,
private templateData: CellRenderTemplate,
private templateData: MarkdownCellRenderTemplate,
editorOptions: IEditorOptions,
instantiationService: IInstantiationService
) {