maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

markdown -> markup

Browse source
This commit is contained in:
Matt Bierner 2021-06-08 18:10:58 -07:00
parent 550c3ff481
commit 11d9ddbfbd
No known key found for this signature in database
GPG key ID: 099C331567E11888
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
View file

@ -555,7 +555,7 @@ var requirejs = (function() {
this.rendererMessaging?.postMessage(data.rendererId, data.message);
break;
}
case 'clickMarkdownPreview':
case 'clickMarkupCell':
{
const cell = this.notebookEditor.getCellById(data.cellId);
if (cell) {
@ -569,7 +569,7 @@ var requirejs = (function() {
}
break;
}
case 'contextMenuMarkdownPreview':
case 'contextMenuMarkupCell':
{
const cell = this.notebookEditor.getCellById(data.cellId);
if (cell) {
@ -594,7 +594,7 @@ var requirejs = (function() {
}
break;
}
case 'toggleMarkdownPreview':
case 'toggleMarkupPreview':
{
const cell = this.notebookEditor.getCellById(data.cellId);
if (cell) {
@ -603,7 +603,7 @@ var requirejs = (function() {
}
break;
}
case 'mouseEnterMarkdownPreview':
case 'mouseEnterMarkupCell':
{
const cell = this.notebookEditor.getCellById(data.cellId);
if (cell instanceof MarkdownCellViewModel) {
@ -611,7 +611,7 @@ var requirejs = (function() {
}
break;
}
case 'mouseLeaveMarkdownPreview':
case 'mouseLeaveMarkupCell':
{
const cell = this.notebookEditor.getCellById(data.cellId);
if (cell instanceof MarkdownCellViewModel) {
@ -962,7 +962,7 @@ var requirejs = (function() {
// TODO: use proper handler
const p = new Promise<void>(resolve => {
this.webview?.onMessage(e => {
if (e.message.type === 'initializedMarkdownPreview') {
if (e.message.type === 'initializedMarkup') {
resolve();
}
});

36
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
View file

@ -69,8 +69,8 @@ export interface IClickedDataUrlMessage extends BaseToWebviewMessage {
readonly downloadName?: string;
}
export interface IClickMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly type: 'clickMarkdownPreview';
export interface IClickMarkupCellMessage extends BaseToWebviewMessage {
readonly type: 'clickMarkupCell';
readonly cellId: string;
readonly ctrlKey: boolean;
readonly altKey: boolean;
@ -78,25 +78,25 @@ export interface IClickMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly shiftKey: boolean;
}
export interface IContextMenuMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly type: 'contextMenuMarkdownPreview';
export interface IContextMenuMarkupCellMessage extends BaseToWebviewMessage {
readonly type: 'contextMenuMarkupCell';
readonly cellId: string;
readonly clientX: number;
readonly clientY: number;
}
export interface IMouseEnterMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly type: 'mouseEnterMarkdownPreview';
export interface IMouseEnterMarkupCellMessage extends BaseToWebviewMessage {
readonly type: 'mouseEnterMarkupCell';
readonly cellId: string;
}
export interface IMouseLeaveMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly type: 'mouseLeaveMarkdownPreview';
export interface IMouseLeaveMarkupCellMessage extends BaseToWebviewMessage {
readonly type: 'mouseLeaveMarkupCell';
readonly cellId: string;
}
export interface IToggleMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly type: 'toggleMarkdownPreview';
export interface IToggleMarkupPreviewMessage extends BaseToWebviewMessage {
readonly type: 'toggleMarkupPreview';
readonly cellId: string;
}
@ -125,8 +125,8 @@ export interface ICellDragEndMessage extends BaseToWebviewMessage {
readonly cellId: string;
}
export interface IInitializedMarkdownPreviewMessage extends BaseToWebviewMessage {
readonly type: 'initializedMarkdownPreview';
export interface IInitializedMarkupMessage extends BaseToWebviewMessage {
readonly type: 'initializedMarkup';
}
export interface ITelemetryFoundRenderedMarkdownMath extends BaseToWebviewMessage {
@ -327,16 +327,16 @@ export type FromWebviewMessage = WebviewIntialized |
ICustomKernelMessage |
ICustomRendererMessage |
IClickedDataUrlMessage |
IClickMarkdownPreviewMessage |
IContextMenuMarkdownPreviewMessage |
IMouseEnterMarkdownPreviewMessage |
IMouseLeaveMarkdownPreviewMessage |
IToggleMarkdownPreviewMessage |
IClickMarkupCellMessage |
IContextMenuMarkupCellMessage |
IMouseEnterMarkupCellMessage |
IMouseLeaveMarkupCellMessage |
IToggleMarkupPreviewMessage |
ICellDragStartMessage |
ICellDragMessage |
ICellDropMessage |
ICellDragEndMessage |
IInitializedMarkdownPreviewMessage |
IInitializedMarkupMessage |
ITelemetryFoundRenderedMarkdownMath |
ITelemetryFoundUnrenderedMarkdownMath;

12
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
View file

@ -513,7 +513,7 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
case 'initializeMarkup':
await notebookDocument.ensureMarkupCells(event.data.cells);
dimensionUpdater.updateImmediately();
postNotebookMessage('initializedMarkdownPreview', {});
postNotebookMessage('initializedMarkup', {});
break;
case 'createMarkupCell':
@ -1129,11 +1129,11 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
private addEventListeners() {
this.element.addEventListener('dblclick', () => {
postNotebookMessage<webviewMessages.IToggleMarkdownPreviewMessage>('toggleMarkdownPreview', { cellId: this.id });
postNotebookMessage<webviewMessages.IToggleMarkupPreviewMessage>('toggleMarkupPreview', { cellId: this.id });
});
this.element.addEventListener('click', e => {
postNotebookMessage<webviewMessages.IClickMarkdownPreviewMessage>('clickMarkdownPreview', {
postNotebookMessage<webviewMessages.IClickMarkupCellMessage>('clickMarkupCell', {
cellId: this.id,
altKey: e.altKey,
ctrlKey: e.ctrlKey,
@ -1143,7 +1143,7 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
});
this.element.addEventListener('contextmenu', e => {
postNotebookMessage<webviewMessages.IContextMenuMarkdownPreviewMessage>('contextMenuMarkdownPreview', {
postNotebookMessage<webviewMessages.IContextMenuMarkupCellMessage>('contextMenuMarkupCell', {
cellId: this.id,
clientX: e.clientX,
clientY: e.clientY,
@ -1151,11 +1151,11 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
});
this.element.addEventListener('mouseenter', () => {
postNotebookMessage<webviewMessages.IMouseEnterMarkdownPreviewMessage>('mouseEnterMarkdownPreview', { cellId: this.id });
postNotebookMessage<webviewMessages.IMouseEnterMarkupCellMessage>('mouseEnterMarkupCell', { cellId: this.id });
});
this.element.addEventListener('mouseleave', () => {
postNotebookMessage<webviewMessages.IMouseLeaveMarkdownPreviewMessage>('mouseLeaveMarkdownPreview', { cellId: this.id });
postNotebookMessage<webviewMessages.IMouseLeaveMarkupCellMessage>('mouseLeaveMarkupCell', { cellId: this.id });
});
setMarkupContainerDraggable(this.element, currentOptions.dragAndDropEnabled);