@codingame/monaco-vscode-notebook-service-override 13.1.7 → 14.0.1

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

@@ -18,7 +18,7 @@ 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-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-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(12094, "File Created"))); }
-    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(12095, "File Replaced"))); }
+    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(12316, "File Created"))); }
+    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(12317, "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(12096, "File Working Copy Decorations"));
+                this.label = ( localize(12318, "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(12097, "Deleted, Read-only")),
+                        tooltip: ( localize(12319, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(12098, "Read-only")),
+                        tooltip: ( localize(12320, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(12099, "Deleted")),
+                        tooltip: ( localize(12321, "Deleted")),
                     };
                 }
                 return undefined;
@@ -250,6 +250,9 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         catch (error) {
             this.logService.error(error);
         }
+        if (source.scheme === Schemas.untitled) {
+            this.untitled.notifyDidSave(source, target);
+        }
         return targetStoredFileWorkingCopy;
     }
     async doResolveSaveTarget(source, target) {
@@ -276,17 +279,17 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                12100,
+                12322,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                12101,
+                12323,
                 "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(12102, "&&Replace"))
+            primaryButton: ( localize(12324, "&&Replace"))
         });
         return confirmed;
     }
@@ -294,12 +297,12 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                12103,
+                12325,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(12104, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(12105, "&&Save Anyway"))
+            detail: ( localize(12326, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(12327, "&&Save Anyway"))
         });
         return confirmed;
     }

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

@@ -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-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-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(12123, "Saving working copies")) })));
+            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(12345, "Saving working copies")) })));
         }
     }
     onBeforeShutdownWeb() {
@@ -262,7 +262,9 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                             await workingCopy.resolve(resolveOptions);
                         }
                         catch (error) {
-                            onUnexpectedError(error);
+                            if (!workingCopy.isDisposed()) {
+                                onUnexpectedError(error);
+                            }
                         }
                     })();
                 }

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-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
-import { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelFactory } from "@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+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 { 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-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy';
-import { SnapshotContext } from '@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+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 { 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';

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

@@ -7,12 +7,18 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IWorkingCopyBackupService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { BaseFileWorkingCopyManager, IBaseFileWorkingCopyManager } from "./abstractFileWorkingCopyManager.js";
+export interface IUntitledFileWorkingCopySaveEvent {
+    readonly source: URI;
+    readonly target: URI;
+}
 export interface IUntitledFileWorkingCopyManager<M extends IUntitledFileWorkingCopyModel> extends IBaseFileWorkingCopyManager<M, IUntitledFileWorkingCopy<M>> {
+    readonly onDidSave: Event<IUntitledFileWorkingCopySaveEvent>;
     readonly onDidChangeDirty: Event<IUntitledFileWorkingCopy<M>>;
     readonly onWillDispose: Event<IUntitledFileWorkingCopy<M>>;
     resolve(options?: INewUntitledFileWorkingCopyOptions): Promise<IUntitledFileWorkingCopy<M>>;
     resolve(options?: INewUntitledFileWorkingCopyWithAssociatedResourceOptions): Promise<IUntitledFileWorkingCopy<M>>;
     resolve(options?: INewOrExistingUntitledFileWorkingCopyOptions): Promise<IUntitledFileWorkingCopy<M>>;
+    notifyDidSave(source: URI, target: URI): void;
 }
 export interface INewUntitledFileWorkingCopyOptions {
     contents?: IUntitledFileWorkingCopyInitialContents;
@@ -35,6 +41,8 @@ export declare class UntitledFileWorkingCopyManager<M extends IUntitledFileWorki
     private readonly saveDelegate;
     private readonly labelService;
     private readonly workingCopyService;
+    private readonly _onDidSave;
+    readonly onDidSave: Event<IUntitledFileWorkingCopySaveEvent>;
     private readonly _onDidChangeDirty;
     readonly onDidChangeDirty: Event<IUntitledFileWorkingCopy<M>>;
     private readonly _onWillDispose;
@@ -50,4 +58,5 @@ export declare class UntitledFileWorkingCopyManager<M extends IUntitledFileWorki
     private registerWorkingCopy;
     protected remove(resource: URI): boolean;
     dispose(): void;
+    notifyDidSave(source: URI, target: URI): void;
 }

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

@@ -21,6 +21,8 @@ let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extend
         this.saveDelegate = saveDelegate;
         this.labelService = labelService;
         this.workingCopyService = workingCopyService;
+        this._onDidSave = this._register(( new Emitter()));
+        this.onDidSave = this._onDidSave.event;
         this._onDidChangeDirty = this._register(( new Emitter()));
         this.onDidChangeDirty = this._onDidChangeDirty.event;
         this._onWillDispose = this._register(( new Emitter()));
@@ -118,6 +120,9 @@ let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extend
         dispose(( this.mapResourceToWorkingCopyListeners.values()));
         this.mapResourceToWorkingCopyListeners.clear();
     }
+    notifyDidSave(source, target) {
+        this._onDidSave.fire({ source, target });
+    }
 };
 UntitledFileWorkingCopyManager = ( __decorate([
     ( __param(3, IFileService)),