@codingame/monaco-vscode-notebook-service-override 6.0.2 → 7.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -40,11 +40,9 @@ import { BackLayerWebView } from 'vscode/vscode/vs/workbench/contrib/notebook/br
 import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from './eventDispatcher.js';
 import { FontMeasurements } from 'vscode/vscode/vs/editor/browser/config/fontMeasurements';
 import { NotebookOptions } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
-import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { cellIndexesToRanges, cellRangesToIndexes } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
 import { registerZIndex, ZIndex } from 'vscode/vscode/vs/platform/layout/browser/zIndexRegistry';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 
 var NotebookTextDiffEditor_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor";
@@ -88,7 +86,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     get isDisposed() {
         return this._isDisposed;
     }
-    constructor(group, instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService, notebookExecutionStateService, codeEditorService) {
+    constructor(group, instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService) {
         super(NotebookTextDiffEditor_1.ID, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
@@ -115,13 +113,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this.onDidChangeSelection = this._onDidChangeSelection.event;
         this._isDisposed = false;
         this.pendingLayouts = ( (new WeakMap()));
-        this._notebookOptions = ( (new NotebookOptions(
-            this.window,
-            this.configurationService,
-            notebookExecutionStateService,
-            codeEditorService,
-            false
-        )));
+        this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
         this._register(this._notebookOptions);
         this._revealFirst = true;
     }
@@ -889,9 +881,7 @@ NotebookTextDiffEditor = NotebookTextDiffEditor_1 = ( (__decorate([
     ( (__param(4, INotebookEditorWorkerService))),
     ( (__param(5, IConfigurationService))),
     ( (__param(6, ITelemetryService))),
-    ( (__param(7, IStorageService))),
-    ( (__param(8, INotebookExecutionStateService))),
-    ( (__param(9, ICodeEditorService)))
+    ( (__param(7, IStorageService)))
 ], NotebookTextDiffEditor)));
 registerZIndex(ZIndex.Base, 10, 'notebook-diff-view-viewport-slider');
 registerThemingParticipant((theme, collector) => {

package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js

@@ -43,11 +43,9 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import './services/notebookRendererMessagingServiceImpl.js';
-import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import 'vscode/vscode/vs/workbench/services/outline/browser/outline';
 import 'vscode/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel';
 import './viewModel/notebookOutlineEntryFactory.js';
-import 'vscode/vscode/vs/base/common/async';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import './controller/insertCellActions.js';
 import './controller/executeActions.js';
@@ -143,8 +141,8 @@ class NotebookDiffEditorSerializer {
     }
 }
 class NotebookEditorSerializer {
-    canSerialize() {
-        return true;
+    canSerialize(input) {
+        return input.typeId === NotebookEditorInput.ID;
     }
     serialize(input) {
         assertType(input instanceof NotebookEditorInput);
@@ -507,7 +505,7 @@ let SimpleNotebookWorkingCopyEditorHandler = class SimpleNotebookWorkingCopyEdit
     }
     handlesSync(workingCopy) {
         const viewType = this._getViewType(workingCopy);
-        if (!viewType || viewType === 'interactive') {
+        if (!viewType || viewType === 'interactive' || extname(workingCopy.resource) === '.replNotebook') {
             return undefined;
         }
         return viewType;
@@ -1030,19 +1028,10 @@ configurationRegistry.registerConfiguration({
             },
             tags: ['notebookLayout']
         },
-        [NotebookSetting.findScope]: {
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                55,
-                "Enables the user to search within a selection of cells in the notebook. When enabled, the user will see a \"Find in Cell Selection\" icon in the notebook find widget."
-            )),
-            type: 'boolean',
-            default: false,
-        },
         [NotebookSetting.remoteSaving]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                56,
+                55,
                 "Enables the incremental saving of notebooks between processes and across Remote connections. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."
             )),
             type: 'boolean',
@@ -1052,28 +1041,28 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.scrollToRevealCell]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                57,
+                56,
                 "How far to scroll when revealing the next cell upon running {0}.",
                 'notebook.cell.executeAndSelectBelow'
             )),
             type: 'string',
             enum: ['fullCell', 'firstLine', 'none'],
             markdownEnumDescriptions: [
-                ( localizeWithPath(_moduleId, 58, 'Scroll to fully reveal the next cell.')),
-                ( localizeWithPath(_moduleId, 59, 'Scroll to reveal the first line of the next cell.')),
-                ( localizeWithPath(_moduleId, 60, 'Do not scroll.')),
+                ( localizeWithPath(_moduleId, 57, 'Scroll to fully reveal the next cell.')),
+                ( localizeWithPath(_moduleId, 58, 'Scroll to reveal the first line of the next cell.')),
+                ( localizeWithPath(_moduleId, 59, 'Do not scroll.')),
             ],
             default: 'fullCell'
         },
         [NotebookSetting.cellChat]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 61, "Enable experimental floating chat widget in notebooks.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 60, "Enable experimental floating chat widget in notebooks.")),
             type: 'boolean',
             default: false
         },
         [NotebookSetting.cellGenerate]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                62,
