@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.d.ts

@@ -1,10 +1,10 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IOutlineModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel";
-import { ICellViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { OutlineEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
+import { IOutlineModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service";
+import { ICellViewModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { OutlineEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
-import { INotebookOutlineEntryFactory } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
+import { INotebookOutlineEntryFactory } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service";
 export declare enum NotebookOutlineConstants {
     NonHeaderOutlineLevel = 7
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js

@@ -18,16 +18,15 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dompurify/dompurify'
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/formattedTextRenderer';
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindings';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/folding/browser/foldingRanges';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
-import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 var NotebookOutlineConstants;
 (function (NotebookOutlineConstants) {

package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.d.ts

@@ -1,6 +1,6 @@
 import { IResourceUndoRedoElement, UndoRedoElementType } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ISelectionState, NotebookCellMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 export interface ITextCellEditingDelegate {
     insertCell?(index: number, cell: NotebookCellTextModel, endSelections?: ISelectionState): void;

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

@@ -2,15 +2,15 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { FindMatch } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { UndoRedoGroup } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
 import { ILanguageDetectionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service";
 import { ICellDto2, ICellEditOperation, INotebookSnapshotOptions, INotebookTextModel, ISelectionState, NotebookCellDefaultCollapseConfig, NotebookData, NotebookDocumentMetadata, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 export declare class NotebookTextModel extends Disposable implements INotebookTextModel {
     readonly viewType: string;
     readonly uri: URI;

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

@@ -10,19 +10,19 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { TextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { SearchParams } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelSearch';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo';
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { ILanguageDetectionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
-import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditType, CellKind, diff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
-import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
-import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
+import { NotebookCellTextModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 
 var NotebookTextModel_1;
 class StackOperation {

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { NotebookWorkingCopyTypeIdentifier, NotebookSetting, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { ReferenceCollection, DisposableStore, dispose, combinedDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { Emitter, AsyncEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/contrib/notebook/common/notebookProvider.d.ts

@@ -21,7 +21,7 @@ export declare class NotebookProviderInfo {
     readonly displayName: string;
     readonly priority: RegisteredEditorPriority;
     readonly providerDisplayName: string;
-    private _selectors;
+    _selectors: NotebookSelector[];
     get selectors(): NotebookSelector[];
     private _options;
     get options(): TransientOptions;

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

@@ -17,7 +17,9 @@ class NotebookProviderInfo {
         this._selectors = descriptor.selectors?.map(selector => ({
             include: selector.filenamePattern,
             exclude: selector.excludeFileNamePattern || ''
-        })) || [];
+        }))
+            || descriptor._selectors
+            || [];
         this.priority = descriptor.priority;
         this.providerDisplayName = descriptor.providerDisplayName;
         this._options = {

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js

@@ -39,7 +39,7 @@ class MirrorCell {
         hashValue = doHash(this.language, hashValue);
         hashValue = doHash(this.getValue(), hashValue);
         hashValue = doHash(this.metadata, hashValue);
-        hashValue = doHash(this.internalMetadata, hashValue);
+        hashValue = doHash({ ...this.internalMetadata, 'cellId': '' }, hashValue);
         for (const op of this.outputs) {
             hashValue = doHash(op.metadata, hashValue);
             for (const output of op.outputs) {
@@ -139,7 +139,7 @@ class NotebookEditorSimpleWorker {
     dispose() {
     }
     $acceptNewModel(uri, metadata, transientDocumentMetadata, cells) {
-        this._models[uri] = ( new MirrorNotebookDocument(( URI.parse(uri)), ( cells.map(dto => ( new MirrorCell(dto.handle, ( URI.parse(dto.url)), dto.source, dto.eol, dto.versionId, dto.language, dto.cellKind, dto.outputs, dto.metadata)))), metadata, transientDocumentMetadata));
+        this._models[uri] = ( new MirrorNotebookDocument(( URI.parse(uri)), ( cells.map(dto => ( new MirrorCell(dto.handle, ( URI.parse(dto.url)), dto.source, dto.eol, dto.versionId, dto.language, dto.cellKind, dto.outputs, dto.metadata, dto.internalMetadata)))), metadata, transientDocumentMetadata));
     }
     $acceptModelChanged(strURL, event) {
         const model = this._models[strURL];
@@ -168,13 +168,17 @@ class NotebookEditorSimpleWorker {
         const modifiedMetadata = filter(modified.metadata, key => !modified.transientDocumentMetadata[key]);
         return {
             metadataChanged: JSON.stringify(originalMetadata) !== JSON.stringify(modifiedMetadata),
-            cellsDiff: diffResult,
+            cellsDiff: (await this.$computeDiffWithCellIds(original, modified)) || diffResult,
         };
     }
     async $computeDiffWithCellIds(original, modified) {
-        const originalCellIds = ( original.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') })));
-        const modifiedCellIds = ( modified.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') })));
-        if (( originalCellIds.some(c => !c.id)) || ( modifiedCellIds.some(c => !c.id))) {
+        const originalCellIndexIds = ( original.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') })));
+        const modifiedCellIndexIds = ( modified.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') })));
+        const originalCellIds = ( originalCellIndexIds.map(c => c.id));
+        const modifiedCellIds = ( modifiedCellIndexIds.map(c => c.id));
+        const orderOrOriginalCellIds = originalCellIds.filter(id => modifiedCellIds.includes(id)).join(',');
+        const orderOrModifiedCellIds = modifiedCellIds.filter(id => originalCellIds.includes(id)).join(',');
+        if (( originalCellIndexIds.some(c => !c.id)) || ( modifiedCellIndexIds.some(c => !c.id)) || orderOrOriginalCellIds !== orderOrModifiedCellIds) {
             return;
         }
         const diffResult = { changes: [], quitEarly: false, };
@@ -188,12 +192,12 @@ class NotebookEditorSimpleWorker {
             return hashValue;
         };
         const [originalSeq, modifiedSeq] = await Promise.all([computeCellHashesById(original), computeCellHashesById(modified)]);
-        while (modifiedCellIds.length) {
-            const modifiedCell = modifiedCellIds.shift();
-            const originalCell = originalCellIds.find(c => c.id === modifiedCell.id);
+        while (modifiedCellIndexIds.length) {
+            const modifiedCell = modifiedCellIndexIds.shift();
+            const originalCell = originalCellIndexIds.find(c => c.id === modifiedCell.id);
             if (originalCell) {
-                const index = originalCellIds.indexOf(originalCell);
-                const deletedFromOriginal = originalCellIds.splice(0, index + 1);
+                const index = originalCellIndexIds.indexOf(originalCell);
+                const deletedFromOriginal = originalCellIndexIds.splice(0, index + 1);
                 if (deletedFromOriginal.length === 1) {
                     if (originalSeq.get(originalCell.id) === modifiedSeq.get(originalCell.id)) ;
                     else {
@@ -217,18 +221,18 @@ class NotebookEditorSimpleWorker {
             }
             else {
                 diffResult.changes.push({
-                    originalStart: originalCellIds.length ? originalCellIds[0].index : original.cells.length,
+                    originalStart: originalCellIndexIds.length ? originalCellIndexIds[0].index : original.cells.length,
                     originalLength: 0,
                     modifiedStart: modifiedCell.index,
                     modifiedLength: 1
                 });
             }
         }
-        if (originalCellIds.length) {
+        if (originalCellIndexIds.length) {
             diffResult.changes.push({
-                originalStart: originalCellIds[0].index,
-                originalLength: originalCellIds.length,
-                modifiedStart: modifiedCellIds.length,
+                originalStart: originalCellIndexIds[0].index,
+                originalLength: originalCellIndexIds.length,
+                modifiedStart: modifiedCellIndexIds.length,
                 modifiedLength: 0
             });
         }

package/vscode/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.d.ts

@@ -4,7 +4,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkingCopyBackupService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service";
-import { IFileWorkingCopy, IFileWorkingCopyModel } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopy, IFileWorkingCopyModel } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 export interface IBaseFileWorkingCopyManager<M extends IFileWorkingCopyModel, W extends IFileWorkingCopy<M>> extends IDisposable {
     readonly onDidCreate: Event<W>;
     readonly workingCopies: readonly W[];

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.d.ts

@@ -8,13 +8,13 @@ import { ISaveOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IStoredFileWorkingCopyManager, IStoredFileWorkingCopyManagerResolveOptions } from "./storedFileWorkingCopyManager.js";
 import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelFactory } from "./untitledFileWorkingCopy.js";
 import { INewOrExistingUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyWithAssociatedResourceOptions, IUntitledFileWorkingCopyManager } from "./untitledFileWorkingCopyManager.js";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 import { IBaseFileWorkingCopyManager } from "./abstractFileWorkingCopyManager.js";
-import { IFileWorkingCopy } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopy } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";

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

@@ -13,12 +13,12 @@ import { SaveSourceRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { StoredFileWorkingCopyState } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopyState } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
 import { StoredFileWorkingCopyManager } from './storedFileWorkingCopyManager.js';
 import { UntitledFileWorkingCopy } from './untitledFileWorkingCopy.js';
 import { UntitledFileWorkingCopyManager } from './untitledFileWorkingCopyManager.js';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
@@ -48,8 +48,8 @@ import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 var FileWorkingCopyManager_1;
 let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
     static { FileWorkingCopyManager_1 = this; }
-    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(12317, "File Created"))); }
-    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(12318, "File Replaced"))); }
+    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(12429, "File Created"))); }
+    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(12430, "File Replaced"))); }
     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;
@@ -104,7 +104,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             constructor(stored) {
                 super();
                 this.stored = stored;
-                this.label = ( localize(12319, "File Working Copy Decorations"));
+                this.label = ( localize(12431, "File Working Copy Decorations"));
                 this._onDidChange = this._register(( new Emitter()));
                 this.onDidChange = this._onDidChange.event;
                 this.registerListeners();
@@ -131,20 +131,20 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
                         color: listErrorForeground,
                         letter: Codicon.lockSmall,
                         strikethrough: true,
-                        tooltip: ( localize(12320, "Deleted, Read-only")),
+                        tooltip: ( localize(12432, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(12321, "Read-only")),
+                        tooltip: ( localize(12433, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(12322, "Deleted")),
+                        tooltip: ( localize(12434, "Deleted")),
                     };
                 }
                 return undefined;
@@ -279,17 +279,17 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                12323,
+                12435,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                12324,
+                12436,
                 "A file or folder with the name '{0}' already exists in the folder '{1}'. Replacing it will overwrite its current contents.",
                 basename(resource),
                 basename(dirname(resource))
             )),
-            primaryButton: ( localize(12325, "&&Replace"))
+            primaryButton: ( localize(12437, "&&Replace"))
         });
         return confirmed;
     }
@@ -297,12 +297,12 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                12326,
+                12438,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(12327, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(12328, "&&Save Anyway"))
+            detail: ( localize(12439, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(12440, "&&Save Anyway"))
         });
         return confirmed;
     }

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.d.ts

@@ -1,5 +1,5 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, IStoredFileWorkingCopySaveEvent as IBaseStoredFileWorkingCopySaveEvent } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, IStoredFileWorkingCopySaveEvent as IBaseStoredFileWorkingCopySaveEvent } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { StoredFileWorkingCopyState, StoredFileWorkingCopy } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopyState, StoredFileWorkingCopy } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { ResourceQueue, Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { FileChangeType, FileOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
@@ -26,7 +26,7 @@ import { IWorkingCopyEditorService } from '@codingame/monaco-vscode-api/vscode/v
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 
 let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends BaseFileWorkingCopyManager {
@@ -78,7 +78,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
             this._register(this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdownWeb(), 'veto.fileWorkingCopyManager')));
         }
         else {
-            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(12346, "Saving working copies")) })));
+            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(12458, "Saving working copies")) })));
         }
     }
     onBeforeShutdownWeb() {

package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
-import { IWorkingCopyBackup, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
-import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory } from "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IWorkingCopyBackup, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IWorkingCopyService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";

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

@@ -1,8 +1,8 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { WorkingCopyCapabilities } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
-import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { WorkingCopyCapabilities } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';