Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Creating new untitled notebook doesn't work #14031

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Creating new untitled notebook doesn't work #14031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions packages/plugin-ext/src/main/browser/notebooks/notebook-documents-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { NotebookModelResolverService } from '@theia/notebook/lib/browser';
import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
import { NotebookCellsChangeType } from '@theia/notebook/lib/common';
import { NotebookMonacoTextModelService } from '@theia/notebook/lib/browser/service/notebook-monaco-text-model-service';
import { MAIN_RPC_CONTEXT, NotebookCellsChangedEventDto, NotebookDataDto, NotebookDocumentsExt, NotebookDocumentsMain } from '../../../common';
import { MAIN_RPC_CONTEXT, NotebookCellsChangedEventDto, NotebookDataDto, NotebookDocumentsExt, NotebookDocumentsMain, NotebookRawContentEventDto } from '../../../common';
import { RPCProtocol } from '../../../common/rpc-protocol';
import { NotebookDto } from './notebook-dto';
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
Expand Down Expand Up @@ -156,15 +156,34 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain {
// ref.dispose();
// });

const uriComponents = ref.uri.toComponents();
// untitled notebooks are dirty by default
this.proxy.$acceptDirtyStateChanged(ref.uri.toComponents(), true);
this.proxy.$acceptDirtyStateChanged(uriComponents, true);

// apply content changes... slightly HACKY -> this triggers a change event
// apply content changes...
if (options.content) {
const data = NotebookDto.fromNotebookDataDto(options.content);
ref.setData(data);

// Create and send a change events
const rawEvents: NotebookRawContentEventDto[] = [];
if (options.content.cells && options.content.cells.length > 0) {
rawEvents.push({
kind: NotebookCellsChangeType.ModelChange,
changes: [{ start: 0, deleteCount: 0, newItems: ref.cells.map(NotebookDto.toNotebookCellDto) }]
});
}
if (options.content.metadata) {
rawEvents.push({
kind: NotebookCellsChangeType.ChangeDocumentMetadata,
metadata: options.content.metadata
});
}
if (rawEvents.length > 0) {
this.proxy.$acceptModelChanged(uriComponents, { versionId: 1, rawEvents }, true);
}
}
return ref.uri.toComponents();
return uriComponents;
}

async $tryOpenNotebook(uriComponents: UriComponents): Promise<UriComponents> {
Expand Down
Loading