@codingame/monaco-vscode-notebook-service-override 22.1.9 → 23.0.0

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

@@ -17,9 +17,10 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 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-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 { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditType, 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 { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.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';
@@ -178,7 +179,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     get notebookType() {
         return this.viewType;
     }
-    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService, _notebookExecutionStateService) {
+    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService, _notebookExecutionStateService, _notebookLoggingService) {
         super();
         this.viewType = viewType;
         this.uri = uri;
@@ -187,6 +188,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._languageService = _languageService;
         this._languageDetectionService = _languageDetectionService;
         this._notebookExecutionStateService = _notebookExecutionStateService;
+        this._notebookLoggingService = _notebookLoggingService;
         this._isDisposed = false;
         this._onWillDispose = this._register(( new Emitter()));
         this._onWillAddRemoveCells = this._register(( new Emitter()));
@@ -221,7 +223,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             }
         };
         this._register(_modelService.onModelAdded(e => maybeUpdateCellTextModel(e)));
-        this._pauseableEmitter = ( new NotebookEventEmitter({
+        this._pauseableEmitter = this._register(( new NotebookEventEmitter({
             merge: (events) => {
                 const first = events[0];
                 const rawEvents = first.rawEvents;
@@ -236,7 +238,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 }
                 return { rawEvents, versionId, endSelectionState, synchronous };
             }
-        }));
+        })));
         this._register(this._pauseableEmitter.event(e => {
             if (e.rawEvents.length) {
                 this._onDidChangeContent.fire(e);
@@ -251,6 +253,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._overwriteAlternativeVersionId(alternativeVersionId);
             }
         ));
+        this._notebookLoggingService.trace('notebookTextModel', `Initialized notebook text model for ${( uri.toString())}`);
     }
     setCellCollapseDefault(collapseConfig) {
         this._defaultCollapseConfig = collapseConfig;
@@ -262,22 +265,16 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const mainCells = ( cells.map(cell => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
-            const collapseState = this._getDefaultCollapseState(cell);
             return ( new NotebookCellTextModel(
                 cellUri,
                 cellHandle,
-                cell.source,
-                cell.language,
-                cell.mime,
-                cell.cellKind,
-                cell.outputs,
-                cell.metadata,
-                cell.internalMetadata,
-                collapseState,
+                cell,
                 this.transientOptions,
                 this._languageService,
                 this._modelService.getCreationOptions(cell.language, cellUri, false).defaultEOL,
-                this._languageDetectionService
+                this._defaultCollapseConfig,
+                this._languageDetectionService,
+                this._notebookLoggingService
             ));
         }));
         for (let i = 0; i < mainCells.length; i++) {
@@ -514,6 +511,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         return true;
     }
     applyEdits(rawEdits, synchronous, beginSelectionState, endSelectionsComputer, undoRedoGroup, computeUndoRedo) {
+        this._notebookLoggingService.trace('textModelEdits', `Begin applying ${rawEdits.length} raw edits`);
         this._pauseableEmitter.pause();
         try {
             this._operationManager.pushStackElement(this._alternativeVersionId, undefined);
@@ -529,12 +527,17 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
                 return true;
             }
+            catch (err) {
+                this._notebookLoggingService.error('textModelEdits', `Error while applying edits: ${err}`);
+                throw err;
+            }
             finally {
                 if (!this._pauseableEmitter.isEmpty) {
                     const endSelections = endSelectionsComputer();
                     this._increaseVersionId(this._operationManager.isUndoStackEmpty() && !this._pauseableEmitter.isDirtyEvent());
                     this._operationManager.pushStackElement(this._alternativeVersionId, endSelections);
                     this._pauseableEmitter.fire({ rawEvents: [], versionId: this.versionId, synchronous: synchronous, endSelectionState: endSelections });
+                    this._notebookLoggingService.trace('textModelEdits', `End applying ${rawEdits.length} raw edits`);
                 }
             }
         }
