From beb6b4782f9fd96d97d32b65446cdfbd33217da9 Mon Sep 17 00:00:00 2001 From: rebornix Date: Thu, 16 Jul 2020 16:50:37 -0700 Subject: [PATCH] type convert glob --- src/vs/workbench/api/common/extHostNotebook.ts | 6 +++++- src/vs/workbench/contrib/notebook/common/notebookCommon.ts | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts index afbee0f057e..96d37ecddaa 100644 --- a/src/vs/workbench/api/common/extHostNotebook.ts +++ b/src/vs/workbench/api/common/extHostNotebook.ts @@ -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(); diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts index f9f94daaf2c..f0429e2bdd0 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts @@ -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 }; }