@codingame/monaco-vscode-remote-agent-service-override 2.2.1 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-remote-agent-service-override",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.1"
+    "@codingame/monaco-vscode-environment-service-override": "3.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/remote/browser/remote.contribution.js

@@ -1,4 +1,4 @@
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ShowCandidateContribution } from './showCandidate.js';
 import { TunnelFactoryContribution } from './tunnelFactory.js';
@@ -8,10 +8,10 @@ import { ForwardedPortsView, PortRestore, AutomaticPortForwarding } from 'vscode
 import { InitialRemoteConnectionHealthContribution } from './remoteConnectionHealth.js';
 
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(ShowCandidateContribution, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(TunnelFactoryContribution, 2 );
+registerWorkbenchContribution2(ShowCandidateContribution.ID, ShowCandidateContribution, 2 );
+registerWorkbenchContribution2(TunnelFactoryContribution.ID, TunnelFactoryContribution, 2 );
 workbenchContributionsRegistry.registerWorkbenchContribution(RemoteAgentConnectionStatusListener, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(RemoteStatusIndicator, 1 );
+registerWorkbenchContribution2(RemoteStatusIndicator.ID, RemoteStatusIndicator, 1 );
 workbenchContributionsRegistry.registerWorkbenchContribution(ForwardedPortsView, 3 );
 workbenchContributionsRegistry.registerWorkbenchContribution(PortRestore, 4 );
 workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwarding, 4 );

package/vscode/src/vs/workbench/contrib/remote/browser/remote.js

@@ -509,11 +509,11 @@ RemoteViewPaneContainer = ( __decorate([
 ], RemoteViewPaneContainer));
 ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
-    title: { value: ( localizeWithPath(
+    title: ( localize2WithPath(
         'vs/workbench/contrib/remote/browser/remote',
         'remote.explorer',
         "Remote Explorer"
-    )), original: 'Remote Explorer' },
+    )),
     ctorDescriptor: ( new SyncDescriptor(RemoteViewPaneContainer)),
     hideIfEmpty: true,
     viewOrderDelegate: {

package/vscode/src/vs/workbench/contrib/remote/browser/remoteIndicator.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { remoteConnectionLatencyMeasurer, IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
 import { RunOnceScheduler, retry } from 'vscode/vscode/vs/base/common/async';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
@@ -42,6 +42,7 @@ import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 var RemoteStatusIndicator_1;
 let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
     static { RemoteStatusIndicator_1 = this; }
+    static { this.ID = 'workbench.contrib.remoteStatusIndicator'; }
     static { this.REMOTE_ACTIONS_COMMAND_ID = 'workbench.action.remote.showMenu'; }
     static { this.CLOSE_REMOTE_COMMAND_ID = 'workbench.action.remote.close'; }
     static { this.SHOW_CLOSE_REMOTE_COMMAND_ID = !isWeb; }
@@ -111,22 +112,22 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         this.updateRemoteStatusIndicator();
     }
     registerActions() {
-        const category = { value: ( localizeWithPath(
+        const category = ( localize2WithPath(
             'vs/workbench/contrib/remote/browser/remoteIndicator',
             'remote.category',
             "Remote"
-        )), original: 'Remote' };
+        ));
         const that = this;
         registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: RemoteStatusIndicator_1.REMOTE_ACTIONS_COMMAND_ID,
                     category,
-                    title: { value: ( localizeWithPath(
+                    title: ( localize2WithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'remote.showMenu',
                         "Show Remote Menu"
-                    )), original: 'Show Remote Menu' },
+                    )),
                     f1: true,
                     keybinding: {
                         weight: 200 ,
@@ -142,11 +143,11 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     super({
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
                         category,
-                        title: { value: ( localizeWithPath(
+                        title: ( localize2WithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             'remote.close',
                             "Close Remote Connection"
-                        )), original: 'Close Remote Connection' },
+                        )),
                         f1: true,
                         precondition: ( ContextKeyExpr.or(RemoteNameContext, VirtualWorkspaceContext))
                     });
@@ -174,11 +175,11 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     super({
                         id: RemoteStatusIndicator_1.INSTALL_REMOTE_EXTENSIONS_ID,
                         category,
-                        title: { value: ( localizeWithPath(
+                        title: ( localize2WithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             'remote.install',
                             "Install Remote Development Extensions"
-                        )), original: 'Install Remote Development Extensions' },
+                        )),
                         f1: true
                     });
                     this.run = (accessor, input) => {

package/vscode/src/vs/workbench/contrib/remote/browser/showCandidate.js

@@ -4,6 +4,7 @@ import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
 
 let ShowCandidateContribution = class ShowCandidateContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.showPortCandidate'; }
     constructor(remoteExplorerService, environmentService) {
         super();
         const showPortCandidate = environmentService.options?.tunnelProvider?.showPortCandidate;

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelFactory.js

@@ -11,6 +11,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { forwardedPortsViewEnabled } from 'vscode/vscode/vs/workbench/services/remote/common/tunnelModel';
 
 let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.tunnelFactory'; }
     constructor(tunnelService, environmentService, openerService, remoteExplorerService, logService, contextKeyService) {
         super();
         this.openerService = openerService;

package/vscode/src/vs/workbench/contrib/remote/common/remote.contribution.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { OS, isWeb } from 'vscode/vscode/vs/base/common/platform';
@@ -23,6 +23,7 @@ import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIp
 import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 let LabelContribution = class LabelContribution {
+    static { this.ID = 'workbench.contrib.remoteLabel'; }
     constructor(labelService, remoteAgentService) {
         this.labelService = labelService;
         this.remoteAgentService = remoteAgentService;
@@ -71,6 +72,7 @@ RemoteChannelsContribution = ( __decorate([
     ( __param(2, ILoggerService))
 ], RemoteChannelsContribution));
 let RemoteInvalidWorkspaceDetector = class RemoteInvalidWorkspaceDetector extends Disposable {
+    static { this.ID = 'workbench.contrib.remoteInvalidWorkspaceDetector'; }
     constructor(fileService, dialogService, environmentService, contextService, fileDialogService, remoteAgentService) {
         super();
         this.fileService = fileService;
@@ -131,9 +133,9 @@ RemoteInvalidWorkspaceDetector = ( __decorate([
     ( __param(5, IRemoteAgentService))
 ], RemoteInvalidWorkspaceDetector));
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(LabelContribution, 1 );
+registerWorkbenchContribution2(LabelContribution.ID, LabelContribution, 1 );
 workbenchContributionsRegistry.registerWorkbenchContribution(RemoteChannelsContribution, 3 );
-workbenchContributionsRegistry.registerWorkbenchContribution(RemoteInvalidWorkspaceDetector, 1 );
+registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidWorkspaceDetector, 1 );
 {
     class TriggerReconnectAction extends Action2 {
         constructor() {

package/vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js

@@ -9,8 +9,7 @@ import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
@@ -31,6 +30,7 @@ RemoteAgentService = ( __decorate([
     ( __param(6, ILogService))
 ], RemoteAgentService));
 let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFailureNotificationContribution {
+    static { this.ID = 'workbench.contrib.browserRemoteConnectionFailureNotification'; }
     constructor(remoteAgentService, _dialogService, _hostService) {
         this._dialogService = _dialogService;
         this._hostService = _hostService;
@@ -73,7 +73,6 @@ RemoteConnectionFailureNotificationContribution = ( __decorate([
     ( __param(1, IDialogService)),
     ( __param(2, IHostService))
 ], RemoteConnectionFailureNotificationContribution));
-const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(RemoteConnectionFailureNotificationContribution, 2 );
+registerWorkbenchContribution2(RemoteConnectionFailureNotificationContribution.ID, RemoteConnectionFailureNotificationContribution, 2 );
 
 export { RemoteAgentService };