@codingame/monaco-vscode-api 2.0.3 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js

@@ -220,11 +220,13 @@ class NotebookCellTextModel extends Disposable {
                 const newOutput = splice.newOutputs[i];
                 this.replaceOutput(currentOutput.outputId, newOutput);
             }
-            this.outputs.splice(splice.start + commonLen, splice.deleteCount - commonLen, ...splice.newOutputs.slice(commonLen));
+            const removed = this.outputs.splice(splice.start + commonLen, splice.deleteCount - commonLen, ...splice.newOutputs.slice(commonLen));
+            removed.forEach(output => output.dispose());
             this._onDidChangeOutputs.fire({ start: splice.start + commonLen, deleteCount: splice.deleteCount - commonLen, newOutputs: splice.newOutputs.slice(commonLen) });
         }
         else {
-            this.outputs.splice(splice.start, splice.deleteCount, ...splice.newOutputs);
+            const removed = this.outputs.splice(splice.start, splice.deleteCount, ...splice.newOutputs);
+            removed.forEach(output => output.dispose());
             this._onDidChangeOutputs.fire(splice);
         }
     }
@@ -234,7 +236,12 @@ class NotebookCellTextModel extends Disposable {
             return false;
         }
         const output = this.outputs[outputIndex];
-        output.replaceData(newOutputItem);
+        output.replaceData({
+            outputs: newOutputItem.outputs,
+            outputId: newOutputItem.outputId,
+            metadata: newOutputItem.metadata
+        });
+        newOutputItem.dispose();
         this._onDidChangeOutputItems.fire();
         return true;
     }

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -1,10 +1,11 @@
-import { encodeBase64, VSBuffer, decodeBase64 } from '../../../../base/common/buffer.js';
-import { isRelativePattern, parse } from '../../../../base/common/glob.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { isRelativePattern, parse as parse$1 } from '../../../../base/common/glob.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { generate, parse } from '../../../services/notebook/common/notebookDocumentService.js';
 const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
 const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
 const INTERACTIVE_WINDOW_EDITOR_ID = 'workbench.editor.interactive';
