Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-03 07:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #102423.

Browse Source
This commit is contained in:
rebornix
2020-07-13 13:25:57 -07:00
parent 7a9cfb3f9f
commit b73b7469cd
4 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/vscode-notebook-tests/src/notebook.test.ts
View File

@@ -893,6 +893,25 @@ suite('regression', () => {
await vscode.commands.executeCommand('workbench.action.files.newUntitledFile', { viewType: "notebookCoreTest" });
assert.notEqual(vscode.notebook.activeNotebookEditor, undefined, 'untitled notebook editor is not undefined');
});
test('#102423 - copy/paste shares the same text buffer', async function () {
const resource = vscode.Uri.file(join(vscode.workspace.rootPath || '', './first.vsctestnb'));
await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
let activeCell = vscode.notebook.activeNotebookEditor!.selection;
assert.equal(activeCell?.document.getText(), 'test');
await vscode.commands.executeCommand('notebook.cell.copyDown');
await vscode.commands.executeCommand('notebook.cell.edit');
activeCell = vscode.notebook.activeNotebookEditor!.selection;
assert.equal(vscode.notebook.activeNotebookEditor!.document.cells.indexOf(activeCell!), 1);
assert.equal(activeCell?.document.getText(), 'test');
await vscode.commands.executeCommand('default:type', { text: 'var abc = 0;' });
assert.equal(vscode.notebook.activeNotebookEditor!.document.cells.length, 2);
assert.notEqual(vscode.notebook.activeNotebookEditor!.document.cells[0].document.getText(), vscode.notebook.activeNotebookEditor!.document.cells[1].document.getText())
});
});
suite('webview', () => {

45
src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
View File

@@ -23,6 +23,7 @@ import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookCellRunState } from
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
// Notebook Commands
const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
@@ -745,7 +746,7 @@ registerAction2(class extends NotebookAction {
const clipboardService = accessor.get<IClipboardService>(IClipboardService);
const notebookService = accessor.get<INotebookService>(INotebookService);
clipboardService.writeText(context.cell.getText());
notebookService.setToCopy([context.cell.model]);
notebookService.setToCopy([context.cell.model], true);
}
});
@@ -774,7 +775,7 @@ registerAction2(class extends NotebookAction {
}
viewModel.deleteCell(viewModel.getCellIndex(context.cell), true);
notebookService.setToCopy([context.cell.model]);
notebookService.setToCopy([context.cell.model], false);
}
});
@@ -794,7 +795,7 @@ registerAction2(class extends NotebookAction {
async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext) {
const notebookService = accessor.get<INotebookService>(INotebookService);
const pasteCells = notebookService.getToCopy() || [];
const pasteCells = notebookService.getToCopy();
const viewModel = context.notebookEditor.viewModel;
@@ -802,9 +803,25 @@ registerAction2(class extends NotebookAction {
return;
}
if (!pasteCells) {
return;
}
const currCellIndex = viewModel.getCellIndex(context!.cell);
pasteCells.reverse().forEach(pasteCell => {
pasteCells.items.reverse().map(cell => {
if (pasteCells.isCopy) {
return viewModel.notebookDocument.createCellTextModel(
cell.getValue(),
cell.language,
cell.cellKind,
[],
cell.metadata
);
} else {
return cell;
}
}).forEach(pasteCell => {
viewModel.insertCell(currCellIndex, pasteCell, true);
return;
});
@@ -826,7 +843,7 @@ registerAction2(class extends NotebookAction {
async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext) {
const notebookService = accessor.get<INotebookService>(INotebookService);
const pasteCells = notebookService.getToCopy() || [];
const pasteCells = notebookService.getToCopy();
const viewModel = context.notebookEditor.viewModel;
@@ -834,9 +851,25 @@ registerAction2(class extends NotebookAction {
return;
}
if (!pasteCells) {
return;
}
const currCellIndex = viewModel.getCellIndex(context!.cell);
pasteCells.reverse().forEach(pasteCell => {
pasteCells.items.reverse().map(cell => {
if (pasteCells.isCopy) {
return viewModel.notebookDocument.createCellTextModel(
cell.getValue(),
cell.language,
cell.cellKind,
[],
cell.metadata
);
} else {
return cell;
}
}).forEach(pasteCell => {
viewModel.insertCell(currCellIndex + 1, pasteCell, true);
return;
});

12
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
View File

@@ -190,6 +190,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
private readonly _onDidChangeKernels = new Emitter<void>();
onDidChangeKernels: Event<void> = this._onDidChangeKernels.event;
private cutItems: NotebookCellTextModel[] | undefined;
private _lastClipboardIsCopy: boolean = true;
private _displayOrder: { userOrder: string[], defaultOrder: string[] } = Object.create(null);
@@ -728,12 +729,17 @@ export class NotebookService extends Disposable implements INotebookService, ICu
this._onDidChangeVisibleEditors.fire(alreadyCreated);
}
setToCopy(items: NotebookCellTextModel[]) {
setToCopy(items: NotebookCellTextModel[], isCopy: boolean) {
this.cutItems = items;
this._lastClipboardIsCopy = isCopy;
}
getToCopy(): NotebookCellTextModel[] | undefined {
return this.cutItems;
getToCopy(): { items: NotebookCellTextModel[], isCopy: boolean; } | undefined {
if (this.cutItems) {
return { items: this.cutItems, isCopy: this._lastClipboardIsCopy };
}
return undefined;
}
async save(viewType: string, resource: URI, token: CancellationToken): Promise<boolean> {

4
src/vs/workbench/contrib/notebook/common/notebookService.ts
View File

@@ -66,8 +66,8 @@ export interface INotebookService {
saveAs(viewType: string, resource: URI, target: URI, token: CancellationToken): Promise<boolean>;
backup(viewType: string, uri: URI, token: CancellationToken): Promise<string | undefined>;
onDidReceiveMessage(viewType: string, editorId: string, rendererType: string | undefined, message: unknown): void;
setToCopy(items: NotebookCellTextModel[]): void;
getToCopy(): NotebookCellTextModel[] | undefined;
setToCopy(items: NotebookCellTextModel[], isCopy: boolean): void;
getToCopy(): { items: NotebookCellTextModel[], isCopy: boolean; } | undefined;
// editor events
addNotebookEditor(editor: IEditor): void;