+                61,
                 "Enable experimental generate action to create code cell with inline chat enabled."
             )),
             type: 'boolean',
@@ -1083,21 +1072,21 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.notebookVariablesView]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                63,
+                62,
                 "Enable the experimental notebook variables view within the debug panel."
             )),
             type: 'boolean',
             default: false
         },
         [NotebookSetting.cellFailureDiagnostics]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 64, "Show available diagnostics for cell failures.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 63, "Show available diagnostics for cell failures.")),
             type: 'boolean',
             default: true
         },
         [NotebookSetting.outputBackupSizeLimit]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                65,
+                64,
                 "The limit of notebook output size in kilobytes (KB) where notebook files will no longer be backed up for hot reload. Use 0 for unlimited."
             )),
             type: 'number',

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js

@@ -10,10 +10,13 @@ import { GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
 let NotebookEditorWidgetService = class NotebookEditorWidgetService {
-    constructor(editorGroupService, editorService, contextKeyService) {
+    constructor(editorGroupService, editorService, contextKeyService, instantiationService) {
         this.editorGroupService = editorGroupService;
+        this.instantiationService = instantiationService;
         this._tokenPool = 1;
         this._disposables = ( new DisposableStore());
         this._notebookEditors = ( new Map());
@@ -140,9 +143,14 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
     retrieveWidget(accessor, group, input, creationOptions, initialDimension, codeWindow) {
         let value = this._borrowableEditors.get(group.id)?.get(input.resource);
         if (!value) {
-            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);
@@ -187,7 +195,8 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
 NotebookEditorWidgetService = ( __decorate([
     ( __param(0, IEditorGroupsService)),
     ( __param(1, IEditorService)),
-    ( __param(2, IContextKeyService))
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IInstantiationService))
 ], NotebookEditorWidgetService));
 
 export { NotebookEditorWidgetService };

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js

@@ -33,7 +33,7 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         const selectedKernel = allAvailableKernels.selected;
         const suggested = allAvailableKernels.all.length === 1 ? allAvailableKernels.all[0] : undefined;
         this._notebookLoggingService.debug('History', `getMatchingKernels: ${allAvailableKernels.all.length} kernels available for ${notebook.uri.path}. Selected: ${allAvailableKernels.selected?.label}. Suggested: ${suggested?.label}`);
-        const mostRecentKernelIds = this._mostRecentKernelsMap[notebook.viewType] ? [...( (this._mostRecentKernelsMap[notebook.viewType].values()))] : [];
+        const mostRecentKernelIds = this._mostRecentKernelsMap[notebook.notebookType] ? [...( (this._mostRecentKernelsMap[notebook.notebookType].values()))] : [];
         const all = ( (mostRecentKernelIds.map(kernelId => allKernels.find(kernel => kernel.id === kernelId)))).filter(kernel => !!kernel);
         this._notebookLoggingService.debug('History', `mru: ${mostRecentKernelIds.length} kernels in history, ${all.length} registered already.`);
         return {

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.js

@@ -25,12 +25,12 @@ class KernelInfo {
 }
 class NotebookTextModelLikeId {
     static str(k) {
-        return `${k.viewType}/${( k.uri.toString())}`;
+        return `${k.notebookType}/${( k.uri.toString())}`;
     }
     static obj(s) {
         const idx = s.indexOf('/');
         return {
-            viewType: s.substring(0, idx),
+            notebookType: s.substring(0, idx),
             uri: ( URI.parse(s.substring(idx + 1)))
         };
     }
@@ -134,7 +134,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
         if (kernel.viewType === '*') {
             return 5;
         }
-        else if (kernel.viewType === notebook.viewType) {
+        else if (kernel.viewType === notebook.notebookType) {
             return 10;
         }
         else {
@@ -271,7 +271,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
                     const stateChangeListener = sourceAction.onDidChangeState(() => {
                         this._onDidChangeSourceActions.fire({
                             notebook: document.uri,
-                            viewType: document.viewType,
+                            viewType: document.notebookType,
                         });
                     });
                     sourceActions.push([sourceAction, stateChangeListener]);
@@ -279,7 +279,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
             });
             info.actions = sourceActions;
             this._kernelSources.set(id, info);
-            this._onDidChangeSourceActions.fire({ notebook: document.uri, viewType: document.viewType });
+            this._onDidChangeSourceActions.fire({ notebook: document.uri, viewType: document.notebookType });
         };
         this._kernelSourceActionsUpdates.get(id)?.dispose();
         this._kernelSourceActionsUpdates.set(id, sourceMenu.onDidChange(() => {
@@ -305,7 +305,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
         });
     }
     getKernelDetectionTasks(notebook) {
-        return this._kernelDetectionTasks.get(notebook.viewType) ?? [];
+        return this._kernelDetectionTasks.get(notebook.notebookType) ?? [];
     }
     registerKernelSourceActionProvider(viewType, provider) {
         const providers = this._kernelSourceActionProviders.get(viewType) ?? [];
@@ -326,7 +326,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
         });
     }
     getKernelSourceActions2(notebook) {
-        const viewType = notebook.viewType;
+        const viewType = notebook.notebookType;
         const providers = this._kernelSourceActionProviders.get(viewType) ?? [];
         const promises = ( providers.map(provider => provider.provideKernelSourceActions()));
         return Promise.all(promises).then(actions => {

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js

@@ -105,7 +105,6 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
                     selectors: notebookContribution.selector || [],
                     priority: this._convertPriority(notebookContribution.priority),
                     providerDisplayName: extension.description.displayName ?? extension.description.identifier.value,
-                    exclusive: false
                 }))));
             }
         }