@@ -562,7 +565,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 }
             }
             else if (edit.editType !== CellEditType.DocumentMetadata) {
-                throw ( new Error('Invalid cell edit'));
+                throw ( new Error('Invalid cell edit: ' + JSON.stringify(edit)));
             }
             return {
                 edit,
@@ -695,10 +698,6 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         });
         return mergedEdits;
     }
-    _getDefaultCollapseState(cellDto) {
-        const defaultConfig = cellDto.cellKind === CellKind.Code ? this._defaultCollapseConfig?.codeCell : this._defaultCollapseConfig?.markupCell;
-        return cellDto.collapseState ?? (defaultConfig ?? undefined);
-    }
     _replaceCells(index, count, cellDtos, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         if (count === 0 && cellDtos.length === 0) {
             return;
@@ -716,22 +715,19 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const cells = ( cellDtos.map(cellDto => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
-            const collapseState = this._getDefaultCollapseState(cellDto);
+            if (!cellDto.outputs) {
+                cellDto.outputs = [];
+            }
             const cell = ( new NotebookCellTextModel(
                 cellUri,
                 cellHandle,
-                cellDto.source,
-                cellDto.language,
-                cellDto.mime,
-                cellDto.cellKind,
-                cellDto.outputs || [],
-                cellDto.metadata,
-                cellDto.internalMetadata,
-                collapseState,
+                cellDto,
                 this.transientOptions,
                 this._languageService,
                 this._modelService.getCreationOptions(cellDto.language, cellUri, false).defaultEOL,
-                this._languageDetectionService
+                this._defaultCollapseConfig,
+                this._languageDetectionService,
+                this._notebookLoggingService
             ));
             const textModel = this._modelService.getModel(cellUri);
             if (textModel && textModel instanceof TextModel) {
@@ -1165,7 +1161,8 @@ NotebookTextModel = NotebookTextModel_1 = ( __decorate([
     ( __param(6, IModelService)),
     ( __param(7, ILanguageService)),
     ( __param(8, ILanguageDetectionService)),
-    ( __param(9, INotebookExecutionStateService))
+    ( __param(9, INotebookExecutionStateService)),
+    ( __param(10, INotebookLoggingService))
 ], NotebookTextModel));
 class OutputSequence {
     constructor(outputs) {

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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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/notebookOutputRenderer.js

@@ -33,7 +33,7 @@ class NotebookOutputRendererInfo {
         }
         this.displayName = descriptor.displayName;
         this.mimeTypes = descriptor.mimeTypes;
-        this.mimeTypeGlobs = ( this.mimeTypes.map(pattern => parse(pattern)));
+        this.mimeTypeGlobs = ( this.mimeTypes.map(pattern => parse(pattern, { ignoreCase: true })));
         this.hardDependencies = ( new DependencyList(descriptor.dependencies ?? Iterable.empty()));
         this.optionalDependencies = ( new DependencyList(descriptor.optionalDependencies ?? Iterable.empty()));
         this.messaging = descriptor.requiresMessaging ?? RendererMessagingSpec.Never;

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

@@ -1,5 +1,5 @@
 
-import { match, isRelativePattern } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
+import { isRelativePattern, match } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { isDocumentExcludePattern } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
@@ -41,13 +41,8 @@ class NotebookProviderInfo {
         return this.selectors?.some(selector => NotebookProviderInfo.selectorMatches(selector, resource));
     }
     static selectorMatches(selector, resource) {
-        if (typeof selector === 'string') {
-            if (match(selector.toLowerCase(), basename(resource.fsPath).toLowerCase())) {
-                return true;
-            }
-        }
-        if (isRelativePattern(selector)) {
-            if (match(selector, basename(resource.fsPath).toLowerCase())) {
+        if (typeof selector === 'string' || isRelativePattern(selector)) {
+            if (match(selector, basename(resource.fsPath), { ignoreCase: true })) {
                 return true;
             }
         }
@@ -56,9 +51,9 @@ class NotebookProviderInfo {
         }
         const filenamePattern = selector.include;
         const excludeFilenamePattern = selector.exclude;
-        if (match(filenamePattern, basename(resource.fsPath).toLowerCase())) {
+        if (match(filenamePattern, basename(resource.fsPath), { ignoreCase: true })) {
             if (excludeFilenamePattern) {
-                if (match(excludeFilenamePattern, basename(resource.fsPath).toLowerCase())) {
+                if (match(excludeFilenamePattern, basename(resource.fsPath), { ignoreCase: true })) {
                     return false;
                 }
             }

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

@@ -33,7 +33,7 @@ declare class MirrorNotebookDocument {
     _spliceNotebookCells(splices: NotebookCellTextModelSplice<IMainCellDto>[]): void;
 }
 export declare class NotebookWorker implements IWebWorkerServerRequestHandler, IDisposable {
-    _requestHandlerBrand: any;
+    _requestHandlerBrand: void;
     private _models;
     constructor();
     dispose(): void;

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

@@ -141,6 +141,7 @@ class CellSequence {
 }
 class NotebookWorker {
     constructor() {
+        this._requestHandlerBrand = undefined;
         this._models = Object.create(null);
     }
     dispose() {
@@ -178,7 +179,7 @@ class NotebookWorker {
             };
         }
         const cellMapping = computeDiff(originalModel, modifiedModel, { cellsDiff: { changes: originalDiff.changes, quitEarly: false }}).cellDiffInfo;
-        if (cellMapping.every(c => c.type === 'modified')) {
+        if (cellMapping.every(c => c.type === 'modified' || c.type === 'unchanged')) {
             return {
                 metadataChanged,
                 cellsDiff: originalDiff

package/vscode/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.js

@@ -30,10 +30,10 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IWorkingCopyEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { getReplView } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/repl';
 import { REPL_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
-import { InlineChatController } from '@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IInteractiveHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service';
 import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { executeIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
@@ -186,7 +186,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.focusLastItemExecuted',
-            title: ( localize2(9979, 'Focus Most Recent REPL Execution')),
+            title: ( localize2(10228, 'Focus Most Recent REPL Execution')),
             category: 'REPL',
             menu: {
                 id: MenuId.CommandPalette,
@@ -237,7 +237,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.input.focus',
-            title: ( localize2(9980, 'Focus Input Editor')),
+            title: ( localize2(10229, 'Focus Input Editor')),
             category: 'REPL',
             menu: {
                 id: MenuId.CommandPalette,
@@ -278,7 +278,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.execute',
-            title: ( localize2(9981, 'Execute REPL input')),
+            title: ( localize2(10230, 'Execute REPL input')),
             category: 'REPL',
             keybinding: [{
                     when: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl')), ( NOTEBOOK_CELL_LIST_FOCUSED.negate()))),

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditorAccessibilityHelp.js

@@ -20,34 +20,34 @@ class ReplEditorInputAccessibilityHelp {
 function getAccessibilityInputHelpText() {
     return [
         ( localize(
-        9983,
+        10232,
         'You are in a REPL Editor Input box which will accept code to be executed in the REPL.'
     )),
         ( localize(
-        9984,
+        10233,
         'The Execute command{0} will evaluate the expression in the input box.',
         '<keybinding:repl.execute>'
     )),
         ( localize(
-        9985,
+        10234,
         'The setting `accessibility.replEditor.readLastExecutionOutput` controls if output will be automatically read when execution completes.'
     )),
         ( localize(
-        9986,
+        10235,
         'The setting `accessibility.replEditor.autoFocusReplExecution` controls if focus will automatically move to the REPL after executing code.'
     )),
         ( localize(
-        9987,
+        10236,
         'The Focus Last executed command{0} will move focus to the last executed item in the REPL history.',
         '<keybinding:repl.focusLastItemExecuted>'
     )),
         ( localize(
-        9988,
+        10237,
         'When you run the Open Accessbility View command{0} from this input box, the output from the last execution will be shown in the accessibility view.',
         '<keybinding:editor.action.accessibleView>'
     )),
         ( localize(
-        9989,
+        10238,
         'The Focus Input Editor command{0} will bring the focus back to this editor.',
         '<keybinding:repl.input.focus>'
     )),
@@ -67,36 +67,36 @@ class ReplEditorHistoryAccessibilityHelp {
 function getAccessibilityHistoryHelpText() {
     return [
         ( localize(
-        9990,
+        10239,
         'You are in a REPL History which is a list of cells that have been executed in the REPL. Each cell has an input, an output, and the cell container.'
     )),
         ( localize(
-        9991,
+        10240,
         'The Edit Cell command{0} will move focus to the read-only editor for the input of the cell.',
         '<keybinding:notebook.cell.edit>'
     )),
         ( localize(
-        9992,
+        10241,
         'The Quit Edit command{0} will move focus to the cell container, where the up and down arrows will also move focus between cells in the history.',
         '<keybinding:notebook.cell.quitEdit>'
     )),
         ( localize(
-        9993,
+        10242,
         'Run the Open Accessbility View command{0} while navigating the history for an accessible view of the item\'s output.',
         '<keybinding:editor.action.accessibleView>'
     )),
         ( localize(
-        9994,
+        10243,
         'The Focus Output command{0} will set focus on the output when focused on a previously executed item.',
         '<keybinding:notebook.cell.focusInOutput>'
     )),
         ( localize(
-        9995,
+        10244,
         'The Focus Input Editor command{0} will move focus to the REPL input box.',
         '<keybinding:repl.input.focus>'
     )),
         ( localize(
-        9987,
+        10236,
         'The Focus Last executed command{0} will move focus to the last executed item in the REPL history.',
         '<keybinding:repl.focusLastItemExecuted>'
     )),

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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopy, IFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 export interface IBaseFileWorkingCopyManager<M extends IFileWorkingCopyModel, W extends IFileWorkingCopy<M>> extends IDisposable {
     /**
      * An event for when a file working copy was created.

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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopy } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopyState } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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(14103, "File Created"))); }
-    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(14104, "File Replaced"))); }
+    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(14401, "File Created"))); }
+    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(14402, "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;
@@ -88,7 +88,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             this.untitledWorkingCopyModelFactory,
             async (workingCopy, options) => {
                 const result = await this.saveAs(workingCopy.resource, undefined, options);
-                return result ? true : false;
+                return !!result;
             },
             fileService,
             labelService,
@@ -104,7 +104,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             constructor(stored) {
                 super();
                 this.stored = stored;
-                this.label = ( localize(14105, "File Working Copy Decorations"));
+                this.label = ( localize(14403, "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(14106, "Deleted, Read-only")),
+                        tooltip: ( localize(14404, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(14107, "Read-only")),
+                        tooltip: ( localize(14405, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(14108, "Deleted")),
+                        tooltip: ( localize(14406, "Deleted")),
                     };
                 }
                 return undefined;
@@ -279,17 +279,17 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                14109,
+                14407,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                14110,
+                14408,
                 "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(14111, "&&Replace"))
+            primaryButton: ( localize(14409, "&&Replace"))
         });
         return confirmed;
     }
@@ -297,12 +297,12 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                14112,
+                14410,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(14113, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(14114, "&&Save Anyway"))
+            detail: ( localize(14411, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(14412, "&&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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions, IStoredFileWorkingCopySaveEvent as IBaseStoredFileWorkingCopySaveEvent } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy';
+import { StoredFileWorkingCopyState, StoredFileWorkingCopy } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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(14132, "Saving working copies")) })));
+            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(14430, "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, WorkingCopyCapabilities } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-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 { IWorkingCopyBackup, IWorkingCopySaveEvent, WorkingCopyCapabilities } from "@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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-caeb744c-8e3f-5c11-80fb-0f057d24d544-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 { WorkingCopyCapabilities } from '@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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';