development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename CellKind to NotebookCellKind

Browse source
This commit is contained in:
Johannes Rieken 2021-02-12 10:25:12 +01:00
parent 215cd17276
commit 868fb4c39f
9 changed files with 44 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
extensions/vscode-notebook-tests/src/notebook.test.ts
View file

@ -418,7 +418,7 @@ suite('Notebook API tests', () => {
const cellsChangeEvent = getEventOncePromise<vscode.NotebookCellsChangeEvent>(vscode.notebook.onDidChangeNotebookCells);
await vscode.window.activeNotebookEditor!.edit(editBuilder => {
editBuilder.replaceCells(1, 0, [{ cellKind: vscode.CellKind.Code, language: 'javascript', source: 'test 2', outputs: [], metadata: undefined }]);
editBuilder.replaceCells(1, 0, [{ cellKind: vscode.NotebookCellKind.Code, language: 'javascript', source: 'test 2', outputs: [], metadata: undefined }]);
});
const cellChangeEventRet = await cellsChangeEvent;
@ -561,13 +561,13 @@ suite('Notebook API tests', () => {
{
const edit = new vscode.WorkspaceEdit();
edit.replaceNotebookCells(document.uri, 0, 0, [{
cellKind: vscode.CellKind.Markdown,
cellKind: vscode.NotebookCellKind.Markdown,
language: 'markdown',
metadata: undefined,
outputs: [],
source: 'new_markdown'
}, {
cellKind: vscode.CellKind.Code,
cellKind: vscode.NotebookCellKind.Code,
language: 'fooLang',
metadata: undefined,
outputs: [],
@ -598,13 +598,13 @@ suite('Notebook API tests', () => {
{
const edit = new vscode.WorkspaceEdit();
edit.replaceNotebookCells(document.uri, 0, 1, [{
cellKind: vscode.CellKind.Markdown,
cellKind: vscode.NotebookCellKind.Markdown,
language: 'markdown',
metadata: undefined,
outputs: [],
source: 'new2_markdown'
}, {
cellKind: vscode.CellKind.Code,
cellKind: vscode.NotebookCellKind.Code,
language: 'fooLang',
metadata: undefined,
outputs: [],
@ -640,13 +640,13 @@ suite('Notebook API tests', () => {
const edit = new vscode.WorkspaceEdit();
edit.replaceNotebookCells(document.uri, 0, 0, [{
cellKind: vscode.CellKind.Markdown,
cellKind: vscode.NotebookCellKind.Markdown,
language: 'markdown',
metadata: undefined,
outputs: [],
source: 'new_markdown'
}, {
cellKind: vscode.CellKind.Code,
cellKind: vscode.NotebookCellKind.Code,
language: 'fooLang',
metadata: undefined,
outputs: [],
@ -685,7 +685,7 @@ suite('Notebook API tests', () => {
const cellMetadataChangeEvent = getEventOncePromise<vscode.NotebookCellMetadataChangeEvent>(vscode.notebook.onDidChangeCellMetadata);
const version = vscode.window.activeNotebookEditor!.document.version;
await vscode.window.activeNotebookEditor!.edit(editBuilder => {
editBuilder.replaceCells(1, 0, [{ cellKind: vscode.CellKind.Code, language: 'javascript', source: 'test 2', outputs: [], metadata: undefined }]);
editBuilder.replaceCells(1, 0, [{ cellKind: vscode.NotebookCellKind.Code, language: 'javascript', source: 'test 2', outputs: [], metadata: undefined }]);
editBuilder.replaceCellMetadata(0, { runnable: false });
});
@ -704,7 +704,7 @@ suite('Notebook API tests', () => {
const cellMetadataChangeEvent = getEventOncePromise<vscode.NotebookCellMetadataChangeEvent>(vscode.notebook.onDidChangeCellMetadata);
const version = vscode.window.activeNotebookEditor!.document.version;
await vscode.window.activeNotebookEditor!.edit(editBuilder => {
editBuilder.replaceCells(1, 0, [{ cellKind: vscode.CellKind.Code, language: 'javascript', source: 'test 2', outputs: [], metadata: undefined }]);
editBuilder.replaceCells(1, 0, [{ cellKind: vscode.NotebookCellKind.Code, language: 'javascript', source: 'test 2', outputs: [], metadata: undefined }]);
editBuilder.replaceCellMetadata(0, { runnable: false });
});

4
extensions/vscode-notebook-tests/src/notebookSmokeTestMain.ts
View file

@ -28,7 +28,7 @@ export function smokeTestActivate(context: vscode.ExtensionContext): any {
{
source: 'code()',
language: 'typescript',
cellKind: vscode.CellKind.Code,
cellKind: vscode.NotebookCellKind.Code,
outputs: [],
metadata: {
custom: { testCellMetadata: 123 }
@ -37,7 +37,7 @@ export function smokeTestActivate(context: vscode.ExtensionContext): any {
{
source: 'Markdown Cell',
language: 'markdown',
cellKind: vscode.CellKind.Markdown,
cellKind: vscode.NotebookCellKind.Markdown,
outputs: [],
metadata: {
custom: { testCellMetadata: 123 }

2
extensions/vscode-notebook-tests/src/notebookTestMain.ts
View file

@ -26,7 +26,7 @@ export function activate(context: vscode.ExtensionContext): any {
{
source: 'test',
language: 'typescript',
cellKind: vscode.CellKind.Code,
cellKind: vscode.NotebookCellKind.Code,
outputs: [],
metadata: {
custom: { testCellMetadata: 123 }

6
src/vs/vscode.proposed.d.ts vendored
View file

@ -1000,7 +1000,7 @@ declare module 'vscode' {
//#region https://github.com/microsoft/vscode/issues/106744, Notebooks (misc)
export enum CellKind {
export enum NotebookCellKind {
Markdown = 1,
Code = 2
}
@ -1052,7 +1052,7 @@ declare module 'vscode' {
readonly index: number;
readonly notebook: NotebookDocument;
readonly uri: Uri;
readonly cellKind: CellKind;
readonly cellKind: NotebookCellKind;
readonly document: TextDocument;
readonly language: string;
readonly outputs: readonly NotebookCellOutput[];
@ -1248,7 +1248,7 @@ declare module 'vscode' {
// todo@API support ids https://github.com/jupyter/enhancement-proposals/blob/master/62-cell-id/cell-id.md
export interface NotebookCellData {
readonly cellKind: CellKind;
readonly cellKind: NotebookCellKind;
readonly source: string;
readonly language: string;
// todo@API maybe use a separate data type?

4
src/vs/workbench/api/common/extHost.api.impl.ts
View file

@ -1253,9 +1253,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
// checkProposedApiEnabled(extension);
return extHostTypes.TimelineItem;
},
get CellKind() {
get NotebookCellKind() {
// checkProposedApiEnabled(extension);
return extHostTypes.CellKind;
return extHostTypes.NotebookCellKind;
},
get NotebookCellRunState() {
// checkProposedApiEnabled(extension);

3
src/vs/workbench/api/common/extHostNotebookConcatDocument.ts
View file

@ -11,7 +11,6 @@ import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
import { PrefixSumComputer } from 'vs/editor/common/viewModel/prefixSumComputer';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { score } from 'vs/editor/common/modes/languageSelector';
import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { ResourceMap } from 'vs/base/common/map';
import { URI } from 'vs/base/common/uri';
import { generateUuid } from 'vs/base/common/uuid';
@ -76,7 +75,7 @@ export class ExtHostNotebookConcatDocument implements vscode.NotebookConcatTextD
const cellLengths: number[] = [];
const cellLineCounts: number[] = [];
for (const cell of this._notebook.cells) {
if (cell.cellKind === CellKind.Code && (!this._selector || score(this._selector, cell.uri, cell.language, true))) {
if (cell.cellKind === types.NotebookCellKind.Code && (!this._selector || score(this._selector, cell.uri, cell.language, true))) {
this._cellUris.set(cell.uri, this._cells.length);
this._cells.push(cell);
cellLengths.push(cell.document.getText().length + 1);

2
src/vs/workbench/api/common/extHostNotebookDocument.ts
View file

@ -88,7 +88,7 @@ export class ExtHostCell extends Disposable {
get index() { return that._notebook.getCellIndex(that); },
notebook: that._notebook.notebookDocument,
uri: that.uri,
cellKind: this._cellData.cellKind,
cellKind: extHostTypeConverters.NotebookCellKind.to(this._cellData.cellKind),
document: data.document,
get language() { return data!.document.languageId; },
get outputs() { return that._outputs.map(extHostTypeConverters.NotebookCellOutput.to); },

26
src/vs/workbench/api/common/extHostTypeConverters.ts
View file

@ -31,7 +31,7 @@ import { coalesce, isNonEmptyArray } from 'vs/base/common/arrays';
import { RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
import { CellEditType, ICellDto2, INotebookDecorationRenderOptions, IOutputDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { CellEditType, CellKind, ICellDto2, INotebookDecorationRenderOptions, IOutputDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { ITestItem, ITestState } from 'vs/workbench/contrib/testing/common/testCollection';
export interface PositionLike {
@ -1344,11 +1344,33 @@ export namespace LanguageSelector {
}
}
export namespace NotebookCellKind {
export function from(data: vscode.NotebookCellKind): CellKind {
switch (data) {
case types.NotebookCellKind.Markdown:
return CellKind.Markdown;
case types.NotebookCellKind.Code:
default:
return CellKind.Code;
}
}
export function to(data: CellKind): vscode.NotebookCellKind {
switch (data) {
case CellKind.Markdown:
return types.NotebookCellKind.Markdown;
case CellKind.Code:
default:
return types.NotebookCellKind.Code;
}
}
}
export namespace NotebookCellData {
export function from(data: vscode.NotebookCellData): ICellDto2 {
return {
cellKind: data.cellKind,
cellKind: NotebookCellKind.from(data.cellKind),
language: data.language,
source: data.source,
metadata: data.metadata,

2
src/vs/workbench/api/common/extHostTypes.ts
View file

@ -2933,7 +2933,7 @@ export class NotebookCellOutput {
) { }
}
export enum CellKind {
export enum NotebookCellKind {
Markdown = 1,
Code = 2
}