@@ -135,7 +134,7 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
                 id: notebookProviderInfo.id,
                 label: notebookProviderInfo.displayName,
                 detail: notebookProviderInfo.providerDisplayName,
-                priority: notebookProviderInfo.exclusive ? RegisteredEditorPriority.exclusive : notebookProviderInfo.priority,
+                priority: notebookProviderInfo.priority,
             };
             const notebookEditorOptions = {
                 canHandleDiff: () => !!this._configurationService.getValue(NotebookSetting.textDiffEditorPreview) && !this._accessibilityService.isScreenReaderOptimized(),
@@ -157,7 +156,7 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
                 if (!cellOptions) {
                     cellOptions = options?.cellOptions;
                 }
-                const notebookOptions = { ...options, cellOptions };
+                const notebookOptions = { ...options, cellOptions, viewState: undefined };
                 const editor = NotebookEditorInput.getOrCreate(this._instantiationService, notebookUri, preferredResource, notebookProviderInfo.id);
                 return { editor, options: notebookOptions };
             };
@@ -516,8 +515,7 @@ let NotebookService = class NotebookService extends Disposable {
             id: viewType,
             displayName: data.displayName,
             providerDisplayName: data.providerDisplayName,
-            exclusive: data.exclusive,
-            priority: RegisteredEditorPriority.default,
+            priority: data.priority || RegisteredEditorPriority.default,
             selectors: []
         })));
         info.update({ selectors: data.filenamePattern });
@@ -565,6 +563,13 @@ let NotebookService = class NotebookService extends Disposable {
         }
         return result;
     }
+    tryGetDataProviderSync(viewType) {
+        const selected = this.notebookProviderInfoStore.get(viewType);
+        if (!selected) {
+            return undefined;
+        }
+        return this._notebookProviders.get(selected.id);
+    }
     _persistMementos() {
         this._memento.saveMemento();
     }

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js

@@ -154,6 +154,9 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     get alternativeVersionId() {
         return this._alternativeVersionId;
     }
+    get notebookType() {
+        return this.viewType;
+    }
     constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService) {
         super();
         this.viewType = viewType;

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.js

@@ -46,7 +46,7 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
     isDirty(resource) {
         return this._dirtyStates.get(resource) ?? false;
     }
-    async createReferencedObject(key, viewType, hasAssociatedFilePath, limits) {
+    async createReferencedObject(key, viewType, hasAssociatedFilePath, limits, isScratchpad) {
         this.modelsToDispose.delete(key);
         const uri = ( URI.parse(key));
         const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(viewType);
@@ -56,13 +56,14 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
                 viewType,
                 this._notebookService,
                 this._configurationService,
-                this._telemetryService
+                this._telemetryService,
+                this._logService
             ));
             workingCopyManager = this._instantiationService.createInstance(FileWorkingCopyManager, workingCopyTypeId, factory, factory);
             this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
         }
