@codingame/monaco-vscode-extensions-service-override 7.0.11 → 7.1.1

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -5,7 +5,7 @@ import { transformErrorFromSerialization } from 'vscode/vscode/vs/base/common/er
 import { FileAccess } from 'vscode/vscode/vs/base/common/network';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -21,7 +21,6 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { ITimerService } from 'vscode/vscode/vs/workbench/services/timer/browser/timerService.service';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadExtensionService";
 let MainThreadExtensionService = class MainThreadExtensionService {
     constructor(extHostContext, _extensionService, _notificationService, _extensionsWorkbenchService, _hostService, _extensionEnablementService, _timerService, _commandService, _environmentService) {
         this._extensionService = _extensionService;
@@ -90,15 +89,14 @@ let MainThreadExtensionService = class MainThreadExtensionService {
         if (this._extensionEnablementService.isEnabled(missingInstalledDependency)) {
             this._notificationService.notify({
                 severity: Severity$1.Error,
-                message: ( localizeWithPath(
-                    _moduleId,
-                    0,
+                message: ( localize(
+                    4500,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [( (new Action('reload', ( localizeWithPath(_moduleId, 1, "Reload Window")), '', true, () => this._hostService.reload())))]
+                    primary: [( (new Action('reload', ( localize(4501, "Reload Window")), '', true, () => this._hostService.reload())))]
                 }
             });
         }
@@ -107,9 +105,8 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             if (enablementState === EnablementState.DisabledByVirtualWorkspace) {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        2,
+                    message: ( localize(
+                        4502,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -119,30 +116,28 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             else if (enablementState === EnablementState.DisabledByTrustRequirement) {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    message: ( localize(
+                        4503,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( (new Action('manageWorkspaceTrust', ( localizeWithPath(_moduleId, 4, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))]
+                        primary: [( (new Action('manageWorkspaceTrust', ( localize(4504, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage'))))]
                     }
                 });
             }
             else if (this._extensionEnablementService.canChangeEnablement(missingInstalledDependency)) {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        5,
+                    message: ( localize(
+                        4505,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( (new Action('enable', ( localizeWithPath(_moduleId, 6, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( (new Action('enable', ( localize(4506, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e)))))]
                     }
                 });
@@ -150,9 +145,8 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             else {
                 this._notificationService.notify({
                     severity: Severity$1.Error,
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        7,
+                    message: ( localize(
+                        4507,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -172,24 +166,22 @@ let MainThreadExtensionService = class MainThreadExtensionService {
         if (dependencyExtension) {
             this._notificationService.notify({
                 severity: Severity$1.Error,
-                message: ( localizeWithPath(
-                    _moduleId,
-                    8,
+                message: ( localize(
+                    4508,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
                     dependencyExtension.publisherDisplayName
                 )),
                 actions: {
-                    primary: [( (new Action('install', ( localizeWithPath(_moduleId, 9, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( (new Action('install', ( localize(4509, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e)))))]
                 }
             });
         }
         else {
-            this._notificationService.error(( localizeWithPath(
-                _moduleId,
-                10,
+            this._notificationService.error(( localize(
+                4510,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -4,7 +4,7 @@ import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
@@ -28,7 +28,6 @@ import { normalizeWatcherPattern } from 'vscode/vscode/vs/platform/files/common/
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 
 var MainThreadFileSystemEventService_1;
-const _moduleId = "vs/workbench/api/browser/mainThreadFileSystemEventService";
 let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
     static { MainThreadFileSystemEventService_1 = this; }
     static { this.MementoKeyAdditionalEdits = `file.particpants.additionalEdits`; }
@@ -81,33 +80,29 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     let message;
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                0,
+                            message = ( localize(
+                                4511,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                1,
+                            message = ( localize(
+                                4512,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                2,
+                            message = ( localize(
+                                4513,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                3,
+                            message = ( localize(
+                                4514,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -115,33 +110,29 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     }
                     else {
                         if (operation === FileOperation.CREATE) {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                4,
+                            message = ( localize(
+                                4515,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                5,
+                            message = ( localize(
+                                4516,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                6,
+                            message = ( localize(
+                                4517,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
-                            message = ( localizeWithPath(
-                                _moduleId,
-                                7,
+                            message = ( localize(
+                                4518,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -151,8 +142,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity$1.Info,
                             message,
-                            primaryButton: ( localizeWithPath(_moduleId, 8, "Show &&Preview")),
-                            cancelButton: ( localizeWithPath(_moduleId, 9, "Skip Changes"))
+                            primaryButton: ( localize(4519, "Show &&Preview")),
+                            cancelButton: ( localize(4520, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,19 +162,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localizeWithPath(_moduleId, 10, "&&OK")),
+                                    label: ( localize(4521, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localizeWithPath(_moduleId, 8, "Show &&Preview")),
+                                    label: ( localize(4521, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localizeWithPath(_moduleId, 9, "Skip Changes")),
+                                label: ( localize(4521, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localizeWithPath(_moduleId, 11, "Do not ask me again")) }
+                            checkbox: { label: ( localize(4522, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -200,15 +191,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case FileOperation.CREATE:
-                        return ( localizeWithPath(_moduleId, 12, "Running 'File Create' participants..."));
+                        return ( localize(4523, "Running 'File Create' participants..."));
                     case FileOperation.MOVE:
-                        return ( localizeWithPath(_moduleId, 13, "Running 'File Rename' participants..."));
+                        return ( localize(4524, "Running 'File Rename' participants..."));
                     case FileOperation.COPY:
-                        return ( localizeWithPath(_moduleId, 14, "Running 'File Copy' participants..."));
+                        return ( localize(4525, "Running 'File Copy' participants..."));
                     case FileOperation.DELETE:
-                        return ( localizeWithPath(_moduleId, 15, "Running 'File Delete' participants..."));
+                        return ( localize(4526, "Running 'File Delete' participants..."));
                     case FileOperation.WRITE:
-                        return ( localizeWithPath(_moduleId, 16, "Running 'File Write' participants..."));
+                        return ( localize(4527, "Running 'File Write' participants..."));
                 }
             }
         });
@@ -310,7 +301,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localizeWithPath(_moduleId, 17, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(4528, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js

@@ -822,8 +822,8 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         }
         return provider.resolveDocumentOnDropFileData(requestId, dataId);
     }
-    $registerMappedEditsProvider(handle, selector) {
-        const provider = ( new MainThreadMappedEditsProvider(handle, this._proxy, this._uriIdentService));
+    $registerMappedEditsProvider(handle, selector, displayName) {
+        const provider = ( new MainThreadMappedEditsProvider(displayName, handle, this._proxy, this._uriIdentService));
         this._registrations.set(handle, this._languageFeaturesService.mappedEditsProvider.register(selector, provider));
     }
 };
@@ -1029,7 +1029,8 @@ class MainThreadDocumentRangeSemanticTokensProvider {
     }
 }
 class MainThreadMappedEditsProvider {
-    constructor(_handle, _proxy, _uriService) {
+    constructor(displayName, _handle, _proxy, _uriService) {
+        this.displayName = displayName;
         this._handle = _handle;
         this._proxy = _proxy;
         this._uriService = _uriService;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -3,7 +3,7 @@ import { DeferredPromise, AsyncIterableSource } from 'vscode/vscode/vs/base/comm
 import { transformErrorFromSerialization, transformErrorForSerialization } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap, Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ILanguageModelStatsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
@@ -14,7 +14,6 @@ import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/auth
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadLanguageModels";
 let MainThreadLanguageModels = class MainThreadLanguageModels {
     constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService) {
         this._chatProviderService = _chatProviderService;
@@ -130,7 +129,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localizeWithPath(_moduleId, 0, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(4498, 'Language Models'));
         const disposables = ( (new DisposableStore()));
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( (new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel))));
         disposables.add(toDisposable(() => {

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -9,7 +9,6 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadMessageService";
 let MainThreadMessageService = class MainThreadMessageService {
     constructor(extHostContext, _notificationService, _commandService, _dialogService, extensionService) {
         this._notificationService = _notificationService;
@@ -52,13 +51,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                     };
                 }
                 if (!source) {
-                    source = ( localizeWithPath(_moduleId, 0, "Extension"));
+                    source = ( localize(4529, "Extension"));
                 }
                 const secondaryActions = [];
                 if (options.source) {
                     secondaryActions.push(toAction({
                         id: options.source.identifier.value,
-                        label: ( localizeWithPath(_moduleId, 1, "Manage Extension")),
+                        label: ( localize(4530, "Manage Extension")),
                         run: () => {
                             return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                         }
@@ -94,13 +93,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localizeWithPath(_moduleId, 2, "Cancel")),
+                    label: ( localize(4531, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localizeWithPath(_moduleId, 3, "&&OK")),
+                    label: ( localize(4532, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
@@ -7,7 +7,6 @@ import { raceCancellationError } from 'vscode/vscode/vs/base/common/async';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { NotebookFileWorkingCopyModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadNotebookSaveParticipant";
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {
         this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostNotebookDocumentSaveParticipant)));
@@ -18,7 +17,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( (new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( (new Error(( localizeWithPath(_moduleId, 0, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( (new Error(( localize(4544, "Aborted onWillSaveNotebookDocument-event after 1750ms")))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -5,9 +5,8 @@ import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/comm
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadProgress";
 class ManageExtensionAction extends Action {
     constructor(extensionId, label, commandService) {
         super(extensionId, label, undefined, true, () => {
@@ -32,7 +31,7 @@ let MainThreadProgress = class MainThreadProgress {
             const notificationOptions = {
                 ...options,
                 location: ProgressLocation.Notification,
-                secondaryActions: [( (new ManageExtensionAction(extensionId, ( localizeWithPath(_moduleId, 0, "Manage Extension")), this._commandService)))]
+                secondaryActions: [( (new ManageExtensionAction(extensionId, ( localize(4533, "Manage Extension")), this._commandService)))]
             };
             options = notificationOptions;
         }

package/vscode/src/vs/workbench/api/browser/mainThreadSCM.js

@@ -3,11 +3,12 @@ import { Barrier } from 'vscode/vscode/vs/base/common/async';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
+import { observableValueOpts } from 'vscode/vscode/vs/base/common/observableInternal/api';
 import { Disposable, DisposableStore, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
@@ -23,7 +24,6 @@ import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/langu
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 function getIconFromIconDto(iconDto) {
     if (iconDto === undefined) {
@@ -136,21 +136,19 @@ class MainThreadSCMResource {
 }
 class MainThreadSCMHistoryProvider {
     get currentHistoryItemGroup() { return this._currentHistoryItemGroup; }
-    set currentHistoryItemGroup(historyItemGroup) {
-        this._currentHistoryItemGroup = historyItemGroup;
-        this._onDidChangeCurrentHistoryItemGroup.fire();
-    }
-    get currentHistoryItemGroupObs() { return this._currentHistoryItemGroupObs; }
     constructor(proxy, handle) {
         this.proxy = proxy;
         this.handle = handle;
-        this._onDidChangeCurrentHistoryItemGroup = ( new Emitter());
-        this.onDidChangeCurrentHistoryItemGroup = this._onDidChangeCurrentHistoryItemGroup.event;
-        this._currentHistoryItemGroupObs = observableValue(this, undefined);
+        this.currentHistoryItemGroupId = derived(this, reader => this.currentHistoryItemGroup.read(reader)?.id);
+        this.currentHistoryItemGroupName = derived(this, reader => this.currentHistoryItemGroup.read(reader)?.name);
+        this._currentHistoryItemGroup = observableValueOpts({ owner: this, equalsFn: () => false }, undefined);
     }
     async resolveHistoryItemGroupCommonAncestor(historyItemGroupId1, historyItemGroupId2) {
         return this.proxy.$resolveHistoryItemGroupCommonAncestor(this.handle, historyItemGroupId1, historyItemGroupId2, CancellationToken.None);
     }
+    async resolveHistoryItemGroupCommonAncestor2(historyItemGroupIds) {
+        return this.proxy.$resolveHistoryItemGroupCommonAncestor2(this.handle, historyItemGroupIds, CancellationToken.None);
+    }
     async provideHistoryItems(historyItemGroupId, options) {
         const historyItems = await this.proxy.$provideHistoryItems(this.handle, historyItemGroupId, options, CancellationToken.None);
         return historyItems?.map(historyItem => toISCMHistoryItem(historyItem));
@@ -173,7 +171,7 @@ class MainThreadSCMHistoryProvider {
         }));
     }
     $onDidChangeCurrentHistoryItemGroup(historyItemGroup) {
-        this._currentHistoryItemGroupObs.set(historyItemGroup, undefined);
+        this._currentHistoryItemGroup.set(historyItemGroup, undefined);
     }
 }
 class MainThreadSCMProvider {
@@ -184,15 +182,14 @@ class MainThreadSCMProvider {
     get rootUri() { return this._rootUri; }
     get inputBoxTextModel() { return this._inputBoxTextModel; }
     get contextValue() { return this._providerId; }
-    get historyProvider() { return this._historyProvider; }
     get acceptInputCommand() { return this.features.acceptInputCommand; }
     get actionButton() { return this.features.actionButton ?? undefined; }
     get count() { return this._count; }
     get statusBarCommands() { return this._statusBarCommands; }
     get name() { return this._name ?? this._label; }
     get commitTemplate() { return this._commitTemplate; }
-    get historyProviderObs() { return this._historyProviderObs; }
-    constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService, _logService) {
+    get historyProvider() { return this._historyProvider; }
+    constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
         this.proxy = proxy;
         this._handle = _handle;
         this._providerId = _providerId;
@@ -202,7 +199,6 @@ class MainThreadSCMProvider {
         this._quickDiffService = _quickDiffService;
         this._uriIdentService = _uriIdentService;
         this._workspaceContextService = _workspaceContextService;
-        this._logService = _logService;
         this._id = `scm${MainThreadSCMProvider.ID_HANDLE++}`;
         this.groups = [];
         this._onDidChangeResourceGroups = ( new Emitter());
@@ -214,12 +210,10 @@ class MainThreadSCMProvider {
         this._count = observableValue(this, undefined);
         this._statusBarCommands = observableValue(this, undefined);
         this._commitTemplate = observableValue(this, '');
-        this._onDidChangeHistoryProvider = ( new Emitter());
-        this.onDidChangeHistoryProvider = this._onDidChangeHistoryProvider.event;
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this.isSCM = true;
-        this._historyProviderObs = observableValue(this, undefined);
+        this._historyProvider = observableValue(this, undefined);
         if (_rootUri) {
             const folder = this._workspaceContextService.getWorkspaceFolder(_rootUri);
             if (folder?.uri.toString() === ( _rootUri.toString())) {
@@ -240,7 +234,6 @@ class MainThreadSCMProvider {
             this._count.set(features.count, undefined);
         }
         if (typeof features.statusBarCommands !== 'undefined') {
-            this._logService.trace(`MainThreadSCMProvider#updateSourceControl (${this._id}): ${( features.statusBarCommands.map(c => c.title)).join(', ')}`);
             this._statusBarCommands.set(features.statusBarCommands, undefined);
         }
         if (features.hasQuickDiffProvider && !this._quickDiff) {
@@ -255,16 +248,12 @@ class MainThreadSCMProvider {
             this._quickDiff.dispose();
             this._quickDiff = undefined;
         }
-        if (features.hasHistoryProvider && !this._historyProvider) {
+        if (features.hasHistoryProvider && !this.historyProvider.get()) {
             const historyProvider = ( new MainThreadSCMHistoryProvider(this.proxy, this.handle));
-            this._historyProviderObs.set(historyProvider, undefined);
-            this._historyProvider = historyProvider;
-            this._onDidChangeHistoryProvider.fire();
+            this._historyProvider.set(historyProvider, undefined);
         }
-        else if (features.hasHistoryProvider === false && this._historyProvider) {
-            this._historyProviderObs.set(undefined, undefined);
-            this._historyProvider = undefined;
-            this._onDidChangeHistoryProvider.fire();
+        else if (features.hasHistoryProvider === false && this.historyProvider.get()) {
+            this._historyProvider.set(undefined, undefined);
         }
     }
     $registerGroups(_groups) {
@@ -356,11 +345,10 @@ class MainThreadSCMProvider {
         return result && URI.revive(result);
     }
     $onDidChangeHistoryProviderCurrentHistoryItemGroup(currentHistoryItemGroup) {
-        if (!this._historyProvider) {
+        if (!this.historyProvider.get()) {
             return;
         }
-        this._historyProvider.currentHistoryItemGroup = currentHistoryItemGroup ?? undefined;
-        this._historyProviderObs.get()?.$onDidChangeCurrentHistoryItemGroup(currentHistoryItemGroup);
+        this._historyProvider.get()?.$onDidChangeCurrentHistoryItemGroup(currentHistoryItemGroup);
     }
     toJSON() {
         return {
@@ -373,7 +361,7 @@ class MainThreadSCMProvider {
     }
 }
 let MainThreadSCM = class MainThreadSCM {
-    constructor(extHostContext, scmService, scmViewService, languageService, modelService, textModelService, quickDiffService, _uriIdentService, workspaceContextService, logService) {
+    constructor(extHostContext, scmService, scmViewService, languageService, modelService, textModelService, quickDiffService, _uriIdentService, workspaceContextService) {
         this.scmService = scmService;
         this.scmViewService = scmViewService;
         this.languageService = languageService;
@@ -382,7 +370,6 @@ let MainThreadSCM = class MainThreadSCM {
         this.quickDiffService = quickDiffService;
         this._uriIdentService = _uriIdentService;
         this.workspaceContextService = workspaceContextService;
-        this.logService = logService;
         this._repositories = ( new Map());
         this._repositoryBarriers = ( new Map());
         this._repositoryDisposables = ( new Map());
@@ -409,8 +396,7 @@ let MainThreadSCM = class MainThreadSCM {
             inputBoxTextModelRef.object.textEditorModel,
             this.quickDiffService,
             this._uriIdentService,
-            this.workspaceContextService,
-            this.logService
+            this.workspaceContextService
         ));
         const repository = this.scmService.registerSCMProvider(provider);
         this._repositories.set(handle, repository);
@@ -565,8 +551,7 @@ MainThreadSCM = __decorate([
     ( __param(5, ITextModelService)),
     ( __param(6, IQuickDiffService)),
     ( __param(7, IUriIdentityService)),
-    ( __param(8, IWorkspaceContextService)),
-    ( __param(9, ILogService))
+    ( __param(8, IWorkspaceContextService))
 ], MainThreadSCM);
 
 export { MainThreadSCM };

package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js

@@ -1,13 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { shouldSynchronizeModel } from 'vscode/vscode/vs/editor/common/model';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from 'vscode/vscode/vs/base/common/async';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadSaveParticipant";
 class ExtHostSaveParticipant {
     constructor(extHostContext) {
         this._proxy = ( (extHostContext.getProxy(ExtHostContext.ExtHostDocumentSaveParticipant)));
@@ -17,7 +16,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( (new Promise((resolve, reject) => {
-            setTimeout(() => reject(( (new Error(( localizeWithPath(_moduleId, 0, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750);
+            setTimeout(() => reject(( (new Error(( localize(4534, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( (new Error('listener failed'))));