development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215577 from microsoft/rebornix/dirty-bonobo

Browse source 
Fix #215544. Fix notebook scoped instantiation service.
This commit is contained in:
Peng Lyu 2024-06-14 13:28:10 -07:00 committed by GitHub
parent af867d774a 789d05ac49
commit fecd77fd69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
View file

@ -19,6 +19,8 @@ import { URI } from 'vs/base/common/uri';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { InteractiveWindowOpen } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
export class NotebookEditorWidgetService implements INotebookEditorService {
@ -39,7 +41,8 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
constructor(
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@IEditorService editorService: IEditorService,
@IContextKeyService contextKeyService: IContextKeyService
@IContextKeyService contextKeyService: IContextKeyService,
@IInstantiationService private readonly instantiationService: IInstantiationService
) {
const groupListener = new Map<number, IDisposable[]>();
@ -182,9 +185,13 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
if (!value) {
// NEW widget
const instantiationService = accessor.get(IInstantiationService);
const editorGroupContextKeyService = accessor.get(IContextKeyService);
const editorGroupEditorProgressService = accessor.get(IEditorProgressService);
const notebookInstantiationService = this.instantiationService.createChild(new ServiceCollection(
[IContextKeyService, editorGroupContextKeyService],
[IEditorProgressService, editorGroupEditorProgressService]));
const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
const widget = instantiationService.createInstance(NotebookEditorWidget, {
const widget = notebookInstantiationService.createInstance(NotebookEditorWidget, {
...ctorOptions,
codeWindow: codeWindow ?? ctorOptions.codeWindow,
}, initialDimension);