@codingame/monaco-vscode-remote-agent-service-override 3.2.3 → 4.0.0

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

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

package/remoteAgent.js

@@ -45,7 +45,7 @@ let InjectedRemoteAuthorityResolverService = class InjectedRemoteAuthorityResolv
         const connectionToken = environmentService.options.connectionToken;
         const remoteResourceLoader = configuration.remoteResourceProvider != null ? new BrowserRemoteResourceLoader(fileService, configuration.remoteResourceProvider) : undefined;
         const resourceUriProvider = configuration.resourceUriProvider ?? remoteResourceLoader?.getResourceUriProvider();
-        super(!environmentService.expectsResolverExtension, connectionToken, resourceUriProvider, productService, logService);
+        super(!environmentService.expectsResolverExtension, connectionToken, resourceUriProvider, configuration.serverBasePath, productService, logService);
     }
 };
 InjectedRemoteAuthorityResolverService = __decorate([

package/vscode/src/vs/platform/log/common/logIpc.js

@@ -1,4 +1,6 @@
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/log/common/log';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 
 class RemoteLoggerChannelClient extends Disposable {

package/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.js

@@ -10,10 +10,10 @@ import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { getRemoteAuthorityPrefix, WebSocketRemoteConnection } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { getRemoteServerRootPath, parseAuthorityWithOptionalPort } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
+import { parseAuthorityWithOptionalPort } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 
 let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extends Disposable {
-    constructor(isWorkbenchOptionsBasedResolution, connectionToken, resourceUriProvider, productService, _logService) {
+    constructor(isWorkbenchOptionsBasedResolution, connectionToken, resourceUriProvider, serverBasePath, productService, _logService) {
         super();
         this._logService = _logService;
         this._onDidChangeConnectionData = this._register(( new Emitter()));
@@ -26,7 +26,7 @@ let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extend
         if (resourceUriProvider) {
             RemoteAuthorities.setDelegate(resourceUriProvider);
         }
-        RemoteAuthorities.setServerRootPath(getRemoteServerRootPath(productService));
+        RemoteAuthorities.setServerRootPath(productService, serverBasePath);
     }
     async resolveAuthority(authority) {
         let result = this._resolveAuthorityRequests.get(authority);
@@ -103,8 +103,8 @@ let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extend
     }
 };
 RemoteAuthorityResolverService = ( __decorate([
-    ( __param(3, IProductService)),
-    ( __param(4, ILogService))
+    ( __param(4, IProductService)),
+    ( __param(5, ILogService))
 ], RemoteAuthorityResolverService));
 
 export { RemoteAuthorityResolverService };

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

@@ -24,7 +24,7 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { ReloadWindowAction } from 'vscode/vscode/vs/workbench/browser/actions/windowActions';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SwitchRemoteViewItem } from './explorerViewItems.js';
@@ -782,7 +782,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                         else if (!this._reloadWindowShown) {
                             this._reloadWindowShown = true;
                             dialogService.confirm({
-                                type: Severity.Error,
+                                type: Severity$1.Error,
                                 message: ( localizeWithPath(
                                     'vs/workbench/contrib/remote/browser/remote',
                                     'reconnectionPermanentFailure',

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

@@ -12,10 +12,11 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 const REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY = 'remote.unsupportedConnectionChoice';
+const BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY = 'workbench.banner.remote.unsupportedConnection.dismissed';
 let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHealthContribution {
     constructor(_remoteAgentService, _environmentService, _telemetryService, bannerService, dialogService, openerService, hostService, storageService, productService) {
         this._remoteAgentService = _remoteAgentService;
@@ -33,7 +34,7 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
     }
     async _confirmConnection() {
         const { result, checkboxChecked } = await this.dialogService.prompt({
-            type: Severity.Warning,
+            type: Severity$1.Warning,
             message: ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remoteConnectionHealth',
                 'unsupportedGlibcWarning',
@@ -87,28 +88,35 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
                     allowed = await this._confirmConnection();
                 }
                 if (allowed) {
-                    const actions = [
-                        {
-                            label: ( localizeWithPath(
+                    const bannerDismissedVersion = this.storageService.get(`${BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY}`, 0 ) ?? '';
+                    const shouldShowBanner = bannerDismissedVersion.slice(0, bannerDismissedVersion.lastIndexOf('.')) !== this.productService.version.slice(0, this.productService.version.lastIndexOf('.'));
+                    if (shouldShowBanner) {
+                        const actions = [
+                            {
+                                label: ( localizeWithPath(
+                                    'vs/workbench/contrib/remote/browser/remoteConnectionHealth',
+                                    'unsupportedGlibcBannerLearnMore',
+                                    "Learn More"
+                                )),
+                                href: 'https://aka.ms/vscode-remote/faq/old-linux'
+                            }
+                        ];
+                        this.bannerService.show({
+                            id: 'unsupportedGlibcWarning.banner',
+                            message: ( localizeWithPath(
                                 'vs/workbench/contrib/remote/browser/remoteConnectionHealth',
-                                'unsupportedGlibcBannerLearnMore',
-                                "Learn More"
+                                'unsupportedGlibcWarning.banner',
+                                "You are connected to an OS version that is unsupported by {0}.",
+                                this.productService.nameLong
                             )),
-                            href: 'https://aka.ms/vscode-remote/faq/old-linux'
-                        }
-                    ];
-                    this.bannerService.show({
-                        id: 'unsupportedGlibcWarning.banner',
-                        message: ( localizeWithPath(
-                            'vs/workbench/contrib/remote/browser/remoteConnectionHealth',
-                            'unsupportedGlibcWarning.banner',
-                            "You are connected to an OS version that is unsupported by {0}.",
-                            this.productService.nameLong
-                        )),
-                        actions,
-                        icon: Codicon.warning,
-                        disableCloseAction: true
-                    });
+                            actions,
+                            icon: Codicon.warning,
+                            closeLabel: `Do not show again in v${this.productService.version}`,
+                            onClose: () => {
+                                this.storageService.store(`${BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY}`, this.productService.version, 0 , 1 );
+                            }
+                        });
+                    }
                 }
                 else {
                     this.hostService.openWindow({ forceReuseWindow: true, remoteAuthority: null });

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

@@ -38,6 +38,10 @@ import { infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 
 var RemoteStatusIndicator_1;
 let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
@@ -50,7 +54,28 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
     static { this.REMOTE_STATUS_LABEL_MAX_LENGTH = 40; }
     static { this.REMOTE_CONNECTION_LATENCY_SCHEDULER_DELAY = 60 * 1000; }
     static { this.REMOTE_CONNECTION_LATENCY_SCHEDULER_FIRST_RUN_DELAY = 10 * 1000; }
-    constructor(statusbarService, environmentService, labelService, contextKeyService, menuService, quickInputService, commandService, extensionService, remoteAgentService, remoteAuthorityResolverService, hostService, workspaceContextService, logService, extensionGalleryService, telemetryService, productService, extensionManagementService, openerService) {
+    get remoteExtensionMetadata() {
+        if (!this._remoteExtensionMetadata) {
+            const remoteExtensionTips = { ...this.productService.remoteExtensionTips, ...this.productService.virtualWorkspaceExtensionTips };
+            this._remoteExtensionMetadata = ( ( Object.values(remoteExtensionTips)).filter(value => value.startEntry !== undefined).map(value => {
+                return {
+                    id: value.extensionId,
+                    installed: false,
+                    friendlyName: value.friendlyName,
+                    isPlatformCompatible: false,
+                    dependencies: [],
+                    helpLink: value.startEntry?.helpLink ?? '',
+                    startConnectLabel: value.startEntry?.startConnectLabel ?? '',
+                    startCommand: value.startEntry?.startCommand ?? '',
+                    priority: value.startEntry?.priority ?? 10,
+                    supportedPlatforms: value.supportedPlatforms
+                };
+            }));
+            this.remoteExtensionMetadata.sort((ext1, ext2) => ext1.priority - ext2.priority);
+        }
+        return this._remoteExtensionMetadata;
+    }
+    constructor(statusbarService, environmentService, labelService, contextKeyService, menuService, quickInputService, commandService, extensionService, remoteAgentService, remoteAuthorityResolverService, hostService, workspaceContextService, logService, extensionGalleryService, telemetryService, productService, extensionManagementService, openerService, configurationService) {
         super();
         this.statusbarService = statusbarService;
         this.environmentService = environmentService;
@@ -70,6 +95,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         this.productService = productService;
         this.extensionManagementService = extensionManagementService;
         this.openerService = openerService;
+        this.configurationService = configurationService;
         this.legacyIndicatorMenu = this._register(this.menuService.createMenu(MenuId.StatusBarWindowIndicatorMenu, this.contextKeyService));
         this.remoteIndicatorMenu = this._register(this.menuService.createMenu(MenuId.StatusBarRemoteIndicatorMenu, this.contextKeyService));
         this.remoteAuthority = this.environmentService.remoteAuthority;
@@ -80,25 +106,10 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         this.networkState = undefined;
         this.measureNetworkConnectionLatencyScheduler = undefined;
         this.loggedInvalidGroupNames = Object.create(null);
+        this._remoteExtensionMetadata = undefined;
         this.remoteMetadataInitialized = false;
         this._onDidChangeEntries = this._register(( new Emitter()));
         this.onDidChangeEntries = this._onDidChangeEntries.event;
-        const remoteExtensionTips = { ...this.productService.remoteExtensionTips, ...this.productService.virtualWorkspaceExtensionTips };
-        this.remoteExtensionMetadata = ( ( Object.values(remoteExtensionTips)).filter(value => value.startEntry !== undefined).map(value => {
-            return {
-                id: value.extensionId,
-                installed: false,
-                friendlyName: value.friendlyName,
-                isPlatformCompatible: false,
-                dependencies: [],
-                helpLink: value.startEntry?.helpLink ?? '',
-                startConnectLabel: value.startEntry?.startConnectLabel ?? '',
-                startCommand: value.startEntry?.startCommand ?? '',
-                priority: value.startEntry?.priority ?? 10,
-                supportedPlatforms: value.supportedPlatforms
-            };
-        }));
-        this.remoteExtensionMetadata.sort((ext1, ext2) => ext1.priority - ext2.priority);
         if (this.remoteAuthority) {
             this.connectionState = 'initializing';
             this.connectionStateContextKey.set(this.connectionState);
@@ -118,7 +129,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             "Remote"
         ));
         const that = this;
-        registerAction2(class extends Action2 {
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: RemoteStatusIndicator_1.REMOTE_ACTIONS_COMMAND_ID,
@@ -136,9 +147,9 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 });
                 this.run = () => that.showRemoteMenu();
             }
-        });
+        }));
         if (RemoteStatusIndicator_1.SHOW_CLOSE_REMOTE_COMMAND_ID) {
-            registerAction2(class extends Action2 {
+            this._register(registerAction2(class extends Action2 {
                 constructor() {
                     super({
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
@@ -153,7 +164,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     });
                     this.run = () => that.hostService.openWindow({ forceReuseWindow: true, remoteAuthority: null });
                 }
-            });
+            }));
             if (this.remoteAuthority) {
                 MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
                     group: '6_close',
@@ -170,7 +181,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             }
         }
         if (this.extensionGalleryService.isEnabled()) {
-            registerAction2(class extends Action2 {
+            this._register(registerAction2(class extends Action2 {
                 constructor() {
                     super({
                         id: RemoteStatusIndicator_1.INSTALL_REMOTE_EXTENSIONS_ID,
@@ -192,7 +203,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                         });
                     };
                 }
-            });
+            }));
         }
     }
     registerListeners() {
@@ -625,7 +636,8 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     }
                 }
             }
-            if (this.extensionGalleryService.isEnabled() && this.remoteMetadataInitialized) {
+            const showExtensionRecommendations = this.configurationService.getValue('workbench.remoteIndicator.showExtensionRecommendations');
+            if (showExtensionRecommendations && this.extensionGalleryService.isEnabled() && this.remoteMetadataInitialized) {
                 const notInstalledItems = [];
                 for (const metadata of this.remoteExtensionMetadata) {
                     if (!metadata.installed && metadata.isPlatformCompatible) {
@@ -768,7 +780,23 @@ RemoteStatusIndicator = RemoteStatusIndicator_1 = ( __decorate([
     ( __param(14, ITelemetryService)),
     ( __param(15, IProductService)),
     ( __param(16, IExtensionManagementService)),
-    ( __param(17, IOpenerService))
+    ( __param(17, IOpenerService)),
+    ( __param(18, IConfigurationService))
 ], RemoteStatusIndicator));
+( Registry.as(Extensions.Configuration))
+    .registerConfiguration({
+    ...workbenchConfigurationNodeBase,
+    properties: {
+        'workbench.remoteIndicator.showExtensionRecommendations': {
+            type: 'boolean',
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/remote/browser/remoteIndicator',
+                'remote.showExtensionRecommendations',
+                "When enabled, remote extensions recommendations will be shown in the Remote Indicator menu."
+            )),
+            default: true
+        },
+    }
+});
 
 export { RemoteStatusIndicator };

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

@@ -37,7 +37,7 @@ let RemoteStartEntry = class RemoteStartEntry extends Disposable {
             "Remote"
         ));
         const startEntry = this;
-        registerAction2(class extends Action2 {
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: RemoteStartEntry_1.REMOTE_WEB_START_ENTRY_ACTIONS_COMMAND_ID,
@@ -53,7 +53,7 @@ let RemoteStartEntry = class RemoteStartEntry extends Disposable {
             async run() {
                 await startEntry.showWebRemoteStartActions();
             }
-        });
+        }));
     }
     registerListeners() {
         this._register(this.extensionEnablementService.onEnablementChanged(async (result) => {

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

@@ -272,7 +272,7 @@ const extensionKindSchema = {
             markdownDescription: ( localizeWithPath(
                 'vs/workbench/contrib/remote/common/remote.contribution',
                 'remote.autoForwardPortFallback',
-                "The number of auto forwarded ports that will trigger the switch from `process` to `hybrid` when automatically forwarding ports and `remote.autoForwardPortsSource` is set to `process`. Set to `0` to disable the fallback."
+                "The number of auto forwarded ports that will trigger the switch from `process` to `hybrid` when automatically forwarding ports and `remote.autoForwardPortsSource` is set to `process` by default. Set to `0` to disable the fallback. When `remote.autoForwardPortsFallback` hasn't been configured, but `remote.autoForwardPortsSource` has, `remote.autoForwardPortsFallback` will be treated as though it's set to `0`."
             ))
         },
         'remote.forwardOnOpen': {