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

Renaming notebook -> webview messages to be more about markup instead of specific to markdown

Browse source
This commit is contained in:
Matt Bierner 2021-06-08 12:08:57 -07:00
parent 75df790cb9
commit d99cdc9134
No known key found for this signature in database
GPG key ID: 099C331567E11888
2 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -287,35 +287,36 @@ export interface ICustomRendererMessage extends BaseToWebviewMessage {
message: unknown;
}
export interface ICreateMarkdownMessage {
type: 'createMarkdownPreview',
export interface ICreateMarkupCellMessage {
type: 'createMarkupCell',
cell: IMarkdownCellInitialization;
}
export interface IDeleteMarkdownMessage {
type: 'deleteMarkdownPreview',
export interface IDeleteMarkupCellMessage {
type: 'deleteMarkupCell',
ids: readonly string[];
}
export interface IHideMarkdownMessage {
type: 'hideMarkdownPreviews';
export interface IHideMarkupCellMessage {
type: 'hideMarkupCells';
ids: readonly string[];
}
export interface IUnhideMarkdownMessage {
type: 'unhideMarkdownPreviews';
export interface IUnhideMarkupCellMessage {
type: 'unhideMarkupCells';
ids: readonly string[];
}
export interface IShowMarkdownMessage {
type: 'showMarkdownPreview',
export interface IShowMarkupCellMessage {
type: 'showMarkupCell',
id: string;
handle: number;
content: string | undefined;
top: number;
}
export interface IUpdateSelectedMarkdownPreviews {
readonly type: 'updateSelectedMarkdownPreviews',
export interface IUpdateSelectedMarkupCellsMessage {
readonly type: 'updateSelectedMarkupCells',
readonly selectedCellIds: readonly string[]
}
@ -327,8 +328,8 @@ export interface IMarkdownCellInitialization {
visible: boolean;
}
export interface IInitializeMarkdownMessage {
type: 'initializeMarkdownPreview';
export interface IInitializeMarkupCells {
type: 'initializeMarkup';
cells: ReadonlyArray<IMarkdownCellInitialization>;
}
@ -385,13 +386,13 @@ export type ToWebviewMessage =
| IUpdateDecorationsMessage
| ICustomKernelMessage
| ICustomRendererMessage
| ICreateMarkdownMessage
| IDeleteMarkdownMessage
| IShowMarkdownMessage
| IHideMarkdownMessage
| IUnhideMarkdownMessage
| IUpdateSelectedMarkdownPreviews
| IInitializeMarkdownMessage
| ICreateMarkupCellMessage
| IDeleteMarkupCellMessage
| IShowMarkupCellMessage
| IHideMarkupCellMessage
| IUnhideMarkupCellMessage
| IUpdateSelectedMarkupCellsMessage
| IInitializeMarkupCells
| INotebookStylesMessage
| INotebookOptionsMessage;
@ -1335,7 +1336,7 @@ var requirejs = (function() {
this.markdownPreviewMapping.set(initialization.cellId, initialization);
this._sendMessageToWebview({
type: 'createMarkdownPreview',
type: 'createMarkupCell',
cell: initialization
});
}
@ -1353,7 +1354,7 @@ var requirejs = (function() {
const sameContent = initialization.content === entry.content;
if (!sameContent || !entry.visible) {
this._sendMessageToWebview({
type: 'showMarkdownPreview',
type: 'showMarkupCell',
id: initialization.cellId,
handle: initialization.cellHandle,
// If the content has not changed, we still want to make sure the
@ -1386,7 +1387,7 @@ var requirejs = (function() {
if (cellsToHide.length) {
this._sendMessageToWebview({
type: 'hideMarkdownPreviews',
type: 'hideMarkupCells',
ids: cellsToHide
});
}
@ -1411,7 +1412,7 @@ var requirejs = (function() {
}
this._sendMessageToWebview({
type: 'unhideMarkdownPreviews',
type: 'unhideMarkupCells',
ids: toUnhide,
});
}
@ -1430,7 +1431,7 @@ var requirejs = (function() {
if (cellIds.length) {
this._sendMessageToWebview({
type: 'deleteMarkdownPreview',
type: 'deleteMarkupCell',
ids: cellIds
});
}
@ -1442,7 +1443,7 @@ var requirejs = (function() {
}
this._sendMessageToWebview({
type: 'updateSelectedMarkdownPreviews',
type: 'updateSelectedMarkupCells',
selectedCellIds: selectedCellsIds.filter(id => this.markdownPreviewMapping.has(id)),
});
}
@ -1466,7 +1467,7 @@ var requirejs = (function() {
}
this._sendMessageToWebview({
type: 'initializeMarkdownPreview',
type: 'initializeMarkup',
cells,
});

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

@ -510,17 +510,17 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
const event = rawEvent as ({ data: ToWebviewMessage; });
switch (event.data.type) {
case 'initializeMarkdownPreview':
case 'initializeMarkup':
{
await ensureMarkdownPreviewCells(event.data.cells);
dimensionUpdater.updateImmediately();
postNotebookMessage('initializedMarkdownPreview', {});
}
break;
case 'createMarkdownPreview':
case 'createMarkupCell':
ensureMarkdownPreviewCells([event.data.cell]);
break;
case 'showMarkdownPreview':
case 'showMarkupCell':
{
const data = event.data;
@ -532,7 +532,7 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
}
}
break;
case 'hideMarkdownPreviews':
case 'hideMarkupCells':
{
for (const id of event.data.ids) {
const cellContainer = document.getElementById(id);
@ -542,7 +542,7 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
}
}
break;
case 'unhideMarkdownPreviews':
case 'unhideMarkupCells':
{
for (const id of event.data.ids) {
const cellContainer = document.getElementById(id);
@ -553,7 +553,7 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
}
}
break;
case 'deleteMarkdownPreview':
case 'deleteMarkupCell':
{
for (const id of event.data.ids) {
const cellContainer = document.getElementById(id);
@ -561,7 +561,7 @@ async function webviewPreloads(style: PreloadStyles, options: PreloadOptions, re
}
}
break;
case 'updateSelectedMarkdownPreviews':
case 'updateSelectedMarkupCells':
{
const selectedCellIds = new Set<string>(event.data.selectedCellIds);