Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'notebook/dev' into main

Browse Source
This commit is contained in:
rebornix
2021-05-21 14:13:43 -07:00
parent 9996e32bc9 4ba2760274
commit a03daaf850
23 changed files with 619 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
View File

@@ -17,6 +17,7 @@ import { ExtHostContext, ExtHostNotebookShape, IExtHostContext, MainThreadNotebo
import { MainThreadNotebooksAndEditors } from 'vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors';
import { onUnexpectedError } from 'vs/base/common/errors';
import { Schemas } from 'vs/base/common/network';
import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsShape {
@@ -121,10 +122,16 @@ export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsS
async $tryCreateNotebook(options: { viewType: string, content?: NotebookDataDto }): Promise<UriComponents> {
const info = this._notebookService.getContributedNotebookType(options.viewType);
if (!info) {
throw new Error('UNKNOWN view type: ' + options.viewType);
}
// find a free URI for the untitled case
const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
let uri: URI;
for (let counter = 1; ; counter++) {
let candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}`, query: options.viewType });
let candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: options.viewType });
if (!this._notebookService.getNotebookTextModel(candidate)) {
uri = candidate;
break;