@codingame/monaco-vscode-api 3.2.3 → 4.0.0

package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js

@@ -4,26 +4,24 @@ import { combinedDisposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IExtensionManagementService, IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { IWorkbenchExtensionEnablementService } from '../../extensionManagement/common/extensionManagement.js';
-import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { IURLService } from '../../../../platform/url/common/url.js';
 import { IHostService } from '../../host/browser/host.js';
-import { toExtensionDescription, IExtensionService } from '../common/extensions.js';
+import { IExtensionService } from '../common/extensions.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { IProgressService } from '../../../../platform/progress/common/progress.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { disposableWindowInterval } from '../../../../base/browser/dom.js';
 import { mainWindow } from '../../../../base/browser/window.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var ExtensionUrlBootstrapHandler_1;
 const FIVE_MINUTES = 5 * 60 * 1000;
@@ -59,19 +57,17 @@ class UserTrustedExtensionIdStorage {
 }
 const IExtensionUrlHandler = ( createDecorator('extensionUrlHandler'));
 let ExtensionUrlHandler = class ExtensionUrlHandler {
-    constructor(urlService, extensionService, dialogService, notificationService, extensionManagementService, extensionEnablementService, hostService, galleryService, storageService, configurationService, progressService, telemetryService, productService) {
+    constructor(urlService, extensionService, dialogService, commandService, hostService, storageService, configurationService, telemetryService, notificationService, productService, workbenchEnvironmentService) {
         this.extensionService = extensionService;
         this.dialogService = dialogService;
-        this.notificationService = notificationService;
-        this.extensionManagementService = extensionManagementService;
-        this.extensionEnablementService = extensionEnablementService;
+        this.commandService = commandService;
         this.hostService = hostService;
-        this.galleryService = galleryService;
         this.storageService = storageService;
         this.configurationService = configurationService;
-        this.progressService = progressService;
         this.telemetryService = telemetryService;
+        this.notificationService = notificationService;
         this.productService = productService;
+        this.workbenchEnvironmentService = workbenchEnvironmentService;
         this.extensionHandlers = ( new Map());
         this.uriBuffer = ( new Map());
         this.userTrustedExtensionsStorage = ( new UserTrustedExtensionIdStorage(storageService));
@@ -96,7 +92,7 @@ let ExtensionUrlHandler = class ExtensionUrlHandler {
         if (!initialHandler) {
             const extension = await this.extensionService.getExtension(extensionId);
             if (!extension) {
-                await this.handleUnhandledURL(uri, { id: extensionId }, options);
+                await this.handleUnhandledURL(uri, extensionId, options);
                 return true;
             }
             else {
@@ -175,99 +171,49 @@ let ExtensionUrlHandler = class ExtensionUrlHandler {
         this.telemetryService.publicLog2('uri_invoked/end', { extensionId: ExtensionIdentifier.toKey(extensionId) });
         return await handler.handleURL(uri, options);
     }
-    async handleUnhandledURL(uri, extensionIdentifier, options) {
-        const installedExtensions = await this.extensionManagementService.getInstalled();
-        let extension = installedExtensions.find(e => areSameExtensions(e.identifier, extensionIdentifier));
-        if (!extension) {
-            let galleryExtension;
-            try {
-                galleryExtension = (await this.galleryService.getExtensions([extensionIdentifier], CancellationToken.None))[0] ?? undefined;
-            }
-            catch (err) {
-                return;
-            }
-            if (!galleryExtension) {
-                return;
-            }
-            this.telemetryService.publicLog2('uri_invoked/install_extension/start', { extensionId: extensionIdentifier.id });
-            const result = await this.dialogService.confirm({
-                message: ( localizeWithPath(
-                    'vs/workbench/services/extensions/browser/extensionUrlHandler',
-                    'installAndHandle',
-                    "Would you like to install '{0}' extension from '{1}' to open this URI?",
-                    galleryExtension.displayName,
-                    galleryExtension.publisherDisplayName
-                )),
-                detail: `${( localizeWithPath(
-                    'vs/workbench/services/extensions/browser/extensionUrlHandler',
-                    'installDetail',
-                    "'{0}' extension wants to open a URI:",
-                    galleryExtension.displayName
-                ))}\n\n${( uri.toString())}`,
-                primaryButton: ( localizeWithPath(
-                    'vs/workbench/services/extensions/browser/extensionUrlHandler',
-                    { key: 'install and open', comment: ['&& denotes a mnemonic'] },
-                    "&&Install and Open"
-                ))
-            });
-            if (!result.confirmed) {
-                this.telemetryService.publicLog2('uri_invoked/install_extension/cancel', { extensionId: extensionIdentifier.id });
-                return;
-            }
-            this.telemetryService.publicLog2('uri_invoked/install_extension/accept', { extensionId: extensionIdentifier.id });
-            try {
-                extension = await this.progressService.withProgress({
-                    location: 15 ,
-                    title: ( localizeWithPath(
+    async handleUnhandledURL(uri, extensionId, options) {
+        this.telemetryService.publicLog2('uri_invoked/install_extension/start', { extensionId });
+        try {
+            await this.commandService.executeCommand('workbench.extensions.installExtension', extensionId, {
+                justification: {
+                    reason: `${( localizeWithPath(
                         'vs/workbench/services/extensions/browser/extensionUrlHandler',
-                        'Installing',
-                        "Installing Extension '{0}'...",
-                        galleryExtension.displayName || galleryExtension.name
+                        'installDetail',
+                        "This extension wants to open a URI:"
+                    ))}\n${( uri.toString())}`,
+                    action: ( localizeWithPath(
+                        'vs/workbench/services/extensions/browser/extensionUrlHandler',
+                        'openUri',
+                        "Open URI"
                     ))
-                }, () => this.extensionManagementService.installFromGallery(galleryExtension));
+                },
+                enable: true
+            });
+            this.telemetryService.publicLog2('uri_invoked/install_extension/accept', { extensionId });
+        }
+        catch (error) {
+            if (isCancellationError(error)) {
+                this.telemetryService.publicLog2('uri_invoked/install_extension/cancel', { extensionId });
             }
-            catch (error) {
+            else {
+                this.telemetryService.publicLog2('uri_invoked/install_extension/error', { extensionId });
                 this.notificationService.error(error);
-                return;
             }
+            return;
         }
-        if (!this.extensionEnablementService.isEnabled(extension)) {
-            this.telemetryService.publicLog2('uri_invoked/enable_extension/start', { extensionId: extensionIdentifier.id });
-            const result = await this.dialogService.confirm({
-                message: ( localizeWithPath(
-                    'vs/workbench/services/extensions/browser/extensionUrlHandler',
-                    'enableAndHandle',
-                    "Extension '{0}' is disabled. Would you like to enable the extension and open the URL?",
-                    extension.manifest.displayName || extension.manifest.name
-                )),
-                detail: `${extension.manifest.displayName || extension.manifest.name} (${extensionIdentifier.id}) wants to open a URL:\n\n${( uri.toString())}`,
-                primaryButton: ( localizeWithPath(
-                    'vs/workbench/services/extensions/browser/extensionUrlHandler',
-                    { key: 'enableAndReload', comment: ['&& denotes a mnemonic'] },
-                    "&&Enable and Open"
-                ))
-            });
-            if (!result.confirmed) {
-                this.telemetryService.publicLog2('uri_invoked/enable_extension/cancel', { extensionId: extensionIdentifier.id });
-                return;
-            }
-            this.telemetryService.publicLog2('uri_invoked/enable_extension/accept', { extensionId: extensionIdentifier.id });
-            await this.extensionEnablementService.setEnablement([extension], 8 );
-        }
-        if (this.extensionService.canAddExtension(toExtensionDescription(extension))) {
-            await this.waitUntilExtensionIsAdded(extensionIdentifier);
+        const extension = await this.extensionService.getExtension(extensionId);
+        if (extension) {
             await this.handleURL(uri, { ...options, trusted: true });
         }
         else {
-            this.telemetryService.publicLog2('uri_invoked/activate_extension/start', { extensionId: extensionIdentifier.id });
+            this.telemetryService.publicLog2('uri_invoked/install_extension/reload', { extensionId, isRemote: !!this.workbenchEnvironmentService.remoteAuthority });
             const result = await this.dialogService.confirm({
                 message: ( localizeWithPath(
                     'vs/workbench/services/extensions/browser/extensionUrlHandler',
                     'reloadAndHandle',
                     "Extension '{0}' is not loaded. Would you like to reload the window to load the extension and open the URL?",
-                    extension.manifest.displayName || extension.manifest.name
+                    extensionId
                 )),
-                detail: `${extension.manifest.displayName || extension.manifest.name} (${extensionIdentifier.id}) wants to open a URL:\n\n${( uri.toString())}`,
                 primaryButton: ( localizeWithPath(
                     'vs/workbench/services/extensions/browser/extensionUrlHandler',
                     { key: 'reloadAndOpen', comment: ['&& denotes a mnemonic'] },
@@ -275,31 +221,12 @@ let ExtensionUrlHandler = class ExtensionUrlHandler {
                 ))
             });
             if (!result.confirmed) {
-                this.telemetryService.publicLog2('uri_invoked/activate_extension/cancel', { extensionId: extensionIdentifier.id });
                 return;
             }
-            this.telemetryService.publicLog2('uri_invoked/activate_extension/accept', { extensionId: extensionIdentifier.id });
             this.storageService.store(URL_TO_HANDLE, JSON.stringify(uri.toJSON()), 1 , 1 );
             await this.hostService.reload();
         }
     }
-    async waitUntilExtensionIsAdded(extensionId) {
-        if (!(await this.extensionService.getExtension(extensionId.id))) {
-            await ( new Promise((c, e) => {
-                const disposable = this.extensionService.onDidChangeExtensions(async () => {
-                    try {
-                        if (await this.extensionService.getExtension(extensionId.id)) {
-                            disposable.dispose();
-                            c();
-                        }
-                    }
-                    catch (error) {
-                        e(error);
-                    }
-                });
-            }));
-        }
-    }
     garbageCollect() {
         const now = ( new Date()).getTime();
         const uriBuffer = ( new Map());
@@ -334,16 +261,14 @@ ExtensionUrlHandler = ( __decorate([
     ( __param(0, IURLService)),
     ( __param(1, IExtensionService)),
     ( __param(2, IDialogService)),
-    ( __param(3, INotificationService)),
-    ( __param(4, IExtensionManagementService)),
-    ( __param(5, IWorkbenchExtensionEnablementService)),
-    ( __param(6, IHostService)),
-    ( __param(7, IExtensionGalleryService)),
-    ( __param(8, IStorageService)),
-    ( __param(9, IConfigurationService)),
-    ( __param(10, IProgressService)),
-    ( __param(11, ITelemetryService)),
-    ( __param(12, IProductService))
+    ( __param(3, ICommandService)),
+    ( __param(4, IHostService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, ITelemetryService)),
+    ( __param(8, INotificationService)),
+    ( __param(9, IProductService)),
+    ( __param(10, IWorkbenchEnvironmentService))
 ], ExtensionUrlHandler));
 let ExtensionUrlBootstrapHandler = class ExtensionUrlBootstrapHandler {
     static { ExtensionUrlBootstrapHandler_1 = this; }

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts

@@ -2,7 +2,7 @@ import { Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { ExtensionIdentifier, IExtensionDescription, IExtensionContributions, IExtension } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionIdentifier, IExtensionDescription, IExtension, IExtensionContributions } from '../../../../platform/extensions/common/extensions.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -105,7 +105,10 @@ declare abstract class AbstractExtensionService extends Disposable implements IE
     private _getExtensionHostExitInfoWithTimeout;
     private _onRemoteExtensionHostCrashed;
     protected _logExtensionHostCrash(extensionHost: IExtensionHostManager): void;
-    startExtensionHosts(): Promise<void>;
+    startExtensionHosts(updates?: {
+        toAdd: IExtension[];
+        toRemove: string[];
+    }): Promise<void>;
     activateByEvent(activationEvent: string, activationKind?: ActivationKind): Promise<void>;
     private _activateByEvent;
     activateById(extensionId: ExtensionIdentifier, reason: ExtensionActivationReason): Promise<void>;

package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts

@@ -1,5 +1,5 @@
 import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
-import { ExtensionIdentifier, IExtensionDescription, IExtensionContributions } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionIdentifier, IExtensionDescription, IExtensionContributions, IExtension } from '../../../../platform/extensions/common/extensions.js';
 import { Event } from '../../../../base/common/event.js';
 import Severity from '../../../../base/common/severity.js';
 import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
@@ -230,9 +230,12 @@ interface IExtensionService {
      */
     stopExtensionHosts(reason: string): Promise<boolean>;
     /**
-     * Starts the extension hosts.
+     * Starts the extension hosts. If updates are provided, the extension hosts are started with the given updates.
      */
-    startExtensionHosts(): Promise<void>;
+    startExtensionHosts(updates?: {
+        readonly toAdd: readonly IExtension[];
+        readonly toRemove: readonly string[];
+    }): Promise<void>;
     /**
      * Modify the environment of the remote extension host
      * @param env New properties for the remote extension host

package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js

@@ -1,7 +1,9 @@
 const allApiProposals = ( Object.freeze({
     activeComment: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.activeComment.d.ts',
     aiRelatedInformation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiRelatedInformation.d.ts',
+    aiTextSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts',
     authGetSessions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authGetSessions.d.ts',
+    authLearnMore: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authLearnMore.d.ts',
     authSession: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
     canonicalUriProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
     chatParticipant: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipant.d.ts',
@@ -13,10 +15,14 @@ const allApiProposals = ( Object.freeze({
     codeActionRanges: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codeActionRanges.d.ts',
     codiconDecoration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
     commentReactor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentReactor.d.ts',
+    commentThreadApplicability: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts',
+    commentingRangeHint: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentingRangeHint.d.ts',
     commentsDraftState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
     contribCommentEditorActionsMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
     contribCommentPeekContext: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
     contribCommentThreadAdditionalMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts',
+    contribCommentsViewThreadMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentsViewThreadMenus.d.ts',
+    contribDiffEditorGutterToolBarMenus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDiffEditorGutterToolBarMenus.d.ts',
     contribEditSessions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditSessions.d.ts',
     contribEditorContentMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribEditorContentMenu.d.ts',
     contribIssueReporter: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribIssueReporter.d.ts',
@@ -66,6 +72,7 @@ const allApiProposals = ( Object.freeze({
     mappedEditsProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
     multiDocumentHighlightProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts',
     newSymbolNamesProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.newSymbolNamesProvider.d.ts',
+    notebookCellExecution: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecution.d.ts',
     notebookCellExecutionState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts',
     notebookControllerAffinityHidden: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts',
     notebookDeprecated: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookDeprecated.d.ts',
@@ -90,6 +97,7 @@ const allApiProposals = ( Object.freeze({
     shareProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
     showLocal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.showLocal.d.ts',
     speech: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.speech.d.ts',
+    tabInputMultiDiff: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts',
     tabInputTextMerge: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
     taskPresentationGroup: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
     telemetry: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
@@ -98,7 +106,7 @@ const allApiProposals = ( Object.freeze({
     terminalExecuteCommandEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts',
     terminalQuickFixProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts',
     terminalSelection: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
-    testCoverage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testCoverage.d.ts',
+    terminalShellIntegration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts',
     testObserver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
     textSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
     timeline: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',

package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js

@@ -1,6 +1,6 @@
 import { localizeWithPath } from '../../../../nls.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { EXTENSION_IDENTIFIER_PATTERN } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { Extensions } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -24,13 +24,13 @@ class ExtensionMessageCollector {
         });
     }
     error(message) {
-        this._msg(Severity.Error, message);
+        this._msg(Severity$1.Error, message);
     }
     warn(message) {
-        this._msg(Severity.Warning, message);
+        this._msg(Severity$1.Warning, message);
     }
     info(message) {
-        this._msg(Severity.Info, message);
+        this._msg(Severity$1.Info, message);
     }
 }
 class ExtensionPointUserDelta {

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.d.ts

@@ -5,6 +5,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { IBaseFileStat } from '../../../../platform/files/common/files.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
+import { SaveReason } from '../../../common/editor.js';
 
 interface IAutoSaveConfiguration {
     autoSave?: 'afterDelay' | 'onFocusChange' | 'onWindowChange';
@@ -40,7 +41,7 @@ interface IFilesConfigurationService {
     readonly onDidChangeAutoSaveDisabled: Event<URI>;
     getAutoSaveConfiguration(resourceOrEditor: EditorInput | URI | undefined): IAutoSaveConfiguration;
     hasShortAutoSaveDelay(resourceOrEditor: EditorInput | URI | undefined): boolean;
-    getAutoSaveMode(resourceOrEditor: EditorInput | URI | undefined): IAutoSaveMode;
+    getAutoSaveMode(resourceOrEditor: EditorInput | URI | undefined, saveReason?: SaveReason): IAutoSaveMode;
     toggleAutoSave(): Promise<void>;
     disableAutoSave(resourceOrEditor: EditorInput | URI): IDisposable;
     readonly onDidChangeReadonly: Event<void>;

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js

@@ -240,7 +240,7 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         }
         return false;
     }
-    getAutoSaveMode(resourceOrEditor) {
+    getAutoSaveMode(resourceOrEditor, saveReason) {
         const resource = this.toResource(resourceOrEditor);
         if (resource && ( this.autoSaveDisabledOverrides.has(resource))) {
             return { mode: 0 , reason: 4  };
@@ -249,6 +249,13 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         if (typeof autoSaveConfiguration.autoSave === 'undefined') {
             return { mode: 0 , reason: 1  };
         }
+        if (typeof saveReason === 'number') {
+            if (((autoSaveConfiguration.autoSave === 'afterDelay' && saveReason !== 2) ) ||
+                ((autoSaveConfiguration.autoSave === 'onFocusChange' && saveReason !== 3  && saveReason !== 4) ) ||
+                ((autoSaveConfiguration.autoSave === 'onWindowChange' && saveReason !== 4) )) {
+                return { mode: 0 , reason: 1  };
+            }
+        }
         if (resource) {
             if (autoSaveConfiguration.autoSaveWorkspaceFilesOnly && autoSaveConfiguration.isOutOfWorkspace) {
                 return { mode: 0 , reason: 2  };

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -6,7 +6,7 @@ import { IEditorService } from '../../editor/common/editorService.js';
 import { IHistoryService } from '../common/history.js';
 import { FILES_EXCLUDE_CONFIG, FileChangesEvent, FileOperationEvent, IFileService } from '../../../../platform/files/common/files.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { Disposable, DisposableStore, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -32,7 +32,7 @@ let HistoryService = class HistoryService extends Disposable {
     static { HistoryService_1 = this; }
     static { this.MOUSE_NAVIGATION_SETTING = 'workbench.editor.mouseBackForwardToNavigate'; }
     static { this.NAVIGATION_SCOPE_SETTING = 'workbench.editor.navigationScope'; }
-    constructor(editorService, editorGroupService, contextService, storageService, configurationService, fileService, workspacesService, instantiationService, layoutService, contextKeyService) {
+    constructor(editorService, editorGroupService, contextService, storageService, configurationService, fileService, workspacesService, instantiationService, layoutService, contextKeyService, logService) {
         super();
         this.editorService = editorService;
         this.editorGroupService = editorGroupService;
@@ -44,10 +44,10 @@ let HistoryService = class HistoryService extends Disposable {
         this.instantiationService = instantiationService;
         this.layoutService = layoutService;
         this.contextKeyService = contextKeyService;
+        this.logService = logService;
         this.activeEditorListeners = this._register(( new DisposableStore()));
         this.lastActiveEditor = undefined;
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.trackingSuspended = false;
         this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localizeWithPath(
             'vs/workbench/services/history/browser/historyService',
             'canNavigateBack',
@@ -119,24 +119,12 @@ let HistoryService = class HistoryService extends Disposable {
             this.onDidActiveEditorChange();
         }
     }
-    suspendTracking() {
-        this.trackingSuspended = true;
-        return toDisposable(() => this.trackingSuspended = false);
-    }
     registerListeners() {
         this.registerMouseNavigationListener();
-        this._register(this.editorService.onDidActiveEditorChange((e) => {
-            if (!this.trackingSuspended) {
-                this.onDidActiveEditorChange();
-            }
-        }));
+        this._register(this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange()));
         this._register(this.editorService.onDidOpenEditorFail(event => this.remove(event.editor)));
         this._register(this.editorService.onDidCloseEditor(event => this.onDidCloseEditor(event)));
-        this._register(this.editorService.onDidMostRecentlyActiveEditorsChange(() => {
-            if (!this.trackingSuspended) {
-                this.handleEditorEventInRecentEditorsStack();
-            }
-        }));
+        this._register(this.editorService.onDidMostRecentlyActiveEditorsChange(() => this.handleEditorEventInRecentEditorsStack()));
         this._register(this.editorGroupService.onDidRemoveGroup(e => this.onDidRemoveGroup(e)));
         this._register(this.fileService.onDidFilesChange(event => this.onDidFilesChange(event)));
         this._register(this.fileService.onDidRunOperation(event => this.onDidFilesChange(event)));
@@ -194,14 +182,22 @@ let HistoryService = class HistoryService extends Disposable {
         if (this.lastActiveEditor && this.editorHelper.matchesEditorIdentifier(this.lastActiveEditor, activeEditorPane)) {
             return;
         }
-        this.lastActiveEditor = activeEditorPane?.input && activeEditorPane.group ? { editor: activeEditorPane.input, groupId: activeEditorPane.group.id } : undefined;
+        this.lastActiveEditor = activeEditorPane?.input ? { editor: activeEditorPane.input, groupId: activeEditorPane.group.id } : undefined;
         this.activeEditorListeners.clear();
-        this.handleActiveEditorChange(activeEditorGroup, activeEditorPane);
+        if (!activeEditorPane?.group.isTransient(activeEditorPane.input)) {
+            this.handleActiveEditorChange(activeEditorGroup, activeEditorPane);
+        }
+        else {
+            this.logService.trace(`[History]: ignoring transient editor change (editor: ${activeEditorPane.input?.resource?.toString()}})`);
+        }
         if (isEditorPaneWithSelection(activeEditorPane)) {
             this.activeEditorListeners.add(activeEditorPane.onDidChangeSelection(e => {
-                if (!this.trackingSuspended) {
+                if (!activeEditorPane.group.isTransient(activeEditorPane.input)) {
                     this.handleActiveEditorSelectionChangeEvent(activeEditorGroup, activeEditorPane, e);
                 }
+                else {
+                    this.logService.trace(`[History]: ignoring transient editor selection change (editor: ${activeEditorPane.input?.resource?.toString()}})`);
+                }
             }));
         }
         this.updateContextKeys();
@@ -589,24 +585,31 @@ let HistoryService = class HistoryService extends Disposable {
         if (this.history.length > HistoryService_1.MAX_HISTORY_ITEMS) {
             this.editorHelper.clearOnEditorDispose(this.history.pop(), this.editorHistoryListeners);
         }
-        if (isEditorInput(historyInput)) {
-            this.editorHelper.onEditorDispose(historyInput, () => this.updateHistoryOnEditorDispose(historyInput), this.editorHistoryListeners);
+        if (isEditorInput(editor)) {
+            this.editorHelper.onEditorDispose(editor, () => this.updateHistoryOnEditorDispose(historyInput), this.editorHistoryListeners);
         }
     }
     updateHistoryOnEditorDispose(editor) {
-        if (!isSideBySideEditorInput(editor)) {
-            this.removeFromHistory(editor);
+        if (isEditorInput(editor)) {
+            if (!isSideBySideEditorInput(editor)) {
+                this.removeFromHistory(editor);
+            }
+            else {
+                const resourceInputs = [];
+                const sideInputs = editor.primary.matches(editor.secondary) ? [editor.primary] : [editor.primary, editor.secondary];
+                for (const sideInput of sideInputs) {
+                    const candidateResourceInput = this.editorHelper.preferResourceEditorInput(sideInput);
+                    if (isResourceEditorInput(candidateResourceInput)) {
+                        resourceInputs.push(candidateResourceInput);
+                    }
+                }
+                this.replaceInHistory(editor, ...resourceInputs);
+            }
         }
         else {
-            const resourceInputs = [];
-            const sideInputs = editor.primary.matches(editor.secondary) ? [editor.primary] : [editor.primary, editor.secondary];
-            for (const sideInput of sideInputs) {
-                const candidateResourceInput = this.editorHelper.preferResourceEditorInput(sideInput);
-                if (isResourceEditorInput(candidateResourceInput)) {
-                    resourceInputs.push(candidateResourceInput);
-                }
+            if (!this.includeInHistory(editor)) {
+                this.removeFromHistory(editor);
             }
-            this.replaceInHistory(editor, ...resourceInputs);
         }
     }
     includeInHistory(editor) {
@@ -707,7 +710,8 @@ let HistoryService = class HistoryService extends Disposable {
             }
         }
         for (const editor of storedEditorHistory) {
-            if (!( handledEditors.has(`${( editor.resource.toString())}/${editor.options?.override}`))) {
+            if (!( handledEditors.has(`${( editor.resource.toString())}/${editor.options?.override}`)) &&
+                this.includeInHistory(editor)) {
                 this.addToHistory(editor, false );
             }
         }
@@ -820,6 +824,9 @@ let HistoryService = class HistoryService extends Disposable {
                 stack.disposable.dispose();
             }
         }
+        for (const [, listener] of this.editorHistoryListeners) {
+            listener.dispose();
+        }
     }
 };
 HistoryService = HistoryService_1 = ( __decorate([
@@ -832,7 +839,8 @@ HistoryService = HistoryService_1 = ( __decorate([
     ( __param(6, IWorkspacesService)),
     ( __param(7, IInstantiationService)),
     ( __param(8, IWorkbenchLayoutService)),
-    ( __param(9, IContextKeyService))
+    ( __param(9, IContextKeyService)),
+    ( __param(10, ILogService))
 ], HistoryService));
 ( registerSingleton(IHistoryService, HistoryService, 0 ));
 class EditorSelectionState {
@@ -1087,7 +1095,7 @@ ${entryLabels.join('\n')}
     notifyNavigation(editorPane, event) {
         this.trace('notifyNavigation()', editorPane?.input, event);
         const isSelectionAwareEditorPane = isEditorPaneWithSelection(editorPane);
-        const hasValidEditor = editorPane?.group && editorPane.input && !editorPane.input.isDisposed();
+        const hasValidEditor = editorPane?.input && !editorPane.input.isDisposed();
         if (this.navigating) {
             this.trace(`notifyNavigation() ignoring (navigating)`, editorPane?.input, event);
             if (isSelectionAwareEditorPane && hasValidEditor) {
@@ -1343,7 +1351,7 @@ ${entryLabels.join('\n')}
         if (!isEditorPaneWithSelection(pane)) {
             return false;
         }
-        if (pane.group?.id !== this.current.groupId) {
+        if (pane.group.id !== this.current.groupId) {
             return false;
         }
         if (!pane.input || !this.editorHelper.matchesEditor(pane.input, this.current.editor)) {

package/vscode/src/vs/workbench/services/history/common/history.d.ts

@@ -3,7 +3,6 @@ import { IResourceEditorInput } from '../../../../platform/editor/common/editor.
 import { GroupIdentifier } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
 
 /**
  * Limit editor navigation to certain kinds.
@@ -111,10 +110,6 @@ interface IHistoryService {
      * Clear list of recently opened editors.
      */
     clearRecentlyOpened(): void;
-    /**
-     * Temporarily suspend tracking of editor events for the history.
-     */
-    suspendTracking(): IDisposable;
 }
 
 export { GoFilter, GoScope, IHistoryService };