only match against notebook uri when document selector specificies notebook type, fixes https://github.com/microsoft/vscode/issues/149363

This commit is contained in:
Johannes
2022-05-13 09:29:57 +02:00
parent 113287ccc3
commit aa706918c1
4 changed files with 93 additions and 65 deletions

View File

@@ -453,8 +453,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
return extHostLanguages.changeLanguage(document.uri, languageId);
},
match(selector: vscode.DocumentSelector, document: vscode.TextDocument): number {
const notebookType = extHostDocuments.getDocumentData(document.uri)?.notebook?.notebookType;
return score(typeConverters.LanguageSelector.from(selector), document.uri, document.languageId, true, notebookType);
const notebook = extHostDocuments.getDocumentData(document.uri)?.notebook;
return score(typeConverters.LanguageSelector.from(selector), document.uri, document.languageId, true, notebook?.uri, notebook?.notebookType);
},
registerCodeActionsProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
return extHostLanguageFeatures.registerCodeActionProvider(extension, checkSelector(selector), provider, metadata);