@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { FocusedViewContext, getVisbileViewContextKey } from '../../../common/contextkeys.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -10,6 +11,8 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { isString } from '../../../../base/common/types.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
@@ -17,6 +20,7 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { PaneCompositeDescriptor, Extensions, PaneComposite } from '../../../browser/panecomposite.js';
+import { Parts } from '../../layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.service.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
@@ -239,10 +243,10 @@ let ViewsService = class ViewsService extends Disposable {
                 if (view) {
                     if (activeViewPaneContainer.views.length === 1) {
                         const location = this.viewDescriptorService.getViewContainerLocation(viewContainer);
-                        if (location === 0 ) {
-                            this.layoutService.setPartHidden(true, "workbench.parts.sidebar" );
+                        if (location === ViewContainerLocation.Sidebar) {
+                            this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
                         }
-                        else if (location === 1  || location === 2 ) {
+                        else if (location === ViewContainerLocation.Panel || location === ViewContainerLocation.AuxiliaryBar) {
                             this.paneCompositeService.hideActivePaneComposite(location);
                         }
                         if (this.focusedViewContextKey.get() === id) {
@@ -306,7 +310,7 @@ let ViewsService = class ViewsService extends Disposable {
                             const viewContainerLocation = that.viewDescriptorService.getViewContainerLocation(viewContainer);
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
-                            if (viewContainerLocation === 0 ) {
+                            if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return { value: ( localizeWithPath(_moduleId, 1, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
@@ -315,7 +319,7 @@ let ViewsService = class ViewsService extends Disposable {
                         },
                         category: Categories.View,
                         precondition: ( (ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)))),
-                        keybinding: keybindings ? { ...keybindings, weight: 200  } : undefined,
+                        keybinding: keybindings ? { ...keybindings, weight: KeybindingWeight.WorkbenchContrib } : undefined,
                         f1: true
                     });
                 }
@@ -326,9 +330,9 @@ let ViewsService = class ViewsService extends Disposable {
                     const viewsService = serviceAccessor.get(IViewsService);
                     const viewContainerLocation = viewDescriptorService.getViewContainerLocation(viewContainer);
                     switch (viewContainerLocation) {
-                        case 2 :
-                        case 0 : {
-                            const part = viewContainerLocation === 0  ? "workbench.parts.sidebar"  : "workbench.parts.auxiliarybar" ;
+                        case ViewContainerLocation.AuxiliaryBar:
+                        case ViewContainerLocation.Sidebar: {
+                            const part = viewContainerLocation === ViewContainerLocation.Sidebar ? Parts.SIDEBAR_PART : Parts.AUXILIARYBAR_PART;
                             if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus(part)) {
                                 await viewsService.openViewContainer(viewContainer.id, true);
                             }
@@ -337,8 +341,8 @@ let ViewsService = class ViewsService extends Disposable {
                             }
                             break;
                         }
-                        case 1 :
-                            if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus("workbench.parts.panel" )) {
+                        case ViewContainerLocation.Panel:
+                            if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus(Parts.PANEL_PART)) {
                                 await viewsService.openViewContainer(viewContainer.id, true);
                             }
                             else {
@@ -355,7 +359,7 @@ let ViewsService = class ViewsService extends Disposable {
                         id,
                         title: mnemonicTitle,
                     },
-                    group: defaultLocation === 0  ? '3_views' : '4_panels',
+                    group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
                     when: ( (ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)))),
                     order: order ?? Number.MAX_VALUE
                 }));
@@ -377,7 +381,7 @@ let ViewsService = class ViewsService extends Disposable {
                             const viewContainerLocation = that.viewDescriptorService.getViewLocationById(viewDescriptor.id);
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
-                            if (viewContainerLocation === 0 ) {
+                            if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return { value: ( localizeWithPath(_moduleId, 1, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
@@ -386,7 +390,7 @@ let ViewsService = class ViewsService extends Disposable {
                         },
                         category: Categories.View,
                         precondition: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
-                        keybinding: viewDescriptor.openCommandActionDescriptor.keybindings ? { ...viewDescriptor.openCommandActionDescriptor.keybindings, weight: 200  } : undefined,
+                        keybinding: viewDescriptor.openCommandActionDescriptor.keybindings ? { ...viewDescriptor.openCommandActionDescriptor.keybindings, weight: KeybindingWeight.WorkbenchContrib } : undefined,
                         f1: true
                     });
                 }
@@ -399,7 +403,7 @@ let ViewsService = class ViewsService extends Disposable {
                     const focusedViewId = FocusedViewContext.getValue(contextKeyService);
                     if (focusedViewId === viewDescriptor.id) {
                         const viewLocation = viewDescriptorService.getViewLocationById(viewDescriptor.id);
-                        if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === 0 ) {
+                        if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === ViewContainerLocation.Sidebar) {
                             editorGroupService.activeGroup.focus();
                         }
                         else if (viewLocation !== null) {
@@ -420,7 +424,7 @@ let ViewsService = class ViewsService extends Disposable {
                             id: commandId,
                             title: viewDescriptor.openCommandActionDescriptor.mnemonicTitle,
                         },
-                        group: defaultLocation === 0  ? '3_views' : '4_panels',
+                        group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
                         when: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
                         order: viewDescriptor.openCommandActionDescriptor.order ?? Number.MAX_VALUE
                     }));
@@ -443,7 +447,7 @@ let ViewsService = class ViewsService extends Disposable {
                         }],
                     keybinding: {
                         when: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
-                        weight: 200 ,
+                        weight: KeybindingWeight.WorkbenchContrib,
                         primary: viewDescriptor.focusCommand?.keybindings?.primary,
                         secondary: viewDescriptor.focusCommand?.keybindings?.secondary,
                         linux: viewDescriptor.focusCommand?.keybindings?.linux,
@@ -568,24 +572,24 @@ ViewsService = ( (__decorate([
 function getEnabledViewContainerContextKey(viewContainerId) { return `viewContainer.${viewContainerId}.enabled`; }
 function getPaneCompositeExtension(viewContainerLocation) {
     switch (viewContainerLocation) {
-        case 2 :
+        case ViewContainerLocation.AuxiliaryBar:
             return Extensions.Auxiliary;
-        case 1 :
+        case ViewContainerLocation.Panel:
             return Extensions.Panels;
-        case 0 :
+        case ViewContainerLocation.Sidebar:
         default:
             return Extensions.Viewlets;
     }
 }
 function getPartByLocation(viewContainerLocation) {
     switch (viewContainerLocation) {
-        case 2 :
-            return "workbench.parts.auxiliarybar" ;
-        case 1 :
-            return "workbench.parts.panel" ;
-        case 0 :
+        case ViewContainerLocation.AuxiliaryBar:
+            return Parts.AUXILIARYBAR_PART;
+        case ViewContainerLocation.Panel:
+            return Parts.PANEL_PART;
+        case ViewContainerLocation.Sidebar:
         default:
-            return "workbench.parts.sidebar" ;
+            return Parts.SIDEBAR_PART;
     }
 }
 export { ViewsService, getPartByLocation };

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

@@ -0,0 +1,6 @@
+var SnapshotContext;
+( (function(SnapshotContext) {
+    SnapshotContext[SnapshotContext["Save"] = 1] = "Save";
+    SnapshotContext[SnapshotContext["Backup"] = 2] = "Backup";
+})(SnapshotContext || (SnapshotContext = {})));
+export { SnapshotContext };

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

@@ -3,6 +3,7 @@ import { timeout } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { FileChangeType } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 let ResourceWorkingCopy = class ResourceWorkingCopy extends Disposable {
     constructor(resource, fileService) {
@@ -23,14 +24,14 @@ let ResourceWorkingCopy = class ResourceWorkingCopy extends Disposable {
         let fileEventImpactsUs = false;
         let newInOrphanModeGuess;
         if (this.orphaned) {
-            const fileWorkingCopyResourceAdded = e.contains(this.resource, 1 );
+            const fileWorkingCopyResourceAdded = e.contains(this.resource, FileChangeType.ADDED);
             if (fileWorkingCopyResourceAdded) {
                 newInOrphanModeGuess = false;
                 fileEventImpactsUs = true;
             }
         }
         else {
-            const fileWorkingCopyResourceDeleted = e.contains(this.resource, 2 );
+            const fileWorkingCopyResourceDeleted = e.contains(this.resource, FileChangeType.DELETED);
             if (fileWorkingCopyResourceDeleted) {
                 newInOrphanModeGuess = true;
                 fileEventImpactsUs = true;

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

@@ -2,9 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from '../../../../nls.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
+import { FileOperationResult, ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
+import { SaveReason } from '../../../common/editor.js';
 import { IWorkingCopyService } from './workingCopyService.service.js';
+import { WorkingCopyCapabilities } from './workingCopy.js';
 import { TaskSequentializer, raceCancellation, timeout } from '../../../../base/common/async.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
@@ -21,9 +23,19 @@ import { IWorkingCopyEditorService } from './workingCopyEditorService.service.js
 import { IEditorService } from '../../editor/common/editorService.service.js';
 import { IElevatedFileService } from '../../files/common/elevatedFileService.service.js';
 import { ResourceWorkingCopy } from './resourceWorkingCopy.js';
+import { SnapshotContext } from './fileWorkingCopy.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var StoredFileWorkingCopy_1;
 const _moduleId = "vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+var StoredFileWorkingCopyState;
+( ((function(StoredFileWorkingCopyState) {
+    StoredFileWorkingCopyState[StoredFileWorkingCopyState["SAVED"] = 0] = "SAVED";
+    StoredFileWorkingCopyState[StoredFileWorkingCopyState["DIRTY"] = 1] = "DIRTY";
+    StoredFileWorkingCopyState[StoredFileWorkingCopyState["PENDING_SAVE"] = 2] = "PENDING_SAVE";
+    StoredFileWorkingCopyState[StoredFileWorkingCopyState["CONFLICT"] = 3] = "CONFLICT";
+    StoredFileWorkingCopyState[StoredFileWorkingCopyState["ORPHAN"] = 4] = "ORPHAN";
+    StoredFileWorkingCopyState[StoredFileWorkingCopyState["ERROR"] = 5] = "ERROR";
+})(StoredFileWorkingCopyState || (StoredFileWorkingCopyState = {}))));
 function isStoredFileWorkingCopySaveEvent(e) {
     const candidate = e;
     return !!candidate.stat;
@@ -45,7 +57,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         this.workingCopyEditorService = workingCopyEditorService;
         this.editorService = editorService;
         this.elevatedFileService = elevatedFileService;
-        this.capabilities = 0 ;
+        this.capabilities = WorkingCopyCapabilities.None;
         this._model = undefined;
         this._onDidChangeContent = this._register(( (new Emitter())));
         this.onDidChangeContent = this._onDidChangeContent.event;
@@ -161,7 +173,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             ctime = Date.now();
             size = 0;
             etag = ETAG_DISABLED;
-            this.setOrphaned(error.fileOperationResult === 1 );
+            this.setOrphaned(error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND);
         }
         return this.resolveFromContent({
             resource: this.resource,
@@ -230,14 +242,14 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         catch (error) {
             const result = error.fileOperationResult;
-            this.setOrphaned(result === 1 );
-            if (this.isResolved() && result === 2 ) {
+            this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
+            if (this.isResolved() && result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
                 if (error instanceof NotModifiedSinceFileOperationError) {
                     this.updateLastResolvedFileStat(error.stat);
                 }
                 return;
             }
-            if (this.isResolved() && result === 1  && !forceReadFromFile) {
+            if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND && !forceReadFromFile) {
                 return;
             }
             throw error;
@@ -338,7 +350,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         let content = undefined;
         if (this.isResolved()) {
-            content = await raceCancellation(this.model.snapshot(2 , token), token);
+            content = await raceCancellation(this.model.snapshot(SnapshotContext.Backup, token), token);
         }
         return { meta, content };
     }
@@ -351,19 +363,19 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             this.trace('save() - ignoring request for readonly resource');
             return false;
         }
-        if ((this.hasState(3 ) || this.hasState(5 )) &&
-            ((options.reason === 2  || options.reason === 3  || options.reason === 4) )) {
+        if ((this.hasState(StoredFileWorkingCopyState.CONFLICT) || this.hasState(StoredFileWorkingCopyState.ERROR)) &&
+            (options.reason === SaveReason.AUTO || options.reason === SaveReason.FOCUS_CHANGE || options.reason === SaveReason.WINDOW_CHANGE)) {
             this.trace('save() - ignoring auto save request for file working copy that is in conflict or error');
             return false;
         }
         this.trace('save() - enter');
         await this.doSave(options);
         this.trace('save() - exit');
-        return this.hasState(0 );
+        return this.hasState(StoredFileWorkingCopyState.SAVED);
     }
     async doSave(options) {
         if (typeof options.reason !== 'number') {
-            options.reason = 1 ;
+            options.reason = SaveReason.EXPLICIT;
         }
         let versionId = this.versionId;
         this.trace(`doSave(${versionId}) - enter with versionId ${versionId}`);
@@ -391,7 +403,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants && this.workingCopyFileService.hasSaveParticipants) {
                 try {
-                    if (options.reason === 2  && typeof this.lastContentChangeFromUndoRedo === 'number') {
+                    if (options.reason === SaveReason.AUTO && typeof this.lastContentChangeFromUndoRedo === 'number') {
                         const timeFromUndoRedoToSave = Date.now() - this.lastContentChangeFromUndoRedo;
                         if (timeFromUndoRedoToSave < StoredFileWorkingCopy_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD) {
                             await timeout(StoredFileWorkingCopy_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD - timeFromUndoRedoToSave);
@@ -400,7 +412,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                     if (!saveCancellation.token.isCancellationRequested) {
                         this.ignoreSaveFromSaveParticipants = true;
                         try {
-                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? 1 , savedFrom: options.from }, saveCancellation.token);
+                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;
@@ -434,10 +446,18 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                     };
                     let stat;
                     if (typeof resolvedFileWorkingCopy.model.save === 'function') {
-                        stat = await resolvedFileWorkingCopy.model.save(writeFileOptions, saveCancellation.token);
+                        try {
+                            stat = await resolvedFileWorkingCopy.model.save(writeFileOptions, saveCancellation.token);
+                        }
+                        catch (error) {
+                            if (saveCancellation.token.isCancellationRequested) {
+                                return undefined;
+                            }
+                            throw error;
+                        }
                     }
                     else {
-                        const snapshot = await raceCancellation(resolvedFileWorkingCopy.model.snapshot(1 , saveCancellation.token), saveCancellation.token);
+                        const snapshot = await raceCancellation(resolvedFileWorkingCopy.model.snapshot(SnapshotContext.Save, saveCancellation.token), saveCancellation.token);
                         if (saveCancellation.token.isCancellationRequested) {
                             return;
                         }
@@ -478,7 +498,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         this.setDirty(true);
         this.inErrorMode = true;
-        if (error.fileOperationResult === 3 ) {
+        if (error.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             this.inConflictMode = true;
         }
         this.doHandleSaveError(error, options);
@@ -488,20 +508,20 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         const fileOperationError = error;
         const primaryActions = [];
         let message;
-        if (fileOperationError.fileOperationResult === 3 ) {
+        if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             message = ( localizeWithPath(
                 _moduleId,
                 0,
                 "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?",
                 this.name
             ));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localizeWithPath(_moduleId, 1, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: 1  }) }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localizeWithPath(_moduleId, 1, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
             primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 2, "Discard")), run: () => this.revert() }));
         }
         else {
-            const isWriteLocked = fileOperationError.fileOperationResult === 5 ;
+            const isWriteLocked = fileOperationError.fileOperationResult === FileOperationResult.FILE_WRITE_LOCKED;
             const triedToUnlock = isWriteLocked && fileOperationError.options?.unlock;
-            const isPermissionDenied = fileOperationError.fileOperationResult === 6 ;
+            const isPermissionDenied = fileOperationError.fileOperationResult === FileOperationResult.FILE_PERMISSION_DENIED;
             const canSaveElevated = this.elevatedFileService.isSupported(this.resource);
             if (isErrorWithActions(error)) {
                 primaryActions.push(...error.actions);
@@ -513,15 +533,15 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                         isWindows ? ( localizeWithPath(_moduleId, 3, "Overwrite as Admin...")) : ( localizeWithPath(_moduleId, 4, "Overwrite as Sudo...")) :
                         isWindows ? ( localizeWithPath(_moduleId, 5, "Retry as Admin...")) : ( localizeWithPath(_moduleId, 6, "Retry as Sudo...")),
                     run: () => {
-                        this.save({ ...options, writeElevated: true, writeUnlock: triedToUnlock, reason: 1  });
+                        this.save({ ...options, writeElevated: true, writeUnlock: triedToUnlock, reason: SaveReason.EXPLICIT });
                     }
                 }));
             }
             else if (isWriteLocked) {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localizeWithPath(_moduleId, 1, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: 1  }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localizeWithPath(_moduleId, 1, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: SaveReason.EXPLICIT }) }));
             }
             else {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localizeWithPath(_moduleId, 7, "Retry")), run: () => this.save({ ...options, reason: 1  }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localizeWithPath(_moduleId, 7, "Retry")), run: () => this.save({ ...options, reason: SaveReason.EXPLICIT }) }));
             }
             primaryActions.push(toAction({
                 id: 'fileWorkingCopy.saveAs',
@@ -529,7 +549,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 run: async () => {
                     const editor = this.workingCopyEditorService.findEditor(this);
                     if (editor) {
-                        const result = await this.editorService.save(editor, { saveAs: true, reason: 1  });
+                        const result = await this.editorService.save(editor, { saveAs: true, reason: SaveReason.EXPLICIT });
                         if (!result.success) {
                             this.doHandleSaveError(error, options);
                         }
@@ -616,7 +636,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 await this.forceResolveFromFile();
             }
             catch (error) {
-                if (error.fileOperationResult !== 1 ) {
+                if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                     undoSetDirty();
                     throw error;
                 }
@@ -629,17 +649,17 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
     }
     hasState(state) {
         switch (state) {
-            case 3 :
+            case StoredFileWorkingCopyState.CONFLICT:
                 return this.inConflictMode;
-            case 1 :
+            case StoredFileWorkingCopyState.DIRTY:
                 return this.dirty;
-            case 5 :
+            case StoredFileWorkingCopyState.ERROR:
                 return this.inErrorMode;
-            case 4 :
+            case StoredFileWorkingCopyState.ORPHAN:
                 return this.isOrphaned();
-            case 2 :
+            case StoredFileWorkingCopyState.PENDING_SAVE:
                 return this.saveSequentializer.isRunning();
-            case 0 :
+            case StoredFileWorkingCopyState.SAVED:
                 return !this.dirty;
         }
     }
@@ -672,4 +692,4 @@ StoredFileWorkingCopy = StoredFileWorkingCopy_1 = ( (__decorate([
     ( (__param(13, IEditorService))),
     ( (__param(14, IElevatedFileService)))
 ], StoredFileWorkingCopy)));
-export { StoredFileWorkingCopy, isStoredFileWorkingCopySaveEvent };
+export { StoredFileWorkingCopy, StoredFileWorkingCopyState, isStoredFileWorkingCopySaveEvent };

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

@@ -1,2 +1,8 @@
+var WorkingCopyCapabilities;
+( (function(WorkingCopyCapabilities) {
+    WorkingCopyCapabilities[WorkingCopyCapabilities["None"] = 0] = "None";
+    WorkingCopyCapabilities[WorkingCopyCapabilities["Untitled"] = 2] = "Untitled";
+    WorkingCopyCapabilities[WorkingCopyCapabilities["Scratchpad"] = 4] = "Scratchpad";
+})(WorkingCopyCapabilities || (WorkingCopyCapabilities = {})));
 const NO_TYPE_ID = '';
-export { NO_TYPE_ID };
+export { NO_TYPE_ID, WorkingCopyCapabilities };

package/vscode/src/vs/workbench/services/workspaces/common/workspaceTrust.js

@@ -5,12 +5,15 @@ import { LinkedList } from '../../../../base/common/linkedList.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.service.js';
 import { getRemoteAuthority } from '../../../../platform/remote/common/remoteHosts.js';
 import { isVirtualResource } from '../../../../platform/workspace/common/virtualWorkspace.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-import { isSavedWorkspace, isTemporaryWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
+import { isSavedWorkspace, WorkbenchState, isTemporaryWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
+import { WorkspaceTrustUriResponse } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.service.js';
 import { Memento } from '../../../common/memento.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.service.js';
@@ -130,7 +133,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
     }
     registerListeners() {
         this._register(this.workspaceService.onDidChangeWorkspaceFolders(async () => await this.updateWorkspaceTrust()));
-        this._register(this.storageService.onDidChangeValue(-1 , this.storageKey, this._register(( new DisposableStore())))(async () => {
+        this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, this.storageKey, this._register(( new DisposableStore())))(async () => {
             if (JSON.stringify(this._trustStateInfo) !== JSON.stringify(this.loadTrustInfo())) {
                 this._trustStateInfo = this.loadTrustInfo();
                 this._onDidChangeTrustedFolders.fire();
@@ -180,7 +183,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         ));
     }
     loadTrustInfo() {
-        const infoAsString = this.storageService.get(this.storageKey, -1 );
+        const infoAsString = this.storageService.get(this.storageKey, StorageScope.APPLICATION);
         let result;
         try {
             if (infoAsString) {
@@ -201,7 +204,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         return result;
     }
     async saveTrustInfo() {
-        this.storageService.store(this.storageKey, JSON.stringify(this._trustStateInfo), -1 , 1 );
+        this.storageService.store(this.storageKey, JSON.stringify(this._trustStateInfo), StorageScope.APPLICATION, StorageTarget.MACHINE);
         this._onDidChangeTrustedFolders.fire();
         await this.updateWorkspaceTrust();
     }
@@ -314,7 +317,7 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         }
     }
     isEmptyWorkspace() {
-        if (this.workspaceService.getWorkbenchState() === 1 ) {
+        if (this.workspaceService.getWorkbenchState() === WorkbenchState.EMPTY) {
             return true;
         }
         const workspace = this.workspaceService.getWorkspace();
@@ -505,14 +508,14 @@ let WorkspaceTrustRequestService = class WorkspaceTrustRequestService extends Di
         if (!this._openFilesTrustRequestResolver) {
             return;
         }
-        if (result === 1 ) {
+        if (result === WorkspaceTrustUriResponse.Open) {
             this.workspaceTrustManagementService.acceptsOutOfWorkspaceFiles = true;
         }
         if (saveResponse) {
-            if (result === 1 ) {
+            if (result === WorkspaceTrustUriResponse.Open) {
                 this.untrustedFilesSetting = 'open';
             }
-            if (result === 2 ) {
+            if (result === WorkspaceTrustUriResponse.OpenInNewWindow) {
                 this.untrustedFilesSetting = 'newWindow';
             }
         }
@@ -522,22 +525,22 @@ let WorkspaceTrustRequestService = class WorkspaceTrustRequestService extends Di
     }
     async requestOpenFilesTrust(uris) {
         if (!this.workspaceTrustManagementService.isWorkspaceTrusted()) {
-            return 1 ;
+            return WorkspaceTrustUriResponse.Open;
         }
         const openFilesTrustInfo = await Promise.all(( uris.map(uri => this.workspaceTrustManagementService.getUriTrustInfo(uri))));
         if (( openFilesTrustInfo.map(info => info.trusted)).every(trusted => trusted)) {
-            return 1 ;
+            return WorkspaceTrustUriResponse.Open;
         }
         if (this.untrustedFilesSetting !== 'prompt') {
             if (this.untrustedFilesSetting === 'newWindow') {
-                return 2 ;
+                return WorkspaceTrustUriResponse.OpenInNewWindow;
             }
             if (this.untrustedFilesSetting === 'open') {
-                return 1 ;
+                return WorkspaceTrustUriResponse.Open;
             }
         }
         if (this.workspaceTrustManagementService.acceptsOutOfWorkspaceFiles) {
-            return 1 ;
+            return WorkspaceTrustUriResponse.Open;
         }
         if (!this._openFilesTrustRequestPromise) {
             this._openFilesTrustRequestPromise = ( new Promise(resolve => {
@@ -625,7 +628,7 @@ class WorkspaceTrustMemento {
         this._isEmptyWorkspaceTrustedKey = 'isEmptyWorkspaceTrusted';
         if (storageService) {
             this._memento = ( new Memento('workspaceTrust', storageService));
-            this._mementoObject = this._memento.getMemento(1 , 1 );
+            this._mementoObject = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
             this._mementoObject = {};

package/vscode-dts/vscode.proposed.attributableCoverage.d.ts

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+	export class FileCoverage2 extends FileCoverage {
+		/**
+		 * Test {@link TestItem} this file coverage is generated from. If undefined,
+		 * the editor will assume the coverage is the overall summary coverage for
+		 * the entire file.
+		 *
+		 * If per-test coverage is available, an extension should append multiple
+		 * `FileCoverage` instances with this property set for each test item. It
+		 * must also append a `FileCoverage` instance without this property set to
+		 * represent the overall coverage of the file.
+		 */
+		testItem?: TestItem;
+
+		constructor(
+			uri: Uri,
+			statementCoverage: TestCoverageCount,
+			branchCoverage?: TestCoverageCount,
+			declarationCoverage?: TestCoverageCount,
+			testItem?: TestItem,
+		);
+	}
+}