@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/services/progress/browser/progressIndicator.js

@@ -1,7 +1,6 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { emptyProgressRunner } from '../../../../platform/progress/common/progress.js';
-import { GroupModelChangeKind } from '../../../common/editor.js';
 class EditorProgressIndicator extends Disposable {
     constructor(progressBar, group) {
         super();
@@ -11,8 +10,8 @@ class EditorProgressIndicator extends Disposable {
     }
     registerListeners() {
         this._register(this.group.onDidModelChange(e => {
-            if (e.kind === GroupModelChangeKind.EDITOR_ACTIVE ||
-                (e.kind === GroupModelChangeKind.EDITOR_CLOSE && this.group.isEmpty)) {
+            if (e.kind === 8  ||
+                (e.kind === 6  && this.group.isEmpty)) {
                 this.progressBar.stop().hide();
             }
         }));
@@ -74,23 +73,22 @@ class EditorProgressIndicator extends Disposable {
 }
 var ProgressIndicatorState;
 ( (function(ProgressIndicatorState) {
-    let Type;
     ( (function(Type) {
         Type[Type["None"] = 0] = "None";
         Type[Type["Done"] = 1] = "Done";
         Type[Type["Infinite"] = 2] = "Infinite";
         Type[Type["While"] = 3] = "While";
         Type[Type["Work"] = 4] = "Work";
-    })(Type = ProgressIndicatorState.Type || (ProgressIndicatorState.Type = {})));
-    ProgressIndicatorState.None = { type: Type.None };
-    ProgressIndicatorState.Done = { type: Type.Done };
-    ProgressIndicatorState.Infinite = { type: Type.Infinite };
+    })(ProgressIndicatorState.Type || (ProgressIndicatorState.Type = {})));
+    ProgressIndicatorState.None = { type: 0  };
+    ProgressIndicatorState.Done = { type: 1  };
+    ProgressIndicatorState.Infinite = { type: 2  };
     class While {
         constructor(whilePromise, whileStart, whileDelay) {
             this.whilePromise = whilePromise;
             this.whileStart = whileStart;
             this.whileDelay = whileDelay;
-            this.type = Type.While;
+            this.type = 3 ;
         }
     }
     ProgressIndicatorState.While = While;
@@ -98,7 +96,7 @@ var ProgressIndicatorState;
         constructor(total, worked) {
             this.total = total;
             this.worked = worked;
-            this.type = Type.Work;
+            this.type = 4 ;
         }
     }
     ProgressIndicatorState.Work = Work;
@@ -125,7 +123,7 @@ class ScopedProgressIndicator extends Disposable {
         if (this.progressState.type === ProgressIndicatorState.Done.type) {
             return;
         }
-        if (this.progressState.type === ProgressIndicatorState.Type.While) {
+        if (this.progressState.type === 3 ) {
             let delay;
             if (this.progressState.whileDelay > 0) {
                 const remainingDelay = this.progressState.whileDelay - (Date.now() - this.progressState.whileStart);
@@ -135,10 +133,10 @@ class ScopedProgressIndicator extends Disposable {
             }
             this.doShowWhile(delay);
         }
-        else if (this.progressState.type === ProgressIndicatorState.Type.Infinite) {
+        else if (this.progressState.type === 2 ) {
             this.progressBar.infinite().show();
         }
-        else if (this.progressState.type === ProgressIndicatorState.Type.Work) {
+        else if (this.progressState.type === 4 ) {
             if (this.progressState.total) {
                 this.progressBar.total(this.progressState.total).show();
             }
@@ -158,23 +156,23 @@ class ScopedProgressIndicator extends Disposable {
             this.progressState = new ProgressIndicatorState.Work(infiniteOrTotal, undefined);
         }
         if (this.scope.isActive) {
-            if (this.progressState.type === ProgressIndicatorState.Type.Infinite) {
+            if (this.progressState.type === 2 ) {
                 this.progressBar.infinite().show(delay);
             }
-            else if (this.progressState.type === ProgressIndicatorState.Type.Work && typeof this.progressState.total === 'number') {
+            else if (this.progressState.type === 4  && typeof this.progressState.total === 'number') {
                 this.progressBar.total(this.progressState.total).show(delay);
             }
         }
         return {
             total: (total) => {
-                this.progressState = new ProgressIndicatorState.Work(total, this.progressState.type === ProgressIndicatorState.Type.Work ? this.progressState.worked : undefined);
+                this.progressState = new ProgressIndicatorState.Work(total, this.progressState.type === 4  ? this.progressState.worked : undefined);
                 if (this.scope.isActive) {
                     this.progressBar.total(total);
                 }
             },
             worked: (worked) => {
                 if (!this.scope.isActive || this.progressBar.hasTotal()) {
-                    this.progressState = new ProgressIndicatorState.Work(this.progressState.type === ProgressIndicatorState.Type.Work ? this.progressState.total : undefined, this.progressState.type === ProgressIndicatorState.Type.Work && typeof this.progressState.worked === 'number' ? this.progressState.worked + worked : worked);
+                    this.progressState = new ProgressIndicatorState.Work(this.progressState.type === 4  ? this.progressState.total : undefined, this.progressState.type === 4  && typeof this.progressState.worked === 'number' ? this.progressState.worked + worked : worked);
                     if (this.scope.isActive) {
                         this.progressBar.worked(worked);
                     }
@@ -193,8 +191,8 @@ class ScopedProgressIndicator extends Disposable {
         };
     }
     async showWhile(promise, delay) {
-        if (this.progressState.type === ProgressIndicatorState.Type.While) {
-            promise = Promise.all([promise, this.progressState.whilePromise]);
+        if (this.progressState.type === 3 ) {
+            promise = Promise.allSettled([promise, this.progressState.whilePromise]);
         }
         this.progressState = new ProgressIndicatorState.While(promise, delay || 0, Date.now());
         try {
@@ -204,7 +202,7 @@ class ScopedProgressIndicator extends Disposable {
         catch (error) {
         }
         finally {
-            if (this.progressState.type !== ProgressIndicatorState.Type.While || this.progressState.whilePromise === promise) {
+            if (this.progressState.type !== 3  || this.progressState.whilePromise === promise) {
                 this.progressState = ProgressIndicatorState.None;
                 if (this.scope.isActive) {
                     this.progressBar.stop().hide();

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.d.ts

@@ -46,5 +46,10 @@ interface HelpInformation {
     remoteName?: string[] | string;
     virtualWorkspace?: string;
 }
+declare enum PortsEnablement {
+    Disabled = 0,
+    ViewOnly = 1,
+    AdditionalFeatures = 2
+}
 
-export { type HelpInformation, type ITunnelItem, TunnelEditId, TunnelType };
+export { type HelpInformation, type ITunnelItem, PortsEnablement, TunnelEditId, TunnelType };

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js

@@ -2,8 +2,6 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localize } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import '../../../../platform/instantiation/common/extensions.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { TunnelModel } from './tunnelModel.js';
@@ -36,7 +34,7 @@ const getStartedWalkthrough = {
     required: ['id'],
     properties: {
         id: {
-            description: ( localize(3555, 'The ID of a Get Started walkthrough to open.')),
+            description: ( localize(572, 'The ID of a Get Started walkthrough to open.')),
             type: 'string'
         },
     }
@@ -44,12 +42,12 @@ const getStartedWalkthrough = {
 const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteHelp',
     jsonSchema: {
-        description: ( localize(3556, 'Contributes help information for Remote')),
+        description: ( localize(573, 'Contributes help information for Remote')),
         type: 'object',
         properties: {
             'getStarted': {
                 description: ( localize(
-                    3557,
+                    574,
                     "The url, or a command that returns the url, to your project's Getting Started page, or a walkthrough ID contributed by your project's extension"
                 )),
                 oneOf: [
@@ -59,29 +57,29 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
             },
             'documentation': {
                 description: ( localize(
-                    3558,
+                    575,
                     "The url, or a command that returns the url, to your project's documentation page"
                 )),
                 type: 'string'
             },
             'feedback': {
                 description: ( localize(
-                    3559,
+                    576,
                     "The url, or a command that returns the url, to your project's feedback reporter"
                 )),
                 type: 'string',
-                markdownDeprecationMessage: ( localize(3560, "Use {0} instead", '`reportIssue`'))
+                markdownDeprecationMessage: ( localize(577, "Use {0} instead", '`reportIssue`'))
             },
             'reportIssue': {
                 description: ( localize(
-                    3561,
+                    578,
                     "The url, or a command that returns the url, to your project's issue reporter"
                 )),
                 type: 'string'
             },
             'issues': {
                 description: ( localize(
-                    3562,
+                    579,
                     "The url, or a command that returns the url, to your project's issues list"
                 )),
                 type: 'string'
@@ -89,6 +87,12 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
         }
     }
 });
+var PortsEnablement;
+( ((function(PortsEnablement) {
+    PortsEnablement[PortsEnablement["Disabled"] = 0] = "Disabled";
+    PortsEnablement[PortsEnablement["ViewOnly"] = 1] = "ViewOnly";
+    PortsEnablement[PortsEnablement["AdditionalFeatures"] = 2] = "AdditionalFeatures";
+})(PortsEnablement || (PortsEnablement = {}))));
 let RemoteExplorerService = class RemoteExplorerService {
     constructor(storageService, tunnelService, instantiationService) {
         this.storageService = storageService;
@@ -103,7 +107,7 @@ let RemoteExplorerService = class RemoteExplorerService {
         this.onDidChangeEditable = this._onDidChangeEditable.event;
         this._onEnabledPortsFeatures = ( (new Emitter()));
         this.onEnabledPortsFeatures = this._onEnabledPortsFeatures.event;
-        this._portsFeaturesEnabled = false;
+        this._portsFeaturesEnabled = PortsEnablement.Disabled;
         this.namedProcesses = ( (new Map()));
         this._tunnelModel = instantiationService.createInstance(TunnelModel);
         remoteHelpExtPoint.setHandler((extensions) => {
@@ -119,8 +123,8 @@ let RemoteExplorerService = class RemoteExplorerService {
         const newName = name.length > 0 ? name[0] : '';
         if (current !== newName) {
             this._targetType = name;
-            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), StorageScope.WORKSPACE, StorageTarget.MACHINE);
-            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), StorageScope.PROFILE, StorageTarget.USER);
+            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), 1 , 1 );
+            this.storageService.store(REMOTE_EXPLORER_TYPE_KEY, ( (this._targetType.toString())), 0 , 0 );
             this._onDidChangeTargetType.fire(this._targetType);
         }
     }
@@ -177,8 +181,8 @@ let RemoteExplorerService = class RemoteExplorerService {
     restore() {
         return this.tunnelModel.restoreForwarded();
     }
-    enablePortsFeatures() {
-        this._portsFeaturesEnabled = true;
+    enablePortsFeatures(viewOnly) {
+        this._portsFeaturesEnabled = viewOnly ? PortsEnablement.ViewOnly : PortsEnablement.AdditionalFeatures;
         this._onEnabledPortsFeatures.fire();
     }
     get portsFeaturesEnabled() {
@@ -190,4 +194,4 @@ RemoteExplorerService = ( (__decorate([
     ( (__param(1, ITunnelService))),
     ( (__param(2, IInstantiationService)))
 ], RemoteExplorerService)));
-export { PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, REMOTE_EXPLORER_TYPE_KEY, RemoteExplorerService, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID, TunnelEditId, TunnelType };
+export { PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, PortsEnablement, REMOTE_EXPLORER_TYPE_KEY, RemoteExplorerService, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID, TunnelEditId, TunnelType };

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.service.d.ts

@@ -6,7 +6,7 @@ import { IEditableData } from '../../../common/views.js';
 import { TunnelInformation } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 import { TunnelModel, TunnelProperties, Attributes, TunnelCloseReason, CandidatePort } from './tunnelModel.js';
 import { IExtensionPointUser } from '../../extensions/common/extensionsRegistry.js';
-import { HelpInformation, ITunnelItem, TunnelEditId } from './remoteExplorerService.js';
+import { HelpInformation, ITunnelItem, TunnelEditId, PortsEnablement } from './remoteExplorerService.js';
 
 declare const IRemoteExplorerService: ServiceIdentifier<IRemoteExplorerService>;
 interface IRemoteExplorerService {
@@ -31,9 +31,9 @@ interface IRemoteExplorerService {
     setCandidateFilter(filter: ((candidates: CandidatePort[]) => Promise<CandidatePort[]>) | undefined): IDisposable;
     onFoundNewCandidates(candidates: CandidatePort[]): void;
     restore(): Promise<void>;
-    enablePortsFeatures(): void;
+    enablePortsFeatures(viewOnly: boolean): void;
     onEnabledPortsFeatures: Event<void>;
-    portsFeaturesEnabled: boolean;
+    portsFeaturesEnabled: PortsEnablement;
     readonly namedProcesses: Map<number, string>;
 }
 

package/vscode/src/vs/workbench/services/remote/common/tunnelModel.d.ts

@@ -148,6 +148,7 @@ declare class TunnelModel extends Disposable {
     private portAttributesProviders;
     constructor(tunnelService: ITunnelService, storageService: IStorageService, configurationService: IConfigurationService, environmentService: IWorkbenchEnvironmentService, remoteAuthorityResolverService: IRemoteAuthorityResolverService, workspaceContextService: IWorkspaceContextService, logService: ILogService, dialogService: IDialogService, extensionService: IExtensionService, contextKeyService: IContextKeyService);
     private extensionHasActivationEvent;
+    private hasCheckedExtensionsOnTunnelOpened;
     private checkExtensionActivationEvents;
     private onTunnelClosed;
     private makeLocalUri;

package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js

@@ -9,7 +9,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.service.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ProvidedOnAutoForward, isLocalhost, isAllInterfaces, TunnelProtocol, TunnelPrivacyId, LOCALHOST_ADDRESSES, ALL_INTERFACES_ADDRESSES } from '../../../../platform/tunnel/common/tunnel.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
@@ -26,7 +25,8 @@ const TUNNELS_TO_RESTORE = 'remote.tunnels.toRestore';
 const TUNNELS_TO_RESTORE_EXPIRATION = 'remote.tunnels.toRestoreExpiration';
 const RESTORE_EXPIRATION_TIME = 1000 * 60 * 60 * 24 * 14;
 const ACTIVATION_EVENT = 'onTunnel';
-const forwardedPortsViewEnabled = ( (new RawContextKey('forwardedPortsViewEnabled', false, ( localize(8727, "Whether the Ports view is enabled.")))));
+const forwardedPortsFeaturesEnabled = ( (new RawContextKey('forwardedPortsViewEnabled', false, ( localize(3781, "Whether the Ports view is enabled.")))));
+const forwardedPortsViewEnabled = ( (new RawContextKey('forwardedPortsViewOnlyEnabled', false, ( localize(3781, "Whether the Ports view is enabled.")))));
 function parseAddress(address) {
     const matches = address.match(/^([a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)*:)?([0-9]+)$/);
     if (!matches) {
@@ -48,11 +48,11 @@ var TunnelSource;
 })(TunnelSource || (TunnelSource = {}))));
 const UserTunnelSource = {
     source: TunnelSource.User,
-    description: ( localize(8728, "User Forwarded"))
+    description: ( localize(3782, "User Forwarded"))
 };
 const AutoTunnelSource = {
     source: TunnelSource.Auto,
-    description: ( localize(8729, "Auto Forwarded"))
+    description: ( localize(3783, "Auto Forwarded"))
 };
 function mapHasAddress(map, host, port) {
     const initialAddress = map.get(makeAddress(host, port));
@@ -334,6 +334,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         this.unrestoredExtensionTunnels = ( (new Map()));
         this.sessionCachedProperties = ( (new Map()));
         this.portAttributesProviders = [];
+        this.hasCheckedExtensionsOnTunnelOpened = false;
         this.mismatchCooldown = ( (new Date()));
         this.configPortsAttributes = ( (new PortsAttributes(configurationService)));
         this.tunnelRestoreValue = this.getTunnelRestoreValue();
@@ -392,13 +393,14 @@ let TunnelModel = class TunnelModel extends Disposable {
                 });
             }
             await this.storeForwarded();
+            this.checkExtensionActivationEvents(true);
             this.remoteTunnels.set(key, tunnel);
             this._onForwardPort.fire(this.forwarded.get(key));
         }));
         this._register(this.tunnelService.onTunnelClosed(address => {
             return this.onTunnelClosed(address, TunnelCloseReason.Other);
         }));
-        this.checkExtensionActivationEvents();
+        this.checkExtensionActivationEvents(false);
     }
     extensionHasActivationEvent() {
         if (this.extensionService.extensions.find(extension => extension.activationEvents?.includes(ACTIVATION_EVENT))) {
@@ -407,7 +409,17 @@ let TunnelModel = class TunnelModel extends Disposable {
         }
         return false;
     }
-    checkExtensionActivationEvents() {
+    checkExtensionActivationEvents(tunnelOpened) {
+        if (this.hasCheckedExtensionsOnTunnelOpened) {
+            return;
+        }
+        if (tunnelOpened) {
+            this.hasCheckedExtensionsOnTunnelOpened = true;
+        }
+        const hasRemote = this.environmentService.remoteAuthority !== undefined;
+        if (hasRemote && !tunnelOpened) {
+            return;
+        }
         if (this.extensionHasActivationEvent()) {
             return;
         }
@@ -452,9 +464,9 @@ let TunnelModel = class TunnelModel extends Disposable {
         return this.addStorageKeyPostfix(TUNNELS_TO_RESTORE_EXPIRATION);
     }
     async getTunnelRestoreValue() {
-        const deprecatedValue = this.storageService.get(TUNNELS_TO_RESTORE, StorageScope.WORKSPACE);
+        const deprecatedValue = this.storageService.get(TUNNELS_TO_RESTORE, 1 );
         if (deprecatedValue) {
-            this.storageService.remove(TUNNELS_TO_RESTORE, StorageScope.WORKSPACE);
+            this.storageService.remove(TUNNELS_TO_RESTORE, 1 );
             await this.storeForwarded();
             return deprecatedValue;
         }
@@ -462,7 +474,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         if (!storageKey) {
             return undefined;
         }
-        return this.storageService.get(storageKey, StorageScope.PROFILE);
+        return this.storageService.get(storageKey, 0 );
     }
     async restoreForwarded() {
         this.cleanupExpiredTunnelsForRestore();
@@ -493,23 +505,23 @@ let TunnelModel = class TunnelModel extends Disposable {
         if (!this.restoreListener) {
             const key = await this.getTunnelRestoreStorageKey();
             this.restoreListener = this._register(( (new DisposableStore())));
-            this.restoreListener.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, undefined, this.restoreListener)(async (e) => {
+            this.restoreListener.add(this.storageService.onDidChangeValue(0 , undefined, this.restoreListener)(async (e) => {
                 if (e.key === key) {
-                    this.tunnelRestoreValue = Promise.resolve(this.storageService.get(key, StorageScope.PROFILE));
+                    this.tunnelRestoreValue = Promise.resolve(this.storageService.get(key, 0 ));
                     await this.restoreForwarded();
                 }
             }));
         }
     }
     cleanupExpiredTunnelsForRestore() {
-        const keys = ( (this.storageService.keys(StorageScope.PROFILE, StorageTarget.USER))).filter(key => key.startsWith(TUNNELS_TO_RESTORE_EXPIRATION));
+        const keys = ( (this.storageService.keys(0, 0 ))).filter(key => key.startsWith(TUNNELS_TO_RESTORE_EXPIRATION));
         for (const key of keys) {
-            const expiration = this.storageService.getNumber(key, StorageScope.PROFILE);
+            const expiration = this.storageService.getNumber(key, 0 );
             if (expiration && expiration < Date.now()) {
                 this.tunnelRestoreValue = Promise.resolve(undefined);
                 const storageKey = key.replace(TUNNELS_TO_RESTORE_EXPIRATION, TUNNELS_TO_RESTORE);
-                this.storageService.remove(key, StorageScope.PROFILE);
-                this.storageService.remove(storageKey, StorageScope.PROFILE);
+                this.storageService.remove(key, 0 );
+                this.storageService.remove(storageKey, 0 );
             }
         }
     }
@@ -535,12 +547,12 @@ let TunnelModel = class TunnelModel extends Disposable {
             const key = await this.getTunnelRestoreStorageKey();
             const expirationKey = await this.getRestoreExpirationStorageKey();
             if (!valueToStore && key && expirationKey) {
-                this.storageService.remove(key, StorageScope.PROFILE);
-                this.storageService.remove(expirationKey, StorageScope.PROFILE);
+                this.storageService.remove(key, 0 );
+                this.storageService.remove(expirationKey, 0 );
             }
             else if ((valueToStore !== this.knownPortsRestoreValue) && key && expirationKey) {
-                this.storageService.store(key, valueToStore, StorageScope.PROFILE, StorageTarget.USER);
-                this.storageService.store(expirationKey, Date.now() + RESTORE_EXPIRATION_TIME, StorageScope.PROFILE, StorageTarget.USER);
+                this.storageService.store(key, valueToStore, 0 , 0 );
+                this.storageService.store(expirationKey, Date.now() + RESTORE_EXPIRATION_TIME, 0 , 0 );
             }
             this.knownPortsRestoreValue = valueToStore;
         }
@@ -558,7 +570,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         }
         this.mismatchCooldown = newCooldown;
         const mismatchString = ( localize(
-            8730,
+            3784,
             "Local port {0} could not be used for forwarding to remote port {1}.\n\nThis usually happens when there is already another process using local port {0}.\n\nPort number {2} has been used instead.",
             expectedLocal,
             tunnel.tunnelRemotePort,
@@ -725,7 +737,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     privacy: TunnelPrivacyId.ConstantPrivate,
                     source: {
                         source: TunnelSource.Extension,
-                        description: ( localize(8731, "Statically Forwarded"))
+                        description: ( localize(3785, "Statically Forwarded"))
                     }
                 });
                 this.tunnelService.setEnvironmentTunnel(tunnel.remoteAddress.host, tunnel.remoteAddress.port, localAddress, TunnelPrivacyId.ConstantPrivate, TunnelProtocol.Http);
@@ -896,4 +908,4 @@ TunnelModel = ( (__decorate([
     ( (__param(8, IExtensionService))),
     ( (__param(9, IContextKeyService)))
 ], TunnelModel)));
-export { ACTIVATION_EVENT, AutoTunnelSource, OnPortForward, PortsAttributes, TunnelCloseReason, TunnelModel, TunnelSource, UserTunnelSource, forwardedPortsViewEnabled, isCandidatePort, makeAddress, mapHasAddress, mapHasAddressLocalhostOrAllInterfaces, parseAddress };
+export { ACTIVATION_EVENT, AutoTunnelSource, OnPortForward, PortsAttributes, TunnelCloseReason, TunnelModel, TunnelSource, UserTunnelSource, forwardedPortsFeaturesEnabled, forwardedPortsViewEnabled, isCandidatePort, makeAddress, mapHasAddress, mapHasAddressLocalhostOrAllInterfaces, parseAddress };

package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js

@@ -6,7 +6,6 @@ import { joinPath } from '../../../../base/common/resources.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { resolvePatternsForProvider, excludeToGlobPattern, DEFAULT_MAX_SEARCH_RESULTS, QueryGlobTester, hasSiblingFn } from './search.js';
 import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
 import { OldFileSearchProviderConverter } from './searchExtConversionTypes.js';
 class FileSearchEngine {
     constructor(config, provider, sessionLifecycle) {
@@ -206,15 +205,20 @@ class FileSearchEngine {
         }
     }
 }
-class SessionLifecycle extends Disposable {
+class SessionLifecycle {
     constructor() {
-        super();
-        this.obj = ( new Object());
+        this._obj = ( new Object());
         this.tokenSource = ( new CancellationTokenSource());
     }
-    dispose() {
+    get obj() {
+        if (this._obj) {
+            return this._obj;
+        }
+        throw ( new Error('Session object has been dereferenced.'));
+    }
+    cancel() {
         this.tokenSource.cancel();
-        super.dispose();
+        this._obj = undefined;
     }
 }
 class FileSearchManager {
@@ -244,7 +248,7 @@ class FileSearchManager {
         });
     }
     clearCache(cacheKey) {
-        this.sessions.get(cacheKey)?.dispose();
+        this.sessions.get(cacheKey)?.cancel();
         this.sessions.delete(cacheKey);
     }
     getSessionTokenSource(cacheKey) {

package/vscode/src/vs/workbench/services/search/common/queryBuilder.js

@@ -15,11 +15,11 @@ import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
-import { toWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { toWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { IEditorGroupsService } from '../../editor/common/editorGroupsService.service.js';
 import { IPathService } from '../../path/common/pathService.service.js';
-import { QueryType, pathIncludedInQuery, getExcludes } from './search.js';
+import { pathIncludedInQuery, getExcludes } from './search.js';
 function isISearchPatternBuilder(object) {
     return (typeof object === 'object' && 'uri' in object && 'pattern' in object);
 }
@@ -32,6 +32,14 @@ let QueryBuilder = class QueryBuilder {
         this.pathService = pathService;
         this.uriIdentityService = uriIdentityService;
     }
+    aiText(contentPattern, folderResources, options = {}) {
+        const commonQuery = this.commonQuery(folderResources?.map(toWorkspaceFolder), options);
+        return {
+            ...commonQuery,
+            type: 3 ,
+            contentPattern,
+        };
+    }
     text(contentPattern, folderResources, options = {}) {
         contentPattern = this.getContentPattern(contentPattern, options);
         const searchConfig = this.configurationService.getValue();
@@ -42,7 +50,7 @@ let QueryBuilder = class QueryBuilder {
         const commonQuery = this.commonQuery(folderResources?.map(toWorkspaceFolder), options);
         return {
             ...commonQuery,
-            type: QueryType.Text,
+            type: 2 ,
             contentPattern,
             previewOptions: options.previewOptions,
             maxFileSize: options.maxFileSize,
@@ -96,7 +104,7 @@ let QueryBuilder = class QueryBuilder {
         const commonQuery = this.commonQuery(folders, options);
         return {
             ...commonQuery,
-            type: QueryType.File,
+            type: 1 ,
             filePattern: options.filePattern
                 ? options.filePattern.trim()
                 : options.filePattern,
@@ -304,7 +312,7 @@ let QueryBuilder = class QueryBuilder {
                     searchPath: URI.file(normalize(searchPath))
                 }];
         }
-        if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+        if (this.workspaceContextService.getWorkbenchState() === 2 ) {
             const workspaceUri = this.workspaceContextService.getWorkspace().folders[0].uri;
             searchPath = normalizeSlashes(searchPath);
             if (searchPath.startsWith('../') || searchPath === '..') {
@@ -346,7 +354,7 @@ let QueryBuilder = class QueryBuilder {
             else {
                 const probableWorkspaceFolderNameMatch = searchPath.match(/\.[\/\\](.+)[\/\\]?/);
                 const probableWorkspaceFolderName = probableWorkspaceFolderNameMatch ? probableWorkspaceFolderNameMatch[1] : searchPath;
-                const searchPathNotFoundError = ( localize(4363, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
+                const searchPathNotFoundError = ( localize(4472, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
                 throw ( (new Error(searchPathNotFoundError)));
             }
         }
@@ -491,7 +499,7 @@ function resolveResourcesForSearchIncludes(resources, contextService) {
     if (resources) {
         resources.forEach(resource => {
             let folderPath;
-            if (contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+            if (contextService.getWorkbenchState() === 2 ) {
                 folderPath = relativePath(workspace.folders[0].uri, resource);
                 if (folderPath && folderPath !== '.') {
                     folderPath = './' + folderPath;

package/vscode/src/vs/workbench/services/search/common/replace.js

@@ -1,5 +1,4 @@
 import { createRegExp } from '../../../../base/common/strings.js';
-import { CharCode } from '../../../../base/common/charCode.js';
 import { buildReplaceStringWithCasePreserved } from '../../../../base/common/search.js';
 class ReplacePattern {
     constructor(replaceString, arg2, arg3) {
@@ -120,7 +119,7 @@ class ReplacePattern {
         let substrFrom = 0, result = '';
         for (let i = 0, len = replaceString.length; i < len; i++) {
             const chCode = replaceString.charCodeAt(i);
-            if (chCode === CharCode.Backslash) {
+            if (chCode === 92 ) {
                 i++;
                 if (i >= len) {
                     break;
@@ -128,13 +127,13 @@ class ReplacePattern {
                 const nextChCode = replaceString.charCodeAt(i);
                 let replaceWithCharacter = null;
                 switch (nextChCode) {
-                    case CharCode.Backslash:
+                    case 92 :
                         replaceWithCharacter = '\\';
                         break;
-                    case CharCode.n:
+                    case 110 :
                         replaceWithCharacter = '\n';
                         break;
-                    case CharCode.t:
+                    case 116 :
                         replaceWithCharacter = '\t';
                         break;
                 }
@@ -143,7 +142,7 @@ class ReplacePattern {
                     substrFrom = i + 1;
                 }
             }
-            if (chCode === CharCode.DollarSign) {
+            if (chCode === 36 ) {
                 i++;
                 if (i >= len) {
                     break;
@@ -151,16 +150,16 @@ class ReplacePattern {
                 const nextChCode = replaceString.charCodeAt(i);
                 let replaceWithCharacter = null;
                 switch (nextChCode) {
-                    case CharCode.Digit0:
+                    case 48 :
                         replaceWithCharacter = '$&';
                         this._hasParameters = true;
                         break;
-                    case CharCode.BackTick:
-                    case CharCode.SingleQuote:
+                    case 96 :
+                    case 39 :
                         this._hasParameters = true;
                         break;
                     default: {
-                        if (!this.between(nextChCode, CharCode.Digit1, CharCode.Digit9)) {
+                        if (!this.between(nextChCode, 49 , 57 )) {
                             break;
                         }
                         if (i === replaceString.length - 1) {
@@ -168,7 +167,7 @@ class ReplacePattern {
                             break;
                         }
                         let charCode = replaceString.charCodeAt(++i);
-                        if (!this.between(charCode, CharCode.Digit0, CharCode.Digit9)) {
+                        if (!this.between(charCode, 48 , 57 )) {
                             this._hasParameters = true;
                             --i;
                             break;
@@ -178,7 +177,7 @@ class ReplacePattern {
                             break;
                         }
                         charCode = replaceString.charCodeAt(++i);
-                        if (!this.between(charCode, CharCode.Digit0, CharCode.Digit9)) {
+                        if (!this.between(charCode, 48 , 57 )) {
                             this._hasParameters = true;
                             --i;
                             break;