-        const scratchPad = viewType === 'interactive' && this._configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true;
-        const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager, scratchPad);
+        const isScratchpadView = isScratchpad || (viewType === 'interactive' && this._configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true);
+        const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager, isScratchpadView);
         const result = await model.load({ limits });
         let onDirtyAutoReference;
         this._modelListener.set(result, combinedDisposable(result.onDidSave(() => this._onDidSaveNotebook.fire(result.resource)), result.onDidChangeDirty(() => {
@@ -130,7 +131,7 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
     isDirty(resource) {
         return this._data.isDirty(resource);
     }
-    async resolve(arg0, viewType, limits) {
+    async resolve(arg0, viewType, options) {
         let resource;
         let hasAssociatedFilePath = false;
         if (URI.isUri(arg0)) {
@@ -173,8 +174,9 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
             else {
                 await this._extensionService.whenInstalledExtensionsRegistered();
                 const providers = this._notebookService.getContributedNotebookTypes(resource);
-                const exclusiveProvider = providers.find(provider => provider.exclusive);
-                viewType = exclusiveProvider?.id || providers[0]?.id;
+                viewType = providers.find(provider => provider.priority === 'exclusive')?.id ??
+                    providers.find(provider => provider.priority === 'default')?.id ??
+                    providers[0]?.id;
             }
         }
         if (!viewType) {
@@ -189,7 +191,7 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
                 ));
             }
         }
-        const reference = this._data.acquire(( resource.toString()), viewType, hasAssociatedFilePath, limits);
+        const reference = this._data.acquire(( resource.toString()), viewType, hasAssociatedFilePath, options?.limits, options?.scratchpad);
         try {
             const model = await reference.object;
             return {

package/vscode/src/vs/workbench/contrib/notebook/common/notebookProvider.js

@@ -19,7 +19,6 @@ class NotebookProviderInfo {
         })) || [];
         this.priority = descriptor.priority;
         this.providerDisplayName = descriptor.providerDisplayName;
-        this.exclusive = descriptor.exclusive;
         this._options = {
             transientCellMetadata: {},
             transientDocumentMetadata: {},

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js

@@ -42,6 +42,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
 var FileWorkingCopyManager_1;
 const _moduleId = "vs/workbench/services/workingCopy/common/fileWorkingCopyManager";
@@ -49,7 +50,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
     static { FileWorkingCopyManager_1 = this; }
     static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localizeWithPath(_moduleId, 0, "File Created"))); }
     static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localizeWithPath(_moduleId, 1, "File Replaced"))); }
-    constructor(workingCopyTypeId, storedWorkingCopyModelFactory, untitledWorkingCopyModelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, fileDialogService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService, pathService, environmentService, dialogService, decorationsService) {
+    constructor(workingCopyTypeId, storedWorkingCopyModelFactory, untitledWorkingCopyModelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, fileDialogService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService, pathService, environmentService, dialogService, decorationsService, progressService) {
         super();
         this.workingCopyTypeId = workingCopyTypeId;
         this.storedWorkingCopyModelFactory = storedWorkingCopyModelFactory;
@@ -79,7 +80,8 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             notificationService,
             workingCopyEditorService,
             editorService,
-            elevatedFileService
+            elevatedFileService,
+            progressService
         ))));
         this.untitled = this._register(( (new UntitledFileWorkingCopyManager(
             this.workingCopyTypeId,
@@ -346,7 +348,8 @@ FileWorkingCopyManager = FileWorkingCopyManager_1 = ( (__decorate([
     ( (__param(17, IPathService))),
     ( (__param(18, IWorkbenchEnvironmentService))),
     ( (__param(19, IDialogService))),
-    ( (__param(20, IDecorationsService)))
+    ( (__param(20, IDecorationsService))),
+    ( (__param(21, IProgressService)))
 ], FileWorkingCopyManager)));
 
 export { FileWorkingCopyManager };

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js

@@ -26,10 +26,11 @@ import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/working
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { SnapshotContext } from 'vscode/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
 const _moduleId = "vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager";
 let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends BaseFileWorkingCopyManager {
-    constructor(workingCopyTypeId, modelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService) {
+    constructor(workingCopyTypeId, modelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService, progressService) {
         super(fileService, logService, workingCopyBackupService);
         this.workingCopyTypeId = workingCopyTypeId;
         this.modelFactory = modelFactory;
@@ -43,6 +44,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         this.workingCopyEditorService = workingCopyEditorService;
         this.editorService = editorService;
         this.elevatedFileService = elevatedFileService;
+        this.progressService = progressService;
         this._onDidResolve = this._register(( (new Emitter())));
         this.onDidResolve = this._onDidResolve.event;
         this._onDidChangeDirty = this._register(( (new Emitter())));
@@ -289,7 +291,8 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                 this.notificationService,
                 this.workingCopyEditorService,
                 this.editorService,
-                this.elevatedFileService
+                this.elevatedFileService,
+                this.progressService
             )));
             workingCopyResolve = workingCopy.resolve(resolveOptions);
             this.registerWorkingCopy(workingCopy);
@@ -402,7 +405,8 @@ StoredFileWorkingCopyManager = ( (__decorate([
     ( (__param(11, INotificationService))),
     ( (__param(12, IWorkingCopyEditorService))),
     ( (__param(13, IEditorService))),
-    ( (__param(14, IElevatedFileService)))
+    ( (__param(14, IElevatedFileService))),
+    ( (__param(15, IProgressService)))
 ], StoredFileWorkingCopyManager)));
 
 export { StoredFileWorkingCopyManager };