type convert glob

This commit is contained in:
rebornix
2020-07-16 16:50:37 -07:00
parent 5271afd028
commit beb6b4782f
2 changed files with 6 additions and 3 deletions

View File

@@ -1085,7 +1085,11 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
const handle = ExtHostNotebookController._notebookKernelProviderHandlePool++;
const adapter = new ExtHostNotebookKernelProviderAdapter(this._proxy, handle, extension, provider);
this._notebookKernelProviders.set(handle, adapter);
this._proxy.$registerNotebookKernelProvider({ id: extension.identifier, location: extension.extensionLocation }, handle, selector);
this._proxy.$registerNotebookKernelProvider({ id: extension.identifier, location: extension.extensionLocation }, handle, {
viewType: selector.viewType,
filenamePattern: selector.filenamePattern ? typeConverters.GlobPattern.from(selector.filenamePattern) : undefined,
excludeFileNamePattern: selector.excludeFileNamePattern ? typeConverters.GlobPattern.from(selector.excludeFileNamePattern) : undefined,
});
return new extHostTypes.Disposable(() => {
adapter.dispose();

View File

@@ -14,7 +14,6 @@ import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { IEditorModel } from 'vs/platform/editor/common/editor';
import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
import { GlobPattern } from 'vs/workbench/api/common/extHost.protocol';
import { CancellationToken } from 'vs/base/common/cancellation';
import { Schemas } from 'vs/base/common/network';
import { IRevertOptions } from 'vs/workbench/common/editor';
@@ -70,7 +69,7 @@ export interface NotebookDocumentMetadata {
cellEditable: boolean;
cellRunnable: boolean;
cellHasExecutionOrder: boolean;
displayOrder?: GlobPattern[];
displayOrder?: (string | glob.IRelativePattern)[];
custom?: { [key: string]: unknown };
}