@@ -74,35 +75,14 @@ var SelectionStateType;
 var CellUri;
 ( (function(CellUri) {
     CellUri.scheme = Schemas.vscodeNotebookCell;
-    const _lengths = ['W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f'];
-    const _padRegexp = ( new RegExp(`^[${_lengths.join('')}]+`));
-    const _radix = 7;
-    function generate(notebook, handle) {
-        const s = ( handle.toString(_radix));
-        const p = s.length < _lengths.length ? _lengths[s.length - 1] : 'z';
-        const fragment = `${p}${s}s${encodeBase64(VSBuffer.fromString(notebook.scheme), true, true)}`;
-        return notebook.with({ scheme: CellUri.scheme, fragment });
+    function generate$1(notebook, handle) {
+        return generate(notebook, handle);
     }
-    CellUri.generate = generate;
-    function parse(cell) {
-        if (cell.scheme !== CellUri.scheme) {
-            return undefined;
-        }
-        const idx = cell.fragment.indexOf('s');
-        if (idx < 0) {
-            return undefined;
-        }
-        const handle = parseInt(cell.fragment.substring(0, idx).replace(_padRegexp, ''), _radix);
-        const _scheme = ( decodeBase64(cell.fragment.substring(idx + 1)).toString());
-        if (isNaN(handle)) {
-            return undefined;
-        }
-        return {
-            handle,
-            notebook: cell.with({ scheme: _scheme, fragment: null })
-        };
+    CellUri.generate = generate$1;
+    function parse$1(cell) {
+        return parse(cell);
     }
-    CellUri.parse = parse;
+    CellUri.parse = parse$1;
     function generateCellOutputUri(notebook, outputId) {
         return notebook.with({
             scheme: Schemas.vscodeNotebookCellOutput,
@@ -147,7 +127,7 @@ class MimeTypeDisplayOrder {
         this.defaultOrder = defaultOrder;
         this.order = ( [...( new Set(initialValue))].map(pattern => ({
             pattern,
-            matches: parse(normalizeSlashes(pattern))
+            matches: parse$1(normalizeSlashes(pattern))
         })));
     }
     sort(mimetypes) {
@@ -170,7 +150,7 @@ class MimeTypeDisplayOrder {
     prioritize(chosenMimetype, otherMimetypes) {
         const chosenIndex = this.findIndex(chosenMimetype);
         if (chosenIndex === -1) {
-            this.order.unshift({ pattern: chosenMimetype, matches: parse(normalizeSlashes(chosenMimetype)) });
+            this.order.unshift({ pattern: chosenMimetype, matches: parse$1(normalizeSlashes(chosenMimetype)) });
             return;
         }
         const uniqueIndicies = ( new Set(( otherMimetypes.map(m => this.findIndex(m, chosenIndex)))));
@@ -265,7 +245,8 @@ const NotebookSetting = {
     focusIndicator: 'notebook.cellFocusIndicator',
     insertToolbarLocation: 'notebook.insertToolbarLocation',
     globalToolbar: 'notebook.globalToolbar',
-    stickyScroll: 'notebook.stickyScroll.enabled',
+    stickyScrollEnabled: 'notebook.stickyScroll.enabled',
+    stickyScrollMode: 'notebook.stickyScroll.mode',
     undoRedoPerCell: 'notebook.undoRedoPerCell',
     consolidatedOutputButton: 'notebook.consolidatedOutputButton',
     showFoldingControls: 'notebook.showFoldingControls',
@@ -279,6 +260,7 @@ const NotebookSetting = {
     outputScrollingDeprecated: 'notebook.experimental.outputScrolling',
     outputScrolling: 'notebook.output.scrolling',
     textOutputLineLimit: 'notebook.output.textLineLimit',
+    LinkifyOutputFilePaths: 'notebook.output.linkifyFilePaths',
     formatOnSave: 'notebook.formatOnSave.enabled',
     insertFinalNewline: 'notebook.insertFinalNewline',
     formatOnCellExecution: 'notebook.formatOnCellExecution',
@@ -297,7 +279,8 @@ const NotebookSetting = {
     gotoSymbolsAllSymbols: 'notebook.gotoSymbols.showAllSymbols',
     scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute',
     anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell',
-    cellChat: 'notebook.experimental.cellChat'
+    cellChat: 'notebook.experimental.cellChat',
+    notebookVariablesView: 'notebook.experimental.variablesView'
 };
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -14,6 +14,7 @@ import { IFilesConfigurationService } from '../../../services/filesConfiguration
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var NotebookEditorInput_1;
 let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEditorInput {
@@ -35,8 +36,8 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         return editor;
     }
     static { this.ID = 'workbench.input.notebook'; }
-    constructor(resource, preferredResource, viewType, options, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService) {
-        super(resource, preferredResource, labelService, fileService, filesConfigurationService);
+    constructor(resource, preferredResource, viewType, options, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService) {
+        super(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
         this.viewType = viewType;
         this.options = options;
         this._notebookService = _notebookService;
@@ -84,7 +85,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         return this.viewType;
     }
     get capabilities() {
-        let capabilities = 1024 ;
+        let capabilities = 0 ;
         if (this.resource.scheme === Schemas.untitled) {
             capabilities |= 4 ;
         }
@@ -126,7 +127,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         if (!model || !model.isDirty() || model.hasErrorState || this.hasCapability(4 )) {
             return false;
         }
-        return this.filesConfigurationService.getAutoSaveMode() === 1 ;
+        return this.filesConfigurationService.hasShortAutoSaveDelay(this);
     }
     async save(group, options) {
         if (this._editorModelReference) {
@@ -216,7 +217,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
         perf?.mark('extensionActivated');
         this._sideLoadedListener.dispose();
         if (!this._editorModelReference) {
-            const ref = await this._notebookModelResolverService.resolve(this.resource, this.viewType);
+            const ref = await this._notebookModelResolverService.resolve(this.resource, this.viewType, this.ensureLimits(_options));
             if (this._editorModelReference) {
                 ref.dispose();
                 return this._editorModelReference.object;
@@ -235,7 +236,7 @@ let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEdit
             }
         }
         else {
-            this._editorModelReference.object.load();
+            this._editorModelReference.object.load({ limits: this.ensureLimits(_options) });
         }
         if (this.options._backupId) {
             const info = await this._notebookService.withNotebookDataProvider(this._editorModelReference.object.notebook.viewType);
@@ -285,7 +286,8 @@ NotebookEditorInput = NotebookEditorInput_1 = ( __decorate([
     ( __param(8, IFileService)),
     ( __param(9, IFilesConfigurationService)),
     ( __param(10, IExtensionService)),
-    ( __param(11, IEditorService))
+    ( __param(11, IEditorService)),
+    ( __param(12, ITextResourceConfigurationService))
 ], NotebookEditorInput));
 function isCompositeNotebookEditorInput(thing) {
     return !!thing

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js

@@ -100,7 +100,10 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
                 this._workingCopy.onDidRevert(() => this._onDidRevertUntitled.fire());
             }
             else {
-                this._workingCopy = await this._workingCopyManager.resolve(this.resource, options?.forceReadFromFile ? { reload: { async: false, force: true } } : undefined);
+                this._workingCopy = await this._workingCopyManager.resolve(this.resource, {
+                    limits: options?.limits,
+                    reload: options?.forceReadFromFile ? { async: false, force: true } : undefined
+                });
                 this._workingCopyListeners.add(this._workingCopy.onDidSave(e => this._onDidSave.fire(e)));
                 this._workingCopyListeners.add(this._workingCopy.onDidChangeOrphaned(() => this._onDidChangeOrphaned.fire()));
                 this._workingCopyListeners.add(this._workingCopy.onDidChangeReadonly(() => this._onDidChangeReadonly.fire()));
@@ -116,7 +119,8 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
                 reload: {
                     async: !options?.forceReadFromFile,
                     force: options?.forceReadFromFile
-                }
+                },
+                limits: options?.limits
             });
         }
         assertType(this.isResolved());

package/vscode/src/vs/workbench/contrib/notebook/common/notebookKernelService.js

@@ -1,4 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const variablePageSize = 100;
 const INotebookKernelService = ( createDecorator('INotebookKernelService'));
 const INotebookKernelHistoryService = ( createDecorator('INotebookKernelHistoryService'));
-export { INotebookKernelHistoryService, INotebookKernelService };
+export { INotebookKernelHistoryService, INotebookKernelService, variablePageSize };

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from '../../../../nls.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Extensions } from '../../../common/views.js';
-import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING, IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
+import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING, IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
 import { OnPortForward, mapHasAddressLocalhostOrAllInterfaces, TunnelCloseReason, AutoTunnelSource, forwardedPortsViewEnabled, TunnelSource, makeAddress } from '../../../services/remote/common/tunnelModel.js';
 import { OpenPortInPreviewAction, OpenPortInBrowserAction, openPreviewEnabledContext, ForwardPortAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel } from './tunnelView.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -29,10 +29,9 @@ import { Extensions as Extensions$1 } from '../../../../platform/configuration/c
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
 import { Action } from '../../../../base/common/actions.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 const VIEWLET_ID = 'workbench.view.remote';
-const CAN_PROC_FALLBACK = 'processPortForwardingFallback';
 let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     constructor(contextKeyService, environmentService, remoteExplorerService, tunnelService, activityService, statusbarService) {
         super();
@@ -232,16 +231,29 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                 if (e.affectsConfiguration(PORT_AUTO_SOURCE_SETTING)) {
                     this.setup(environment);
                 }
+                else if (e.affectsConfiguration(PORT_AUTO_FALLBACK_SETTING) && !this.portListener) {
+                    this.listenForPorts();
+                }
             }));
         });
-    }
-    canFallbackToHybrid() {
-        return this.storageService.getBoolean(CAN_PROC_FALLBACK, 1 , true);
+        if (!this.storageService.getBoolean('processPortForwardingFallback', 1 , true)) {
+            this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, 5 );
+        }
     }
     listenForPorts() {
-        if (this.procForwarder && !this.portListener && this.canFallbackToHybrid() && this.configurationService.getValue(PORT_AUTO_SOURCE_SETTING) === PORT_AUTO_SOURCE_SETTING_PROCESS) {
+        let fallbackAt = this.configurationService.getValue(PORT_AUTO_FALLBACK_SETTING);
+        if (fallbackAt === 0) {
+            this.portListener?.dispose();
+            return;
+        }
+        if (this.procForwarder && !this.portListener && (this.configurationService.getValue(PORT_AUTO_SOURCE_SETTING) === PORT_AUTO_SOURCE_SETTING_PROCESS)) {
             this.portListener = this._register(this.remoteExplorerService.tunnelModel.onForwardPort(async () => {
-                if (Array.from(( this.remoteExplorerService.tunnelModel.forwarded.values())).filter(tunnel => tunnel.source.source === TunnelSource.Auto).length > 20) {
+                fallbackAt = this.configurationService.getValue(PORT_AUTO_FALLBACK_SETTING);
+                if (fallbackAt === 0) {
+                    this.portListener?.dispose();
+                    return;
+                }
+                if (Array.from(( this.remoteExplorerService.tunnelModel.forwarded.values())).filter(tunnel => tunnel.source.source === TunnelSource.Auto).length > fallbackAt) {
                     await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID);
                     this.notificationService.notify({
                         message: ( localizeWithPath(
@@ -258,7 +270,7 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                                     "Undo"
                                 )), undefined, true, async () => {
                                     await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS);
-                                    this.storageService.store(CAN_PROC_FALLBACK, false, 1 , 0 );
+                                    await this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, 5 );
                                     this.portListener?.dispose();
                                     this.portListener = undefined;
                                 })),
@@ -470,11 +482,14 @@ class OnAutoForwardedAction extends Disposable {
             }, 3000);
         }));
     }
-    basicMessage(tunnel) {
+    async basicMessage(tunnel) {
+        const properties = await this.remoteExplorerService.tunnelModel.getAttributes([{ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }], false);
+        const label = properties?.get(tunnel.tunnelRemotePort)?.label;
         return ( localizeWithPath(
             'vs/workbench/contrib/remote/browser/remoteExplorer',
             'remote.tunnelsView.automaticForward',
-            "Your application running on port {0} is available.  ",
+            "Your application{0} running on port {1} is available.  ",
+            label ? ` (${label})` : '',
             tunnel.tunnelRemotePort
         ));
     }
@@ -491,7 +506,7 @@ class OnAutoForwardedAction extends Disposable {
             return;
         }
         this.lastNotification?.close();
-        let message = this.basicMessage(tunnel);
+        let message = await this.basicMessage(tunnel);
         const choices = [this.openBrowserChoice(tunnel)];
         if (!isWeb || openPreviewEnabledContext.getValue(this.contextKeyService)) {
             choices.push(this.openPreviewChoice(tunnel));
@@ -573,7 +588,7 @@ class OnAutoForwardedAction extends Disposable {
                 }
                 this.lastNotification?.close();
                 this.lastShownPort = newTunnel.tunnelRemotePort;
-                this.lastNotification = this.notificationService.prompt(Severity.Info, this.basicMessage(newTunnel) + this.linkMessage(), [this.openBrowserChoice(newTunnel), this.openPreviewChoice(tunnel)], { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
+                this.lastNotification = this.notificationService.prompt(Severity.Info, (await this.basicMessage(newTunnel)) + this.linkMessage(), [this.openBrowserChoice(newTunnel), this.openPreviewChoice(tunnel)], { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
                 this.lastNotification.onDidClose(() => {
                     this.lastNotification = undefined;
                     this.lastShownPort = undefined;
@@ -844,4 +859,4 @@ class ProcAutomaticPortForwarding extends Disposable {
         }
     }
 }
-export { AutomaticPortForwarding, CAN_PROC_FALLBACK, ForwardedPortsView, PortRestore, VIEWLET_ID };
+export { AutomaticPortForwarding, ForwardedPortsView, PortRestore, VIEWLET_ID };

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

@@ -2,7 +2,8 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/tunnelView.css.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { clearNode, append, $, addStandardDisposableListener, EventType, addDisposableListener } from '../../../../base/browser/dom.js';
-import { IViewsService, IViewDescriptorService } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IContextViewService, IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ContextKeyExpr, RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -40,7 +41,7 @@ import { WorkbenchTable } from '../../../../platform/list/browser/listService.js
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { IHoverService } from '../../../services/hover/browser/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { STATUS_BAR_REMOTE_ITEM_BACKGROUND } from '../../../common/theme.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
@@ -781,6 +782,7 @@ const TunnelViewSelectionContextKey = ( new RawContextKey(TunnelViewSelectionKey
 const TunnelViewMultiSelectionKeyName = 'tunnelViewMultiSelection';
 const TunnelViewMultiSelectionContextKey = ( new RawContextKey(TunnelViewMultiSelectionKeyName, undefined, true));
 const PortChangableContextKey = ( new RawContextKey('portChangable', false, true));
+const ProtocolChangeableContextKey = ( new RawContextKey('protocolChangable', true, true));
 let TunnelPanel = class TunnelPanel extends ViewPane {
     static { TunnelPanel_1 = this; }
     static { this.ID = TUNNEL_VIEW_ID; }
@@ -806,6 +808,8 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         this.tunnelPrivacyContext = TunnelPrivacyContextKey.bindTo(contextKeyService);
         this.tunnelPrivacyEnabledContext = TunnelPrivacyEnabledContextKey.bindTo(contextKeyService);
         this.tunnelPrivacyEnabledContext.set(tunnelService.canChangePrivacy);
+        this.protocolChangableContextKey = ProtocolChangeableContextKey.bindTo(contextKeyService);
+        this.protocolChangableContextKey.set(tunnelService.canChangeProtocol);
         this.tunnelProtocolContext = TunnelProtocolContextKey.bindTo(contextKeyService);
         this.tunnelViewFocusContext = TunnelViewFocusContextKey.bindTo(contextKeyService);
         this.tunnelViewSelectionContext = TunnelViewSelectionContextKey.bindTo(contextKeyService);
@@ -825,8 +829,16 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         }));
         this.registerPrivacyActions();
         this._register(Event.once(this.tunnelService.onAddedTunnelProvider)(() => {
+            let updated = false;
             if (this.tunnelPrivacyEnabledContext.get() === false) {
                 this.tunnelPrivacyEnabledContext.set(tunnelService.canChangePrivacy);
+                updated = true;
+            }
+            if (this.protocolChangableContextKey.get() === true) {
+                this.protocolChangableContextKey.set(tunnelService.canChangeProtocol);
+                updated = true;
+            }
+            if (updated) {
                 updateActions();
                 this.registerPrivacyActions();
                 this.createTable();
@@ -1837,7 +1849,7 @@ MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
         'tunnelContext.protocolMenu',
         "Change Port Protocol"
     )),
-    when: ( ContextKeyExpr.and(isForwardedExpr, isNotMultiSelectionExpr))
+    when: ( ContextKeyExpr.and(isForwardedExpr, isNotMultiSelectionExpr, ProtocolChangeableContextKey))
 }));
 MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
     group: '3_forward',

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

@@ -2,7 +2,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 class UrlFinder extends Disposable {
     static { this.terminalCodesRegex = /(?:\u001B|\u009B)[\[\]()#;?]*(?:(?:(?:[a-zA-Z0-9]*(?:;[a-zA-Z0-9]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-PR-TZcf-ntqry=><~]))/g; }
-    static { this.localUrlRegex = /\b\w{2,20}:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0|:\d{2,5})[\w\-\.\~:\/\?\#[\]\@!\$&\(\)\*\+\,\;\=]*/gim; }
+    static { this.localUrlRegex = /\b\w{0,20}(?::\/\/)?(?:localhost|127\.0\.0\.1|0\.0\.0\.0|:\d{2,5})[\w\-\.\~:\/\?\#[\]\@!\$&\(\)\*\+\,\;\=]*/gim; }
     static { this.extractPortRegex = /(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d{1,5})/; }
     static { this.localPythonServerRegex = /HTTP\son\s(127\.0\.0\.1|0\.0\.0\.0)\sport\s(\d+)/; }
     static { this.excludeTerminals = ['Dev Containers']; }
@@ -29,7 +29,7 @@ class UrlFinder extends Disposable {
                 }));
             }
         }));
-        this._register(debugService.onDidEndSession(session => {
+        this._register(debugService.onDidEndSession(({ session }) => {
             if (( this.listeners.has(session.getId()))) {
                 this.listeners.get(session.getId())?.dispose();
                 this.listeners.delete(session.getId());

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -350,6 +350,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
             readOnly: false,
             renderIndicators: false,
             diffAlgorithm: 'advanced',
+            ignoreTrimWhitespace: false,
             stickyScroll: { enabled: false }
         };
         this.diffEditor = this.instantiationService.createInstance(EmbeddedDiffEditorWidget, container, options, {}, this.editor);
@@ -932,13 +933,14 @@ const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.delete
     'Overview ruler marker color for deleted content.'
 )));
 let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends Disposable {
-    static createDecoration(className, options) {
+    static createDecoration(className, tooltip, options) {
         const decorationOptions = {
             description: 'dirty-diff-decoration',
             isWholeLine: options.isWholeLine,
         };
         if (options.gutter) {
             decorationOptions.linesDecorationsClassName = `dirty-diff-glyph ${className}`;
+            decorationOptions.linesDecorationsTooltip = tooltip;
         }
         if (options.overview.active) {
             decorationOptions.overviewRuler = {
@@ -964,31 +966,45 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
         const gutter = decorations === 'all' || decorations === 'gutter';
         const overview = decorations === 'all' || decorations === 'overview';
         const minimap = decorations === 'all' || decorations === 'minimap';
-        this.addedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added', {
+        const diffAdded = ( localizeWithPath(
+            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
+            'diffAdded',
+            'Added lines'
+        ));
+        this.addedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added', diffAdded, {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
             minimap: { active: minimap, color: minimapGutterAddedBackground },
             isWholeLine: true
         });
-        this.addedPatternOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added-pattern', {
+        this.addedPatternOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added-pattern', diffAdded, {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
             minimap: { active: minimap, color: minimapGutterAddedBackground },
             isWholeLine: true
         });
-        this.modifiedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified', {
+        const diffModified = ( localizeWithPath(
+            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
+            'diffModified',
+            'Changed lines'
+        ));
+        this.modifiedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified', diffModified, {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
             minimap: { active: minimap, color: minimapGutterModifiedBackground },
             isWholeLine: true
         });
-        this.modifiedPatternOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified-pattern', {
+        this.modifiedPatternOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified-pattern', diffModified, {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
             minimap: { active: minimap, color: minimapGutterModifiedBackground },
             isWholeLine: true
         });
-        this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', {
+        this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localizeWithPath(
+            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
+            'diffDeleted',
+            'Removed lines'
+        )), {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },
             minimap: { active: minimap, color: minimapGutterDeletedBackground },

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js

@@ -3,7 +3,7 @@ import { localizeWithPath } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IListService } from '../../../../platform/list/browser/listService.js';
-import { IViewsService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { RestrictSearchToFolderId, SearchViewVisibleKey, ResourceFolderFocusKey, ExcludeFolderFromSearchId, RevealInSideBarForSearchResults, FileFocusKey, HasSearchResults, FindInFilesActionId, FindInFolderId, FindInWorkspaceId } from '../common/constants.js';
 import { OpenEditorCommandId } from '../../searchEditor/browser/constants.js';
 import { FileMatch, Match } from './searchModel.js';

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -69,15 +69,15 @@ class Match {
         return this._range;
     }
     preview() {
-        let before = this._oneLinePreviewText.substring(0, this._rangeInPreviewText.startColumn - 1), inside = this.getMatchString(), after = this._oneLinePreviewText.substring(this._rangeInPreviewText.endColumn - 1);
-        before = lcut(before, 26);
-        before = before.trimStart();
+        const fullBefore = this._oneLinePreviewText.substring(0, this._rangeInPreviewText.startColumn - 1), before = lcut(fullBefore, 26, '…');
+        let inside = this.getMatchString(), after = this._oneLinePreviewText.substring(this._rangeInPreviewText.endColumn - 1);
         let charsRemaining = Match.MAX_PREVIEW_CHARS - before.length;
         inside = inside.substr(0, charsRemaining);
         charsRemaining -= inside.length;
         after = after.substr(0, charsRemaining);
         return {
             before,
+            fullBefore,
             inside,
             after,
         };
@@ -1577,6 +1577,11 @@ SearchResult = ( __decorate([
     ( __param(4, IUriIdentityService)),
     ( __param(5, INotebookEditorService))
 ], SearchResult));
+var SearchModelLocation;
+( (function(SearchModelLocation) {
+    SearchModelLocation[SearchModelLocation["PANEL"] = 0] = "PANEL";
+    SearchModelLocation[SearchModelLocation["QUICK_ACCESS"] = 1] = "QUICK_ACCESS";
+})(SearchModelLocation || (SearchModelLocation = {})));
 let SearchModel = class SearchModel extends Disposable {
     constructor(searchService, telemetryService, configurationService, instantiationService, logService, notebookSearchService) {
         super();
@@ -1601,8 +1606,9 @@ let SearchModel = class SearchModel extends Disposable {
         this.onSearchResultChanged = this._onSearchResultChanged.event;
         this.currentCancelTokenSource = null;
         this.searchCancelledForNewSearch = false;
+        this.location = SearchModelLocation.PANEL;
         this._searchResult = this.instantiationService.createInstance(SearchResult, this);
-        this._searchResultChangedListener = this._register(this._searchResult.onChange((e) => this._onSearchResultChanged.fire(e)));
+        this._register(this._searchResult.onChange((e) => this._onSearchResultChanged.fire(e)));
     }
     isReplaceActive() {
         return this._replaceActive;
@@ -1632,13 +1638,6 @@ let SearchModel = class SearchModel extends Disposable {
     get searchResult() {
         return this._searchResult;
     }
-    set searchResult(searchResult) {
-        this._searchResult.dispose();
-        this._searchResultChangedListener.dispose();
-        this._searchResult = searchResult;
-        this._searchResult.searchModel = this;
-        this._searchResultChangedListener = this._register(this._searchResult.onChange((e) => this._onSearchResultChanged.fire(e)));
-    }
     doSearch(query, progressEmitter, searchQuery, searchInstanceID, onProgress, callerToken) {
         const asyncGenerateOnProgress = async (p) => {
             progressEmitter.fire();
@@ -1754,7 +1753,7 @@ let SearchModel = class SearchModel extends Disposable {
         if (isCancellationError(e)) {
             this.onSearchCompleted(this.searchCancelledForNewSearch
                 ? { exit: 1 , results: [], messages: [] }
-                : null, duration, '');
+                : undefined, duration, '');
             this.searchCancelledForNewSearch = false;
         }
     }
@@ -1793,10 +1792,6 @@ let SearchModel = class SearchModel extends Disposable {
         this.searchResult.dispose();
         super.dispose();
     }
-    transferSearchResult(other) {
-        other.searchResult = this._searchResult;
-        this._searchResult = this.instantiationService.createInstance(SearchResult, this);
-    }
 };
 SearchModel = ( __decorate([
     ( __param(0, ISearchService)),
@@ -1817,6 +1812,10 @@ let SearchViewModelWorkbenchService = class SearchViewModelWorkbenchService {
         }
         return this._searchModel;
     }
+    set searchModel(searchModel) {
+        this._searchModel?.dispose();
+        this._searchModel = searchModel;
+    }
 };
 SearchViewModelWorkbenchService = ( __decorate([
     ( __param(0, IInstantiationService))
@@ -1971,4 +1970,4 @@ function mergeSearchResultEvents(events) {
     });
     return retEvent;
 }
-export { CellMatch, FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, ISearchViewModelWorkbenchService, Match, MatchInNotebook, RangeHighlightDecorations, SearchModel, SearchResult, SearchViewModelWorkbenchService, arrayContainsElementOrParent, compareNotebookPos, searchComparer, searchMatchComparer, textSearchMatchesToNotebookMatches };
+export { CellMatch, FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, ISearchViewModelWorkbenchService, Match, MatchInNotebook, RangeHighlightDecorations, SearchModel, SearchModelLocation, SearchResult, SearchViewModelWorkbenchService, arrayContainsElementOrParent, compareNotebookPos, searchComparer, searchMatchComparer, textSearchMatchesToNotebookMatches };