@codingame/monaco-vscode-api 2.2.2 → 3.0.0

package/vscode/src/vs/workbench/services/textfile/common/textfiles.d.ts

@@ -2,7 +2,7 @@ import { ServiceIdentifier } from '../../../../platform/instantiation/common/ins
 import { URI } from '../../../../base/common/uri.js';
 import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { IRevertOptions, SaveReason, ISaveOptions } from '../../../common/editor.js';
+import { IRevertOptions, ISaveOptions, SaveReason } from '../../../common/editor.js';
 import { ReadableStream } from '../../../../base/common/stream.js';
 import { IFileStatWithMetadata, IReadFileStreamOptions, IWriteFileOptions, IBaseFileStatWithMetadata, IFileReadLimits } from '../../../../platform/files/common/files.js';
 import { ITextEditorModel } from '../../../../editor/common/services/resolverService.js';
@@ -239,14 +239,25 @@ interface ITextFileResolveEvent {
      */
     readonly reason: TextFileResolveReason;
 }
+interface ITextFileSaveParticipantContext {
+    /**
+     * The reason why the save was triggered.
+     */
+    readonly reason: SaveReason;
+    /**
+     * Only applies to when a text file was saved as, for
+     * example when starting with untitled and saving. This
+     * provides access to the initial resource the text
+     * file had before.
+     */
+    readonly savedFrom?: URI;
+}
 interface ITextFileSaveParticipant {
     /**
      * Participate in a save of a model. Allows to change the model
      * before it is being saved to disk.
      */
-    participate(model: ITextFileEditorModel, context: {
-        reason: SaveReason;
-    }, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
+    participate(model: ITextFileEditorModel, context: ITextFileSaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
 }
 interface ITextFileEditorModelManager {
     readonly onDidCreate: Event<ITextFileEditorModel>;
@@ -283,9 +294,7 @@ interface ITextFileEditorModelManager {
     /**
      * Runs the registered save participants on the provided model.
      */
-    runSaveParticipants(model: ITextFileEditorModel, context: {
-        reason: SaveReason;
-    }, token: CancellationToken): Promise<void>;
+    runSaveParticipants(model: ITextFileEditorModel, context: ITextFileSaveParticipantContext, token: CancellationToken): Promise<void>;
     /**
      * Waits for the model to be ready to be disposed. There may be conditions
      * under which the model cannot be disposed, e.g. when it is dirty. Once the
@@ -314,6 +323,10 @@ interface ITextFileSaveOptions extends ISaveOptions {
     readonly ignoreErrorHandler?: boolean;
 }
 interface ITextFileSaveAsOptions extends ITextFileSaveOptions {
+    /**
+     * Optional URI of the resource the text file is saved from if known.
+     */
+    readonly from?: URI;
     /**
      * Optional URI to use as suggested file path to save as.
      */
@@ -385,7 +398,7 @@ interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport, ILang
     hasState(state: TextFileEditorModelState): boolean;
     joinState(state: TextFileEditorModelState.PENDING_SAVE): Promise<void>;
     updatePreferredEncoding(encoding: string | undefined): void;
-    save(options?: ITextFileSaveOptions): Promise<boolean>;
+    save(options?: ITextFileSaveAsOptions): Promise<boolean>;
     revert(options?: IRevertOptions): Promise<void>;
     resolve(options?: ITextFileResolveOptions): Promise<void>;
     isDirty(): this is IResolvedTextFileEditorModel;
@@ -397,4 +410,4 @@ interface IResolvedTextFileEditorModel extends ITextFileEditorModel {
     createSnapshot(): ITextSnapshot;
 }
 
-export { EncodingMode, type IEncodingSupport, type ILanguageSupport, type IReadTextFileEncodingOptions, type IReadTextFileOptions, type IResolvedTextFileEditorModel, type IResourceEncoding, type IResourceEncodings, type ISaveErrorHandler, type ITextFileContent, type ITextFileEditorModel, type ITextFileEditorModelManager, type ITextFileEditorModelResolveOrCreateOptions, type ITextFileEditorModelSaveEvent, type ITextFileResolveEvent, type ITextFileResolveOptions, type ITextFileSaveAsOptions, type ITextFileSaveEvent, type ITextFileSaveOptions, type ITextFileSaveParticipant, ITextFileService, type ITextFileStreamContent, type IWriteTextFileOptions, TextFileEditorModelState, TextFileResolveReason };
+export { EncodingMode, type IEncodingSupport, type ILanguageSupport, type IReadTextFileEncodingOptions, type IReadTextFileOptions, type IResolvedTextFileEditorModel, type IResourceEncoding, type IResourceEncodings, type ISaveErrorHandler, type ITextFileContent, type ITextFileEditorModel, type ITextFileEditorModelManager, type ITextFileEditorModelResolveOrCreateOptions, type ITextFileEditorModelSaveEvent, type ITextFileResolveEvent, type ITextFileResolveOptions, type ITextFileSaveAsOptions, type ITextFileSaveEvent, type ITextFileSaveOptions, type ITextFileSaveParticipant, type ITextFileSaveParticipantContext, ITextFileService, type ITextFileStreamContent, type IWriteTextFileOptions, TextFileEditorModelState, TextFileResolveReason };

package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js

@@ -1,12 +1,16 @@
 import { localizeWithPath } from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { Extensions } from '../../../../platform/theme/common/colorRegistry.js';
+import { Extensions as Extensions$1 } from '../../../../platform/theme/common/colorRegistry.js';
 import { Color } from '../../../../base/common/color.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-const colorRegistry = ( Registry.as(Extensions.ColorContribution));
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Extensions } from '../../extensionManagement/common/extensionFeatures.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+const colorRegistry = ( Registry.as(Extensions$1.ColorContribution));
 const colorReferenceSchema = colorRegistry.getColorReferenceSchema();
 const colorIdPattern = '^\\w+[.\\w+]*$';
-const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'colors',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -97,7 +101,7 @@ const configurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         }
     }
-}));
+});
 class ColorExtensionPoint {
     constructor() {
         configurationExtPoint.setHandler((extensions, delta) => {
@@ -196,4 +200,72 @@ class ColorExtensionPoint {
         });
     }
 }
+class ColorDataRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.colors;
+    }
+    render(manifest) {
+        const colors = manifest.contributes?.colors || [];
+        if (!colors.length) {
+            return { data: { headers: [], rows: [] }, dispose: () => { } };
+        }
+        const headers = [
+            ( localizeWithPath('vs/workbench/services/themes/common/colorExtensionPoint', 'id', "ID")),
+            ( localizeWithPath(
+                'vs/workbench/services/themes/common/colorExtensionPoint',
+                'description',
+                "Description"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/services/themes/common/colorExtensionPoint',
+                'defaultDark',
+                "Dark Default"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/services/themes/common/colorExtensionPoint',
+                'defaultLight',
+                "Light Default"
+            )),
+            ( localizeWithPath(
+                'vs/workbench/services/themes/common/colorExtensionPoint',
+                'defaultHC',
+                "High Contrast Default"
+            )),
+        ];
+        const toColor = (colorReference) => colorReference[0] === '#' ? ( Color.fromHex(colorReference)) : undefined;
+        const rows = ( colors.sort((a, b) => a.id.localeCompare(b.id))
+            .map(color => {
+            return [
+                ( new MarkdownString()).appendMarkdown(`\`${color.id}\``),
+                color.description,
+                toColor(color.defaults.dark) ?? ( new MarkdownString()).appendMarkdown(`\`${color.defaults.dark}\``),
+                toColor(color.defaults.light) ?? ( new MarkdownString()).appendMarkdown(`\`${color.defaults.light}\``),
+                toColor(color.defaults.highContrast) ?? ( new MarkdownString()).appendMarkdown(`\`${color.defaults.highContrast}\``),
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'colors',
+    label: ( localizeWithPath(
+        'vs/workbench/services/themes/common/colorExtensionPoint',
+        'colors',
+        "Colors"
+    )),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(ColorDataRenderer)),
+});
 export { ColorExtensionPoint };

package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js

@@ -8,7 +8,7 @@ import { extname, posix } from '../../../../base/common/path.js';
 const iconRegistry = ( Registry.as(Extensions.IconContribution));
 const iconReferenceSchema = iconRegistry.getIconReferenceSchema();
 const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegment})+$`;
-const iconConfigurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'icons',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -80,7 +80,7 @@ const iconConfigurationExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
         },
         defaultSnippets: [{ body: { '${1:my-icon-id}': { description: '${2:my icon}', default: { fontPath: '${3:myiconfont.woff}', fontCharacter: '${4:\\\\E001}' } } } }]
     }
-}));
+});
 class IconExtensionPoint {
     constructor() {
         iconConfigurationExtPoint.setHandler((extensions, delta) => {

package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js

@@ -1,8 +1,8 @@
 import { localizeWithPath } from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { getTokenClassificationRegistry, typeAndModifierIdPattern } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
+import { typeAndModifierIdPattern, getTokenClassificationRegistry } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
 const tokenClassificationRegistry = getTokenClassificationRegistry();
-const tokenTypeExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'semanticTokenTypes',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -53,8 +53,8 @@ const tokenTypeExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         }
     }
-}));
-const tokenModifierExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+});
+const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'semanticTokenModifiers',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -91,8 +91,8 @@ const tokenModifierExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         }
     }
-}));
-const tokenStyleDefaultsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
+});
+const tokenStyleDefaultsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'semanticTokenScopes',
     jsonSchema: {
         description: ( localizeWithPath(
@@ -129,7 +129,7 @@ const tokenStyleDefaultsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
             }
         }
     }
-}));
+});
 class TokenClassificationExtensionPoints {
     constructor() {
         function validateTypeOrModifier(contribution, extensionPoint, collector) {

package/vscode/src/vs/workbench/services/timer/browser/timerService.js

@@ -190,6 +190,7 @@ let AbstractTimerService = class AbstractTimerService {
                 ellapsedEditorRestore: this._marks.getDuration('code/willRestoreEditors', 'code/didRestoreEditors'),
                 ellapsedViewletRestore: this._marks.getDuration('code/willRestoreViewlet', 'code/didRestoreViewlet'),
                 ellapsedPanelRestore: this._marks.getDuration('code/willRestorePanel', 'code/didRestorePanel'),
+                ellapsedWorkbenchContributions: this._marks.getDuration('code/willCreateWorkbenchContributions/1', 'code/didCreateWorkbenchContributions/2'),
                 ellapsedWorkbench: this._marks.getDuration('code/willStartWorkbench', 'code/didStartWorkbench'),
                 ellapsedExtensionsReady: this._marks.getDuration(startMark, 'code/didLoadExtensions'),
                 ellapsedRenderer: this._marks.getDuration('code/didStartRenderer', 'code/didStartWorkbench')

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorHandler.js

@@ -3,7 +3,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ITextEditorService } from '../../textfile/common/textEditorService.js';
-import { toLocalResource, isEqual } from '../../../../base/common/resources.js';
+import { isEqual, toLocalResource } from '../../../../base/common/resources.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
@@ -22,7 +22,7 @@ let UntitledTextEditorInputSerializer = class UntitledTextEditorInputSerializer
         return this.filesConfigurationService.isHotExitEnabled && !editorInput.isDisposed();
     }
     serialize(editorInput) {
-        if (!this.filesConfigurationService.isHotExitEnabled || editorInput.isDisposed()) {
+        if (!this.canSerialize(editorInput)) {
             return undefined;
         }
         const untitledTextEditorInput = editorInput;
@@ -61,6 +61,7 @@ UntitledTextEditorInputSerializer = ( __decorate([
     ( __param(2, IPathService))
 ], UntitledTextEditorInputSerializer));
 let UntitledTextEditorWorkingCopyEditorHandler = class UntitledTextEditorWorkingCopyEditorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.untitledTextEditorWorkingCopyEditorHandler'; }
     constructor(workingCopyEditorService, environmentService, pathService, textEditorService, untitledTextEditorService) {
         super();
         this.environmentService = environmentService;

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorInput.js

@@ -112,7 +112,7 @@ let UntitledTextEditorInput = class UntitledTextEditorInput extends AbstractText
             untypedInput.languageId = this.getLanguageId();
             untypedInput.contents = this.model.isModified() ? this.model.textEditorModel?.getValue() : undefined;
             untypedInput.options.viewState = findViewStateForEditor(this, options.preserveViewState, this.editorService);
-            if (typeof untypedInput.contents === 'string' && !this.model.hasAssociatedFilePath) {
+            if (typeof untypedInput.contents === 'string' && !this.model.hasAssociatedFilePath && !options.preserveResource) {
                 untypedInput.resource = undefined;
             }
         }

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

@@ -71,11 +71,11 @@ const SYNC_VIEW_CONTAINER_ID = 'workbench.view.sync';
 const SYNC_CONFLICTS_VIEW_ID = 'workbench.views.sync.conflicts';
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: 'workbench.userDataSync.actions.downloadSyncActivity',
-    title: { original: 'Download Settings Sync Activity', value: ( localizeWithPath(
+    title: ( localize2WithPath(
         'vs/workbench/services/userDataSync/common/userDataSync',
         'download sync activity title',
         "Download Settings Sync Activity"
-    )) },
+    )),
     category: Categories.Developer,
     f1: true,
     precondition: ( ContextKeyExpr.and(( CONTEXT_ACCOUNT_STATE.isEqualTo("available" )), ( CONTEXT_SYNC_STATE.notEqualsTo("uninitialized" ))))

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

@@ -13,7 +13,7 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { getViewsStateStorageId, ViewContainerModel } from '../common/viewContainerModel.js';
 import { registerAction2, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { ILoggerService } from '../../../../platform/log/common/log.js';
 var ViewDescriptorService_1;
 function getViewContainerStorageId(viewContainerId) { return `${viewContainerId}.state`; }
@@ -603,14 +603,11 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: {
-                        original: 'Reset Location',
-                        value: ( localizeWithPath(
-                            'vs/workbench/services/views/browser/viewDescriptorService',
-                            'resetViewLocation',
-                            "Reset Location"
-                        ))
-                    },
+                    title: ( localize2WithPath(
+                        'vs/workbench/services/views/browser/viewDescriptorService',
+                        'resetViewLocation',
+                        "Reset Location"
+                    )),
                     menu: [{
                             id: MenuId.ViewContainerTitleContext,
                             when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', viewContainer.id)), ( ContextKeyExpr.equals(`${viewContainer.id}.defaultViewContainerLocation`, false))))))

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

@@ -8,7 +8,7 @@ import { RawContextKey, ContextKeyExpr, IContextKeyService } from '../../../../p
 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 } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -99,6 +99,9 @@ let ViewsService = class ViewsService extends Disposable {
     onDidChangeContainerLocation(viewContainer, from, to) {
         this.deregisterPaneComposite(viewContainer, from);
         this.registerPaneComposite(viewContainer, to);
+        if (this.layoutService.isVisible(getPartByLocation(to)) && this.viewDescriptorService.getViewContainersByLocation(to).length === 1) {
+            this.openViewContainer(viewContainer.id);
+        }
     }
     onViewDescriptorsAdded(views, container) {
         const location = this.viewDescriptorService.getViewContainerLocation(container);
@@ -451,7 +454,7 @@ let ViewsService = class ViewsService extends Disposable {
     registerFocusViewAction(viewDescriptor, category) {
         return registerAction2(class FocusViewAction extends Action2 {
             constructor() {
-                const title = ( localizeWithPath(
+                const title = ( localize2WithPath(
                     'vs/workbench/services/views/browser/viewsService',
                     { key: 'focus view', comment: ['{0} indicates the name of the view to be focused.'] },
                     "Focus on {0} View",
@@ -459,7 +462,7 @@ let ViewsService = class ViewsService extends Disposable {
                 ));
                 super({
                     id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
-                    title: { original: `Focus on ${viewDescriptor.name.original} View`, value: title },
+                    title,
                     category,
                     menu: [{
                             id: MenuId.CommandPalette,
@@ -475,7 +478,7 @@ let ViewsService = class ViewsService extends Disposable {
                         win: viewDescriptor.focusCommand?.keybindings?.win
                     },
                     metadata: {
-                        description: title,
+                        description: title.value,
                         args: [
                             {
                                 name: 'focusOptions',
@@ -504,14 +507,11 @@ let ViewsService = class ViewsService extends Disposable {
             constructor() {
                 super({
                     id: `${viewDescriptor.id}.resetViewLocation`,
-                    title: {
-                        original: 'Reset Location',
-                        value: ( localizeWithPath(
-                            'vs/workbench/services/views/browser/viewsService',
-                            'resetViewLocation',
-                            "Reset Location"
-                        ))
-                    },
+                    title: ( localize2WithPath(
+                        'vs/workbench/services/views/browser/viewsService',
+                        'resetViewLocation',
+                        "Reset Location"
+                    )),
                     menu: [{
                             id: MenuId.ViewTitleContext,
                             when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals('view', viewDescriptor.id)), ( ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)))))),

package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js

@@ -16,11 +16,16 @@ import { registerAction2, Action2 } from '../../../../platform/actions/common/ac
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IOutputService } from '../../output/common/output.js';
 import { CounterSet } from '../../../../base/common/map.js';
+import { localize2WithPath } from '../../../../nls.js';
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_workbench.output.showViewsLog',
-            title: { value: 'Show Views Log', original: 'Show Views Log' },
+            title: ( localize2WithPath(
+                'vs/workbench/services/views/common/viewContainerModel',
+                'showViewsLog',
+                "Show Views Log"
+            )),
             category: Categories.Developer,
             f1: true
         });

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

@@ -1,10 +1,12 @@
+import { URI } from '../../../../base/common/uri.js';
 import { Event } from '../../../../base/common/event.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IWriteFileOptions, IFileStatWithMetadata, IFileReadLimits } from '../../../../platform/files/common/files.js';
-import '../../../../editor/editor.api.js';
-import { IMarkdownString } from '../../../../base/common/htmlContent.js';
-import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { ISaveOptions } from '../../../common/editor.js';
 import { IWorkingCopySaveEvent } from './workingCopy.js';
+import { VSBufferReadableStream } from '../../../../base/common/buffer.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import '../../../../editor/editor.api.js';
 import { IResourceWorkingCopy } from './resourceWorkingCopy.js';
 import { IFileWorkingCopyModel, IFileWorkingCopy } from './fileWorkingCopy.js';
 
@@ -111,6 +113,14 @@ interface IStoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extends
      * Whether the stored file working copy is readonly or not.
      */
     isReadonly(): boolean | IMarkdownString;
+    /**
+     * Asks the stored file working copy to save. If the stored file
+     * working copy was dirty, it is expected to be non-dirty after
+     * this operation has finished.
+     *
+     * @returns `true` if the operation was successful and `false` otherwise.
+     */
+    save(options?: IStoredFileWorkingCopySaveAsOptions): Promise<boolean>;
 }
 interface IResolvedStoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extends IStoredFileWorkingCopy<M> {
     /**
@@ -153,6 +163,35 @@ declare const enum StoredFileWorkingCopyState {
      */
     ERROR = 5
 }
+interface IStoredFileWorkingCopySaveOptions extends ISaveOptions {
+    /**
+     * Save the stored file working copy with an attempt to unlock it.
+     */
+    readonly writeUnlock?: boolean;
+    /**
+     * Save the stored file working copy with elevated privileges.
+     *
+     * Note: This may not be supported in all environments.
+     */
+    readonly writeElevated?: boolean;
+    /**
+     * Allows to write to a stored file working copy even if it has been
+     * modified on disk. This should only be triggered from an
+     * explicit user action.
+     */
+    readonly ignoreModifiedSince?: boolean;
+    /**
+     * If set, will bubble up the stored file working copy save error to
+     * the caller instead of handling it.
+     */
+    readonly ignoreErrorHandler?: boolean;
+}
+interface IStoredFileWorkingCopySaveAsOptions extends IStoredFileWorkingCopySaveOptions {
+    /**
+     * Optional URI of the resource the text file is saved from if known.
+     */
+    readonly from?: URI;
+}
 interface IStoredFileWorkingCopyResolveOptions {
     /**
      * The contents to use for the stored file working copy if known. If not
@@ -180,4 +219,4 @@ interface IStoredFileWorkingCopySaveEvent extends IWorkingCopySaveEvent {
     readonly stat: IFileStatWithMetadata;
 }
 
-export { type IResolvedStoredFileWorkingCopy, type IStoredFileWorkingCopy, type IStoredFileWorkingCopyModel, type IStoredFileWorkingCopyModelContentChangedEvent, type IStoredFileWorkingCopyResolveOptions, type IStoredFileWorkingCopySaveEvent, StoredFileWorkingCopyState };
+export { type IResolvedStoredFileWorkingCopy, type IStoredFileWorkingCopy, type IStoredFileWorkingCopyModel, type IStoredFileWorkingCopyModelContentChangedEvent, type IStoredFileWorkingCopyResolveOptions, type IStoredFileWorkingCopySaveAsOptions, type IStoredFileWorkingCopySaveEvent, type IStoredFileWorkingCopySaveOptions, StoredFileWorkingCopyState };

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

@@ -396,7 +396,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                     if (!saveCancellation.token.isCancellationRequested) {
                         this.ignoreSaveFromSaveParticipants = true;
                         try {
-                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? 1  }, saveCancellation.token);
+                            await this.workingCopyFileService.runSaveParticipants(this, { reason: options.reason ?? 1 , savedFrom: options.from }, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;

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

@@ -52,14 +52,25 @@ interface IWorkingCopyFileOperationParticipant {
      */
     participate(files: SourceTargetPair[], operation: FileOperation, undoInfo: IFileOperationUndoRedoInfo | undefined, timeout: number, token: CancellationToken): Promise<void>;
 }
+interface IStoredFileWorkingCopySaveParticipantContext {
+    /**
+     * The reason why the save was triggered.
+     */
+    readonly reason: SaveReason;
+    /**
+     * Only applies to when a text file was saved as, for
+     * example when starting with untitled and saving. This
+     * provides access to the initial resource the text
+     * file had before.
+     */
+    readonly savedFrom?: URI;
+}
 interface IStoredFileWorkingCopySaveParticipant {
     /**
      * Participate in a save operation of file stored working copies.
      * Allows to make changes before content is being saved to disk.
      */
-    participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: {
-        reason: SaveReason;
-    }, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
+    participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void>;
 }
 interface ICreateOperation {
     resource: URI;
@@ -131,9 +142,7 @@ interface IWorkingCopyFileService {
     /**
      * Runs all available save participants for stored file working copies.
      */
-    runSaveParticipants(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: {
-        reason: SaveReason;
-    }, token: CancellationToken): Promise<void>;
+    runSaveParticipants(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, token: CancellationToken): Promise<void>;
     /**
      * Will create a resource with the provided optional contents, optionally overwriting any target.
      *
@@ -189,4 +198,4 @@ interface IWorkingCopyFileService {
     getDirty(resource: URI): readonly IWorkingCopy[];
 }
 
-export { type ICopyOperation, type ICreateFileOperation, type ICreateOperation, type IDeleteOperation, type IFileOperationUndoRedoInfo, type IMoveOperation, type IStoredFileWorkingCopySaveParticipant, type IWorkingCopyFileOperationParticipant, IWorkingCopyFileService, type SourceTargetPair, type WorkingCopyFileEvent };
+export { type ICopyOperation, type ICreateFileOperation, type ICreateOperation, type IDeleteOperation, type IFileOperationUndoRedoInfo, type IMoveOperation, type IStoredFileWorkingCopySaveParticipant, type IStoredFileWorkingCopySaveParticipantContext, type IWorkingCopyFileOperationParticipant, IWorkingCopyFileService, type SourceTargetPair, type WorkingCopyFileEvent };

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

@@ -17,6 +17,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { isEqualAuthority } from '../../../../base/common/resources.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
+import { promiseWithResolvers } from '../../../../base/common/async.js';
 const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
 const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
 const WORKSPACE_TRUST_BANNER = 'security.workspace.trust.banner';
@@ -86,12 +87,8 @@ let WorkspaceTrustManagementService = class WorkspaceTrustManagementService exte
         this._canonicalStartupFiles = [];
         this._canonicalUrisResolved = false;
         this._canonicalWorkspace = this.workspaceService.getWorkspace();
-        this._workspaceResolvedPromise = ( new Promise((resolve) => {
-            this._workspaceResolvedPromiseResolve = resolve;
-        }));
-        this._workspaceTrustInitializedPromise = ( new Promise((resolve) => {
-            this._workspaceTrustInitializedPromiseResolve = resolve;
-        }));
+        ({ promise: this._workspaceResolvedPromise, resolve: this._workspaceResolvedPromiseResolve } = promiseWithResolvers());
+        ({ promise: this._workspaceTrustInitializedPromise, resolve: this._workspaceTrustInitializedPromiseResolve } = promiseWithResolvers());
         this._storedTrustState = ( new WorkspaceTrustMemento(isWeb && this.isEmptyWorkspace() ? undefined : this.storageService));
         this._trustTransitionManager = this._register(( new WorkspaceTrustTransitionManager()));
         this._trustStateInfo = this.loadTrustInfo();

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

@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  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' {
+	// @alexr00 https://github.com/microsoft/vscode/issues/204484
+
+	export interface CommentController {
+		/**
+		 * The currently active comment or `undefined`. The active comment is the one
+		 * that currently has focus or, when none has focus, undefined.
+		 */
+		// readonly activeComment: Comment | undefined;
+
+		/**
+		 * The currently active comment thread or `undefined`. The active comment thread is the one
+		 * in the CommentController that most recently had focus or, when a different CommentController's
+		 * thread has most recently had focus, undefined.
+		 */
+		readonly activeCommentThread: CommentThread | undefined;
+	}
+}