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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "7.0.11",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.0.11",
-    "@codingame/monaco-vscode-files-service-override": "7.0.11"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1",
+    "@codingame/monaco-vscode-files-service-override": "7.1.1"
   }
 }

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -5,17 +5,15 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { InstallOperation, EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
-const _moduleId = "vs/platform/extensionManagement/common/extensionManagementCLI";
-const notFound = (id) => ( localizeWithPath(_moduleId, 0, "Extension '{0}' not found.", id));
-const useId = ( localizeWithPath(
-    _moduleId,
-    1,
+const notFound = (id) => ( localize(9788, "Extension '{0}' not found.", id));
+const useId = ( localize(
+    9789,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -52,7 +50,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localizeWithPath(_moduleId, 2, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(9790, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -67,7 +65,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localizeWithPath(_moduleId, 3, "Installing extensions on {0}...", this.location)) : ( localizeWithPath(_moduleId, 4, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(9791, "Installing extensions on {0}...", this.location)) : ( localize(9792, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -110,18 +108,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localizeWithPath(
-                _moduleId,
-                5,
-                "Error while installing extensions: {0}",
-                getErrorMessage(error)
-            )));
+            this.logger.error(( localize(9793, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( (new Error(
-                localizeWithPath(_moduleId, 6, "Failed Installing Extensions: {0}", failed.join(', '))
-            )));
+            throw ( (new Error(localize(9794, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -132,9 +123,8 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 installedExtensionsQuery.push({ ...extension.identifier, preRelease: extension.preRelease });
             }
         }
-        this.logger.trace(( localizeWithPath(
-            _moduleId,
-            7,
+        this.logger.trace(( localize(
+            9795,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -151,30 +141,27 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localizeWithPath(_moduleId, 8, "No extension to update")));
+            this.logger.info(( localize(9796, "No extension to update")));
             return;
         }
-        this.logger.info(( localizeWithPath(
-            _moduleId,
-            9,
+        this.logger.info(( localize(
+            9797,
             "Updating extensions: {0}",
             ( (extensionsToUpdate.map(ext => ext.extension.identifier.id))).join(', ')
         )));
         const installationResult = await this.extensionManagementService.installGalleryExtensions(extensionsToUpdate);
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
-                this.logger.error(( localizeWithPath(
-                    _moduleId,
-                    10,
+                this.logger.error(( localize(
+                    9798,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
                 )));
             }
             else {
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    11,
+                this.logger.info(( localize(
+                    9799,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -187,9 +174,8 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const installedExtension = installed.find(i => areSameExtensions(i.identifier, { id }));
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
-                    this.logger.info(( localizeWithPath(
-                        _moduleId,
-                        12,
+                    this.logger.info(( localize(
+                        9800,
                         "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.",
                         id,
                         installedExtension.manifest.version,
@@ -198,7 +184,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localizeWithPath(_moduleId, 13, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(9801, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
             }
@@ -231,27 +217,25 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const installedExtension = installed.find(e => areSameExtensions(e.identifier, gallery.identifier));
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
-                    this.logger.info(( localizeWithPath(
-                        _moduleId,
-                        13,
+                    this.logger.info(( localize(
+                        9801,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    14,
+                this.logger.info(( localize(
+                    9802,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localizeWithPath(_moduleId, 15, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localizeWithPath(_moduleId, 16, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9803, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9804, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localizeWithPath(_moduleId, 17, "Installing extension '{0}' v{1}...", id, version)) : ( localizeWithPath(_moduleId, 18, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9805, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9806, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -262,9 +246,8 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const installationResult = await this.extensionManagementService.installGalleryExtensions(extensionsToInstall);
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
-                    this.logger.error(( localizeWithPath(
-                        _moduleId,
-                        19,
+                    this.logger.error(( localize(
+                        9807,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -272,9 +255,8 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     failed.push(extensionResult.identifier.id);
                 }
                 else {
-                    this.logger.info(( localizeWithPath(
-                        _moduleId,
-                        20,
+                    this.logger.info(( localize(
+                        9808,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -292,17 +274,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const valid = await this.validateVSIX(manifest, force, installOptions.profileLocation, installedExtensions);
         if (valid) {
             try {
-                await this.extensionManagementService.install(vsix, installOptions);
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    21,
-                    "Extension '{0}' was successfully installed.",
-                    basename(vsix)
-                )));
+                await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
+                this.logger.info(( localize(9809, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localizeWithPath(_moduleId, 22, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(9810, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -336,9 +313,8 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const extensionIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    23,
+                this.logger.info(( localize(
+                    9811,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -365,38 +341,35 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 throw ( (new Error(`${this.notInstalled(id)}\n${useId}`)));
             }
             if (( (extensionsToUninstall.some(e => e.type === ExtensionType.System)))) {
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    24,
+                this.logger.info(( localize(
+                    9812,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
                 return;
             }
             if (!force && ( (extensionsToUninstall.some(e => e.isBuiltin)))) {
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    25,
+                this.logger.info(( localize(
+                    9813,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localizeWithPath(_moduleId, 26, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(9814, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
-                this.logger.info(( localizeWithPath(
-                    _moduleId,
-                    27,
+                this.logger.info(( localize(
+                    9815,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localizeWithPath(_moduleId, 28, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(9816, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -414,13 +387,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localizeWithPath(
-            _moduleId,
-            29,
-            "Extension '{0}' is not installed on {1}.",
-            id,
-            this.location
-        )) : ( localizeWithPath(_moduleId, 30, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(9817, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9818, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( (__decorate([

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
@@ -18,7 +18,6 @@ import { getAuthenticationProviderActivationEvent } from 'vscode/vscode/vs/workb
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadAuthentication";
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(_proxy, id, label, supportsMultipleAccounts, notificationService, onDidChangeSessionsEmitter) {
         super();
@@ -37,7 +36,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localizeWithPath(_moduleId, 0, "Successfully signed out.")));
+        this.notificationService.info(( localize(4548, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -92,9 +91,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async loginPrompt(provider, extensionName, recreatingSession, options) {
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
-            message = ( localizeWithPath(
-                _moduleId,
-                1,
+            message = ( localize(
+                4549,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -102,16 +100,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         else {
             message = recreatingSession
-                ? ( localizeWithPath(
-                _moduleId,
-                2,
+                ? ( localize(
+                4550,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
-                : ( localizeWithPath(
-                _moduleId,
-                3,
+                : ( localize(
+                4551,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -119,7 +115,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localizeWithPath(_moduleId, 4, "&&Allow")),
+                label: ( localize(4552, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -127,7 +123,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localizeWithPath(_moduleId, 5, "Learn more")),
+                label: ( localize(4553, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -162,18 +158,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 'Invalid combination of options. Please remove one of the following: createIfNone, silent'
             )));
         }
+        if (options.clearSessionPreference) {
+            this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
+        }
         if (!options.forceNewSession && sessions.length) {
             if (provider.supportsMultipleAccounts) {
-                if (options.clearSessionPreference) {
-                    this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
-                }
-                else {
-                    const existingSessionPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-                    if (existingSessionPreference) {
-                        const matchingSession = sessions.find(session => session.id === existingSessionPreference);
-                        if (matchingSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingSession.account.label, extensionId)) {
-                            return matchingSession;
-                        }
+                const existingSessionPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
+                if (existingSessionPreference) {
+                    const matchingSession = sessions.find(session => session.id === existingSessionPreference);
+                    if (matchingSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingSession.account.label, extensionId)) {
+                        return matchingSession;
                     }
                 }
             }
@@ -229,15 +223,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return session;
     }
     async $getAccounts(providerId) {
-        const sessions = await this.authenticationService.getSessions(providerId);
-        const accounts = ( (new Array()));
-        const seenAccounts = ( (new Set()));
-        for (const session of sessions) {
-            if (!( (seenAccounts.has(session.account.label)))) {
-                seenAccounts.add(session.account.label);
-                accounts.push(session.account);
-            }
-        }
+        const accounts = await this.authenticationService.getAccounts(providerId);
         return accounts;
     }
     sendProviderUsageTelemetry(extensionId, providerId) {

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

@@ -3,7 +3,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
@@ -18,7 +18,6 @@ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/service
 import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadCLICommands";
 CommandsRegistry.registerCommand('_remoteCLI.openExternal', function (accessor, uri) {
     const openerService = accessor.get(IOpenerService);
     return openerService.open(isString(uri) ? uri : URI.revive(uri), { openExternal: true, allowTunneling: true });
@@ -85,9 +84,8 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
     validateExtensionKind(manifest) {
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
-            this.logger.info(( localizeWithPath(
-                _moduleId,
-                0,
+            this.logger.info(( localize(
+                4499,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));

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

@@ -3,6 +3,7 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { CommentThreadCollapsibleState } from 'vscode/vscode/vs/editor/common/languages';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService.service';
@@ -15,7 +16,7 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -23,7 +24,6 @@ import { revealCommentThread } from 'vscode/vscode/vs/workbench/contrib/comments
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadComments";
 class MainThreadCommentThread {
     get input() {
         return this._input;
@@ -416,7 +416,7 @@ class MainThreadCommentController {
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localizeWithPath(_moduleId, 0, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(4543, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();
@@ -501,7 +501,7 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         }
         provider.updateCommentingRanges(resourceHints);
     }
-    async $revealCommentThread(handle, commentThreadHandle, options) {
+    async $revealCommentThread(handle, commentThreadHandle, commentUniqueIdInThread, options) {
         const provider = this._commentControllers.get(handle);
         if (!provider) {
             return Promise.resolve();
@@ -510,7 +510,19 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         if (!thread || !thread.isDocumentCommentThread()) {
             return Promise.resolve();
         }
-        revealCommentThread(this._commentService, this._editorService, this._uriIdentityService, thread, undefined, options.focusReply, undefined, options.preserveFocus);
+        const comment = thread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueIdInThread);
+        revealCommentThread(this._commentService, this._editorService, this._uriIdentityService, thread, comment, options.focusReply, undefined, options.preserveFocus);
+    }
+    async $hideCommentThread(handle, commentThreadHandle) {
+        const provider = this._commentControllers.get(handle);
+        if (!provider) {
+            return Promise.resolve();
+        }
+        const thread = provider.getAllComments().find(thread => thread.commentThreadHandle === commentThreadHandle);
+        if (!thread || !thread.isDocumentCommentThread()) {
+            return Promise.resolve();
+        }
+        thread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
     }
     registerView(commentsViewAlreadyRegistered) {
         if (!commentsViewAlreadyRegistered) {

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

@@ -10,7 +10,7 @@ import { basename } from 'vscode/vscode/vs/base/common/path';
 import { isEqualOrParent, isEqual, toLocalResource } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -38,7 +38,6 @@ import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/wor
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 
 var MainThreadCustomEditorModel_1;
-const _moduleId = "vs/workbench/api/browser/mainThreadCustomEditors";
 var CustomEditorModelType;
 ( ((function(CustomEditorModelType) {
     CustomEditorModelType[CustomEditorModelType["Custom"] = 0] = "Custom";
@@ -306,7 +305,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
                         return true;
                     }
                     return false;
-                })(), ( localizeWithPath(_moduleId, 0, "Custom editor '{0}' could not be saved.", this.name)));
+                })(), ( localize(9819, "Custom editor '{0}' could not be saved.", this.name)));
             }));
         }
         if (startDirty) {
@@ -373,7 +372,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localizeWithPath(_moduleId, 1, "Edit")),
+            label: label ?? ( localize(9820, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

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

@@ -1,12 +1,11 @@
 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 { raceCancellationError } from 'vscode/vscode/vs/base/common/async';
 import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace/common/editSessions.service';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 
-const _moduleId = "vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant";
 class ExtHostEditSessionIdentityCreateParticipant {
     constructor(extHostContext) {
         this.timeout = 10000;
@@ -14,11 +13,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( (new Promise((resolve, reject) => {
-            setTimeout(() => reject(( (new Error(( localizeWithPath(
-                _moduleId,
-                0,
-                "Aborted onWillCreateEditSessionIdentity-event after 10000ms"
-            )))))), this.timeout);
+            setTimeout(() => reject(( (new Error(( localize(4535, "Aborted onWillCreateEditSessionIdentity-event after 10000ms")))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         })));
         return raceCancellationError(p, token);

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

@@ -158,11 +158,11 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         if (editor instanceof MultiDiffEditorInput) {
             const diffEditors = [];
             for (const resource of (editor?.resources.get() ?? [])) {
-                if (resource.original && resource.modified) {
+                if (resource.originalUri && resource.modifiedUri) {
                     diffEditors.push({
                         kind: TabInputKind.TextDiffInput,
-                        original: resource.original,
-                        modified: resource.modified
+                        original: resource.originalUri,
+                        modified: resource.modifiedUri
                     });
                 }
             }