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

notebook - make resolver fit to for untitled resources

Browse source
This commit is contained in:
Benjamin Pasero 2021-08-06 08:41:41 +02:00
parent f68d4571b6
commit 13ffb09f79
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
2 changed files with 49 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
View file

@ -11,6 +11,23 @@ import { Event } from 'vs/base/common/event';
export const INotebookEditorModelResolverService = createDecorator<INotebookEditorModelResolverService>('INotebookModelResolverService');
export interface IUntitledNotebookResource {
/**
* Depending on the value of `untitledResource` will
* resolve a untitled notebook that:
* - gets a unique name if `undefined` (e.g. `Untitled-1')
* - uses the resource directly if the scheme is `untitled:`
* - converts any other resource scheme to `untitled:` and will
* assume an associated file path
*
* Untitled notebook editors with associated path behave slightly
* different from other untitled editors:
* - they are dirty right when opening
* - they will not ask for a file path when saving but use the associated path
*/
untitledResource: URI | undefined;
}
export interface INotebookEditorModelResolverService {
readonly _serviceBrand: undefined;
@ -20,4 +37,5 @@ export interface INotebookEditorModelResolverService {
isDirty(resource: URI): boolean;
resolve(resource: URI, viewType?: string): Promise<IReference<IResolvedNotebookEditorModel>>;
resolve(resource: IUntitledNotebookResource, viewType: string): Promise<IReference<IResolvedNotebookEditorModel>>;
}

33
src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
View file

@ -13,9 +13,12 @@ import { ILogService } from 'vs/platform/log/common/log';
import { Emitter, Event } from 'vs/base/common/event';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
import { INotebookEditorModelResolverService, IUntitledNotebookResource } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
import { ResourceMap } from 'vs/base/common/map';
import { FileWorkingCopyManager, IFileWorkingCopyManager } from 'vs/workbench/services/workingCopy/common/fileWorkingCopyManager';
import { Schemas } from 'vs/base/common/network';
import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
import { assertIsDefined } from 'vs/base/common/types';
class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IResolvedNotebookEditorModel>> {
@ -152,7 +155,33 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
return this._data.isDirty(resource);
}
async resolve(resource: URI, viewType?: string): Promise<IReference<IResolvedNotebookEditorModel>> {
async resolve(resource: URI, viewType?: string): Promise<IReference<IResolvedNotebookEditorModel>>;
async resolve(resource: IUntitledNotebookResource, viewType: string): Promise<IReference<IResolvedNotebookEditorModel>>;
async resolve(arg0: URI | IUntitledNotebookResource, viewType?: string): Promise<IReference<IResolvedNotebookEditorModel>> {
let resource: URI;
if (URI.isUri(arg0)) {
resource = arg0;
} else {
if (!arg0.untitledResource) {
const info = this._notebookService.getContributedNotebookType(assertIsDefined(viewType));
if (!info) {
throw new Error('UNKNOWN view type: ' + viewType);
}
const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
for (let counter = 1; ; counter++) {
let candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: viewType });
if (!this._notebookService.getNotebookTextModel(candidate)) {
resource = candidate;
break;
}
}
} else if (arg0.untitledResource.scheme === Schemas.untitled) {
resource = arg0.untitledResource;
} else {
resource = arg0.untitledResource.with({ scheme: Schemas.untitled });
}
}
if (resource.scheme === CellUri.scheme) {
throw new Error(`CANNOT open a cell-uri as notebook. Tried with ${resource.toString()}`);