@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/platform/configuration/common/configurations.js

@@ -6,19 +6,21 @@ import { equals } from '../../../base/common/objects.js';
 import { isEmptyObject } from '../../../base/common/types.js';
 import { ConfigurationModel } from './configurationModels.js';
 import { Extensions } from './configurationRegistry.js';
+import { NullLogService } from '../../log/common/log.js';
 import { ILogService } from '../../log/common/log.service.js';
 import { IPolicyService } from '../../policy/common/policy.service.js';
 import { Registry } from '../../registry/common/platform.js';
 let DefaultConfiguration$1 = class DefaultConfiguration extends Disposable {
-    constructor() {
-        super(...arguments);
-        this._onDidChangeConfiguration = this._register(( new Emitter()));
-        this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
-        this._configurationModel = ( new ConfigurationModel());
-    }
     get configurationModel() {
         return this._configurationModel;
     }
+    constructor(logService) {
+        super();
+        this.logService = logService;
+        this._onDidChangeConfiguration = this._register(( new Emitter()));
+        this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
+        this._configurationModel = ConfigurationModel.createEmptyModel(this.logService);
+    }
     async initialize() {
         this.resetConfigurationModel();
         this._register(( Registry.as(Extensions.Configuration)).onDidUpdateConfiguration(({ properties, defaultsOverrides }) => this.onDidUpdateConfiguration(Array.from(properties), defaultsOverrides)));
@@ -36,7 +38,7 @@ let DefaultConfiguration$1 = class DefaultConfiguration extends Disposable {
         return {};
     }
     resetConfigurationModel() {
-        this._configurationModel = ( new ConfigurationModel());
+        this._configurationModel = ConfigurationModel.createEmptyModel(this.logService);
         const properties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
         this.updateConfigurationModel(( Object.keys(properties)), properties);
     }
@@ -60,7 +62,7 @@ let DefaultConfiguration$1 = class DefaultConfiguration extends Disposable {
 class NullPolicyConfiguration {
     constructor() {
         this.onDidChangeConfiguration = Event.None;
-        this.configurationModel = ( new ConfigurationModel());
+        this.configurationModel = ConfigurationModel.createEmptyModel(( new NullLogService()));
     }
     async initialize() { return this.configurationModel; }
 }
@@ -73,7 +75,7 @@ let PolicyConfiguration = class PolicyConfiguration extends Disposable {
         this.logService = logService;
         this._onDidChangeConfiguration = this._register(( new Emitter()));
         this.onDidChangeConfiguration = this._onDidChangeConfiguration.event;
-        this._configurationModel = ( new ConfigurationModel());
+        this._configurationModel = ConfigurationModel.createEmptyModel(this.logService);
     }
     async initialize() {
         this.logService.trace('PolicyConfiguration#initialize');
@@ -135,7 +137,7 @@ let PolicyConfiguration = class PolicyConfiguration extends Disposable {
         if (changed.length) {
             this.logService.trace('PolicyConfiguration#changed', changed);
             const old = this._configurationModel;
-            this._configurationModel = ( new ConfigurationModel());
+            this._configurationModel = ConfigurationModel.createEmptyModel(this.logService);
             for (const key of old.keys) {
                 this._configurationModel.setValue(key, old.getValue(key));
             }

package/vscode/src/vs/platform/contextview/browser/contextView.d.ts

@@ -23,6 +23,9 @@ interface IContextViewDelegate {
     anchorAxisAlignment?: AnchorAxisAlignment;
     layer?: number;
 }
+interface IOpenContextView {
+    close: () => void;
+}
 type IContextMenuMenuDelegate = {
     /**
      * The MenuId that should be used to populate the context menu.
@@ -42,4 +45,4 @@ type IContextMenuMenuDelegate = {
     getActions?(): IAction[];
 } & Omit<IContextMenuDelegate, 'getActions'>;
 
-export type { IContextMenuMenuDelegate, IContextViewDelegate };
+export type { IContextMenuMenuDelegate, IContextViewDelegate, IOpenContextView };

package/vscode/src/vs/platform/contextview/browser/contextView.service.d.ts

@@ -1,14 +1,13 @@
 import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { IContextViewProvider, AnchorAlignment } from '../../../base/browser/ui/contextview/contextview.js';
-import { IDisposable } from '../../../base/common/lifecycle.js';
-import { IContextMenuMenuDelegate, IContextViewDelegate } from './contextView.js';
+import { IContextMenuMenuDelegate, IContextViewDelegate, IOpenContextView } from './contextView.js';
 import { IContextMenuDelegate } from '../../../base/browser/contextmenu.js';
 import { Event } from '../../../base/common/event.js';
 
 declare const IContextViewService: ServiceIdentifier<IContextViewService>;
 interface IContextViewService extends IContextViewProvider {
     readonly _serviceBrand: undefined;
-    showContextView(delegate: IContextViewDelegate, container?: HTMLElement, shadowRoot?: boolean): IDisposable;
+    showContextView(delegate: IContextViewDelegate, container?: HTMLElement, shadowRoot?: boolean): IOpenContextView;
     hideContextView(data?: any): void;
     getContextViewElement(): HTMLElement;
     layout(): void;

package/vscode/src/vs/platform/contextview/browser/contextViewService.js

@@ -1,13 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { ContextView } from '../../../base/browser/ui/contextview/contextview.js';
-import { Disposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 import { ILayoutService } from '../../layout/browser/layoutService.service.js';
 import { getWindow } from '../../../base/browser/dom.js';
 let ContextViewHandler = class ContextViewHandler extends Disposable {
     constructor(layoutService) {
         super();
         this.layoutService = layoutService;
-        this.currentViewDisposable = this._register(( new MutableDisposable()));
         this.contextView = this._register(( new ContextView(this.layoutService.mainContainer, 1 )));
         this.layout();
         this._register(layoutService.onDidLayoutContainer(() => this.layout()));
@@ -30,19 +29,22 @@ let ContextViewHandler = class ContextViewHandler extends Disposable {
         }
         this.contextView.setContainer(container ?? this.layoutService.activeContainer, domPosition);
         this.contextView.show(delegate);
-        const disposable = toDisposable(() => {
-            if (this.currentViewDisposable === disposable) {
-                this.hideContextView();
+        const openContextView = {
+            close: () => {
+                if (this.openContextView === openContextView) {
+                    this.hideContextView();
+                }
             }
-        });
-        this.currentViewDisposable.value = disposable;
-        return disposable;
+        };
+        this.openContextView = openContextView;
+        return openContextView;
     }
     layout() {
         this.contextView.layout();
     }
     hideContextView(data) {
         this.contextView.hide(data);
+        this.openContextView = undefined;
     }
 };
 ContextViewHandler = ( __decorate([

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts

@@ -94,7 +94,6 @@ interface ILocalExtension extends IExtension {
     isMachineScoped: boolean;
     isApplicationScoped: boolean;
     publisherId: string | null;
-    publisherDisplayName: string | null;
     installedTimestamp?: number;
     isPreReleaseVersion: boolean;
     hasPreReleaseVersion: boolean;

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

@@ -127,6 +127,7 @@ var ExtensionManagementErrorCode;
     ExtensionManagementErrorCode["Signature"] = "Signature";
     ExtensionManagementErrorCode["NotAllowed"] = "NotAllowed";
     ExtensionManagementErrorCode["Gallery"] = "Gallery";
+    ExtensionManagementErrorCode["Cancelled"] = "Cancelled";
     ExtensionManagementErrorCode["Unknown"] = "Unknown";
     ExtensionManagementErrorCode["Internal"] = "Internal";
 })(ExtensionManagementErrorCode || (ExtensionManagementErrorCode = {}))));

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

@@ -736,6 +736,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
                     location: input.location,
                     isBuiltin,
                     targetPlatform: metadata?.targetPlatform ?? "undefined" ,
+                    publisherDisplayName: metadata?.publisherDisplayName,
                     metadata,
                     isValid: true,
                     validations: []

package/vscode/src/vs/platform/extensions/common/extensions.d.ts

@@ -1110,6 +1110,9 @@ interface IExtensionContributions {
      */
     readonly notebookRenderer?: INotebookRendererContribution[];
     readonly debugVisualizers?: IDebugVisualizationContribution[];
+    readonly chatParticipants?: ReadonlyArray<{
+        id: string;
+    }>;
     /**
      * Contributes notebook preloads.
      */
@@ -1256,6 +1259,7 @@ interface IExtension {
     readonly manifest: IExtensionManifest;
     readonly location: URI;
     readonly targetPlatform: TargetPlatform;
+    readonly publisherDisplayName?: string;
     readonly readmeUrl?: URI;
     readonly changelogUrl?: URI;
     readonly isValid: boolean;
@@ -1306,6 +1310,7 @@ interface IRelaxedExtensionDescription extends IRelaxedExtensionManifest {
     id?: string;
     identifier: ExtensionIdentifier;
     uuid?: string;
+    publisherDisplayName?: string;
     targetPlatform: TargetPlatform;
     isBuiltin: boolean;
     isUserBuiltin: boolean;

package/vscode/src/vs/platform/files/common/files.d.ts

@@ -217,6 +217,14 @@ interface IWatchOptionsWithoutCorrelation {
      * always matched relative to the watched folder.
      */
     includes?: Array<string | IRelativePattern>;
+    /**
+     * If provided, allows to filter the events that the watcher should consider
+     * for emitting. If not provided, all events are emitted.
+     *
+     * For example, to emit added and updated events, set to:
+     * `FileChangeFilter.ADDED | FileChangeFilter.UPDATED`.
+     */
+    filter?: FileChangeFilter;
 }
 interface IWatchOptions extends IWatchOptionsWithoutCorrelation {
     /**
@@ -226,6 +234,11 @@ interface IWatchOptions extends IWatchOptionsWithoutCorrelation {
      */
     readonly correlationId?: number;
 }
+declare const enum FileChangeFilter {
+    UPDATED = 2,
+    ADDED = 4,
+    DELETED = 8
+}
 interface IFileSystemWatcher extends IDisposable {
     /**
      * An event which fires on file/folder change only for changes
@@ -679,4 +692,4 @@ interface ICreateFileOptions {
     readonly overwrite?: boolean;
 }
 
-export { FileChangeType, FileChangesEvent, FileOperation, FileOperationEvent, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, type IBaseFileStat, type IBaseFileStatWithMetadata, type IBaseReadFileOptions, type ICreateFileOptions, type IFileAtomicDeleteOptions, type IFileAtomicOptions, type IFileAtomicReadOptions, type IFileAtomicWriteOptions, type IFileChange, type IFileContent, type IFileDeleteOptions, type IFileOpenForReadOptions, type IFileOpenForWriteOptions, type IFileOpenOptions, type IFileOperationEvent, type IFileOperationEventWithMetadata, type IFileOverwriteOptions, type IFileReadLimits, type IFileReadStreamOptions, type IFileStat, type IFileStatResult, type IFileStatWithMetadata, type IFileStatWithPartialMetadata, type IFileStreamContent, type IFileSystemProvider, type IFileSystemProviderActivationEvent, type IFileSystemProviderCapabilitiesChangeEvent, type IFileSystemProviderError, type IFileSystemProviderRegistrationEvent, type IFileSystemProviderWithFileAtomicDeleteCapability, type IFileSystemProviderWithFileAtomicReadCapability, type IFileSystemProviderWithFileAtomicWriteCapability, type IFileSystemProviderWithFileReadStreamCapability, type IFileSystemProviderWithFileReadWriteCapability, type IFileSystemProviderWithOpenReadWriteCloseCapability, type IFileSystemWatcher, type IFileUnlockOptions, type IFileWriteOptions, type IReadFileOptions, type IReadFileStreamOptions, type IResolveFileOptions, type IResolveMetadataFileOptions, type IStat, type IWatchOptions, type IWatchOptionsWithoutCorrelation, type IWriteFileOptions };
+export { FileChangeFilter, FileChangeType, FileChangesEvent, FileOperation, FileOperationEvent, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, type IBaseFileStat, type IBaseFileStatWithMetadata, type IBaseReadFileOptions, type ICreateFileOptions, type IFileAtomicDeleteOptions, type IFileAtomicOptions, type IFileAtomicReadOptions, type IFileAtomicWriteOptions, type IFileChange, type IFileContent, type IFileDeleteOptions, type IFileOpenForReadOptions, type IFileOpenForWriteOptions, type IFileOpenOptions, type IFileOperationEvent, type IFileOperationEventWithMetadata, type IFileOverwriteOptions, type IFileReadLimits, type IFileReadStreamOptions, type IFileStat, type IFileStatResult, type IFileStatWithMetadata, type IFileStatWithPartialMetadata, type IFileStreamContent, type IFileSystemProvider, type IFileSystemProviderActivationEvent, type IFileSystemProviderCapabilitiesChangeEvent, type IFileSystemProviderError, type IFileSystemProviderRegistrationEvent, type IFileSystemProviderWithFileAtomicDeleteCapability, type IFileSystemProviderWithFileAtomicReadCapability, type IFileSystemProviderWithFileAtomicWriteCapability, type IFileSystemProviderWithFileReadStreamCapability, type IFileSystemProviderWithFileReadWriteCapability, type IFileSystemProviderWithOpenReadWriteCloseCapability, type IFileSystemWatcher, type IFileUnlockOptions, type IFileWriteOptions, type IReadFileOptions, type IReadFileStreamOptions, type IResolveFileOptions, type IResolveMetadataFileOptions, type IStat, type IWatchOptions, type IWatchOptionsWithoutCorrelation, type IWriteFileOptions };

package/vscode/src/vs/platform/hover/browser/hover.service.d.ts

@@ -1,38 +1,9 @@
 import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
-import { IHoverWidget } from '../../../base/browser/ui/hover/updatableHoverWidget.js';
-import { IHoverOptions } from './hover.js';
+import { IHoverDelegate2 } from '../../../base/browser/ui/hover/hover.js';
 
 declare const IHoverService: ServiceIdentifier<IHoverService>;
-/**
-* Enables the convenient display of rich markdown-based hovers in the workbench.
-*/
-interface IHoverService {
+interface IHoverService extends IHoverDelegate2 {
     readonly _serviceBrand: undefined;
-    /**
-    * Shows a hover, provided a hover with the same options object is not already visible.
-    * @param options A set of options defining the characteristics of the hover.
-    * @param focus Whether to focus the hover (useful for keyboard accessibility).
-    *
-    * **Example:** A simple usage with a single element target.
-    *
-    * ```typescript
-    * showHover({
-    *   text: new MarkdownString('Hello world'),
-    *   target: someElement
-    * });
-    * ```
-    */
-    showHover(options: IHoverOptions, focus?: boolean): IHoverWidget | undefined;
-    /**
-    * Hides the hover if it was visible. This call will be ignored if the the hover is currently
-    * "locked" via the alt/option key.
-    */
-    hideHover(): void;
-    /**
-    * This should only be used until we have the ability to show multiple context views
-    * simultaneously. #188822
-    */
-    showAndFocusLastHover(): void;
 }
 
 export { IHoverService };

package/vscode/src/vs/platform/instantiation/common/instantiation.d.ts

@@ -32,6 +32,15 @@ interface IInstantiationService {
      * and adds/overwrites the given services.
      */
     createChild(services: ServiceCollection): IInstantiationService;
+    /**
+     * Disposes this instantiation service.
+     *
+     * - Will dispose all services that this instantiation service has created.
+     * - Will dispose all its children but not its parent.
+     * - Will NOT dispose services-instances that this service has been created with
+     * - Will NOT dispose consumer-instances this service has created
+     */
+    dispose(): void;
 }
 /**
  * Identifies a service of type `T`.

package/vscode/src/vs/platform/instantiation/common/instantiationService.js

@@ -1,6 +1,6 @@
 import { GlobalIdleValue } from '../../../base/common/async.js';
 import { illegalState } from '../../../base/common/errors.js';
-import { toDisposable } from '../../../base/common/lifecycle.js';
+import { dispose, isDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { SyncDescriptor } from './descriptors.js';
 import { Graph } from './graph.js';
 import { IInstantiationService, _util } from './instantiation.js';
@@ -19,14 +19,44 @@ class InstantiationService {
         this._strict = _strict;
         this._parent = _parent;
         this._enableTracing = _enableTracing;
+        this._isDisposed = false;
+        this._servicesToMaybeDispose = ( new Set());
+        this._children = ( new Set());
         this._activeInstantiations = ( new Set());
         this._services.set(IInstantiationService, this);
         this._globalGraph = _enableTracing ? _parent?._globalGraph ?? ( new Graph(e => e)) : undefined;
     }
+    dispose() {
+        if (!this._isDisposed) {
+            this._isDisposed = true;
+            dispose(this._children);
+            this._children.clear();
+            for (const candidate of this._servicesToMaybeDispose) {
+                if (isDisposable(candidate)) {
+                    candidate.dispose();
+                }
+            }
+            this._servicesToMaybeDispose.clear();
+        }
+    }
+    _throwIfDisposed() {
+        if (this._isDisposed) {
+            throw ( new Error('InstantiationService has been disposed'));
+        }
+    }
     createChild(services) {
-        return ( new InstantiationService(services, this._strict, this, this._enableTracing));
+        this._throwIfDisposed();
+        const result = new (class extends InstantiationService {
+            dispose() {
+                this._children.delete(result);
+                super.dispose();
+            }
+        })(services, this._strict, this, this._enableTracing);
+        this._children.add(result);
+        return result;
     }
     invokeFunction(fn, ...args) {
+        this._throwIfDisposed();
         const _trace = Trace.traceInvocation(this._enableTracing, fn);
         let _done = false;
         try {
@@ -50,6 +80,7 @@ class InstantiationService {
         }
     }
     createInstance(ctorOrDescriptor, ...rest) {
+        this._throwIfDisposed();
         let _trace;
         let result;
         if (ctorOrDescriptor instanceof SyncDescriptor) {
@@ -86,12 +117,12 @@ class InstantiationService {
         }
         return Reflect.construct(ctor, args.concat(serviceArgs));
     }
-    _setServiceInstance(id, instance) {
+    _setCreatedServiceInstance(id, instance) {
         if (this._services.get(id) instanceof SyncDescriptor) {
             this._services.set(id, instance);
         }
         else if (this._parent) {
-            this._parent._setServiceInstance(id, instance);
+            this._parent._setCreatedServiceInstance(id, instance);
         }
         else {
             throw ( new Error('illegalState - setting UNKNOWN service instance'));
@@ -168,7 +199,7 @@ class InstantiationService {
                 const instanceOrDesc = this._getServiceInstanceOrDescriptor(data.id);
                 if (instanceOrDesc instanceof SyncDescriptor) {
                     const instance = this._createServiceInstanceWithOwner(data.id, data.desc.ctor, data.desc.staticArguments, data.desc.supportsDelayedInstantiation, data._trace);
-                    this._setServiceInstance(data.id, instance);
+                    this._setCreatedServiceInstance(data.id, instance);
                 }
                 graph.removeNode(data);
             }
@@ -177,7 +208,7 @@ class InstantiationService {
     }
     _createServiceInstanceWithOwner(id, ctor, args = [], supportsDelayedInstantiation, _trace) {
         if (this._services.get(id) instanceof SyncDescriptor) {
-            return this._createServiceInstance(id, ctor, args, supportsDelayedInstantiation, _trace);
+            return this._createServiceInstance(id, ctor, args, supportsDelayedInstantiation, _trace, this._servicesToMaybeDispose);
         }
         else if (this._parent) {
             return this._parent._createServiceInstanceWithOwner(id, ctor, args, supportsDelayedInstantiation, _trace);
@@ -186,9 +217,11 @@ class InstantiationService {
             throw ( new Error(`illegalState - creating UNKNOWN service instance ${ctor.name}`));
         }
     }
-    _createServiceInstance(id, ctor, args = [], supportsDelayedInstantiation, _trace) {
+    _createServiceInstance(id, ctor, args = [], supportsDelayedInstantiation, _trace, disposeBucket) {
         if (!supportsDelayedInstantiation) {
-            return this._createInstance(ctor, args, _trace);
+            const result = this._createInstance(ctor, args, _trace);
+            disposeBucket.add(result);
+            return result;
         }
         else {
             const child = ( new InstantiationService(undefined, this._strict, this, this._enableTracing));
@@ -205,6 +238,7 @@ class InstantiationService {
                     }
                 }
                 earlyListeners.clear();
+                disposeBucket.add(result);
                 return result;
             }));
             return ( new Proxy(Object.create(null), {

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

@@ -367,6 +367,8 @@ class NullLogger {
     dispose() { }
     flush() { }
 }
+class NullLogService extends NullLogger {
+}
 function getLogLevel(environmentService) {
     if (environmentService.verbose) {
         return LogLevel.Trace;
@@ -419,4 +421,4 @@ function parseLogLevel(logLevel) {
     return undefined;
 }
 const CONTEXT_LOG_LEVEL = ( (new RawContextKey('logLevel', LogLevelToString(LogLevel.Info))));
-export { AbstractLogger, AbstractLoggerService, AbstractMessageLogger, CONTEXT_LOG_LEVEL, ConsoleLogger, DEFAULT_LOG_LEVEL, LogLevel, LogLevelToLocalizedString, LogLevelToString, MultiplexLogger, NullLogger, getLogLevel, isLogLevel, log, parseLogLevel };
+export { AbstractLogger, AbstractLoggerService, AbstractMessageLogger, CONTEXT_LOG_LEVEL, ConsoleLogger, DEFAULT_LOG_LEVEL, LogLevel, LogLevelToLocalizedString, LogLevelToString, MultiplexLogger, NullLogService, NullLogger, getLogLevel, isLogLevel, log, parseLogLevel };

package/vscode/src/vs/platform/markers/common/markerService.js

@@ -5,9 +5,13 @@ import { ResourceMap } from '../../../base/common/map.js';
 import { Schemas } from '../../../base/common/network.js';
 import { URI } from '../../../base/common/uri.js';
 import { MarkerSeverity } from './markers.js';
-const unsupportedSchemas = ( new Set(
-    [Schemas.inMemory, Schemas.vscodeSourceControl, Schemas.walkThrough, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock]
-));
+const unsupportedSchemas = ( new Set([
+    Schemas.inMemory,
+    Schemas.vscodeSourceControl,
+    Schemas.walkThrough,
+    Schemas.walkThroughSnippet,
+    Schemas.vscodeChatCodeBlock,
+]));
 class DoubleResourceMap {
     constructor() {
         this._byResource = ( new ResourceMap());

package/vscode/src/vs/platform/opener/browser/link.js

@@ -7,8 +7,8 @@ import { Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { IOpenerService } from '../common/opener.service.js';
 import './link.css.js';
-import { setupCustomHover } from '../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../hover/browser/hover.service.js';
 let Link = class Link extends Disposable {
     get enabled() {
         return this._enabled;
@@ -47,9 +47,10 @@ let Link = class Link extends Disposable {
         this.setTooltip(link.title);
         this._link = link;
     }
-    constructor(container, _link, options = {}, openerService) {
+    constructor(container, _link, options = {}, _hoverService, openerService) {
         super();
         this._link = _link;
+        this._hoverService = _hoverService;
         this._enabled = true;
         this.el = append(container, $('a.monaco-link', {
             tabIndex: _link.tabIndex ?? 0,
@@ -84,7 +85,7 @@ let Link = class Link extends Disposable {
             this.el.title = title ?? '';
         }
         else if (!this.hover && title) {
-            this.hover = this._register(setupCustomHover(this.hoverDelegate, this.el, title));
+            this.hover = this._register(this._hoverService.setupUpdatableHover(this.hoverDelegate, this.el, title));
         }
         else if (this.hover) {
             this.hover.update(title);
@@ -92,6 +93,7 @@ let Link = class Link extends Disposable {
     }
 };
 Link = ( __decorate([
-    ( __param(3, IOpenerService))
+    ( __param(3, IHoverService)),
+    ( __param(4, IOpenerService))
 ], Link));
 export { Link };

package/vscode/src/vs/platform/quickinput/browser/quickInput.js

@@ -575,7 +575,7 @@ class QuickPick extends QuickInput {
             this.visibleDisposables.add((this._hideInput ? this.ui.list : this.ui.inputBox).onKeyDown((event) => {
                 switch (event.keyCode) {
                     case 18 :
-                        if (isMacintosh ? event.metaKey : event.altKey) {
+                        if (this.quickNavigate === undefined && (isMacintosh ? event.metaKey : event.altKey)) {
                             this.ui.list.focus(QuickInputListFocus.NextSeparator);
                         }
                         else {
@@ -587,7 +587,7 @@ class QuickPick extends QuickInput {
                         EventHelper.stop(event, true);
                         break;
                     case 16 :
-                        if (isMacintosh ? event.metaKey : event.altKey) {
+                        if (this.quickNavigate === undefined && (isMacintosh ? event.metaKey : event.altKey)) {
                             this.ui.list.focus(QuickInputListFocus.PreviousSeparator);
                         }
                         else {

package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js

@@ -205,8 +205,8 @@ class QuickInputAccessibilityProvider {
             return undefined;
         }
         return {
-            value: element.checked,
-            onDidChange: element.onChecked
+            get value() { return element.checked; },
+            onDidChange: e => element.onChecked(() => e()),
         };
     }
 }
@@ -537,11 +537,19 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             allowNonCollapsibleParents: true,
             identityProvider: {
                 getId: element => {
-                    return element.item?.id
-                        ?? element.item?.label
-                        ?? element.separator?.id
-                        ?? element.separator?.label
-                        ?? '';
+                    const mainItem = element.item || element.separator;
+                    if (mainItem === undefined) {
+                        return '';
+                    }
+                    if (mainItem.id !== undefined) {
+                        return mainItem.id;
+                    }
+                    let id = `label:${mainItem.label}`;
+                    id += `$$description:${mainItem.description}`;
+                    if (mainItem.type !== 'separator') {
+                        id += `$$detail:${mainItem.detail}`;
+                    }
+                    return id;
                 },
             },
             alwaysConsumeMouseWheel: true

package/vscode/src/vs/platform/telemetry/common/gdprTypings.d.ts

@@ -4,7 +4,6 @@ interface IPropertyData {
     comment: string;
     expiration?: string;
     endpoint?: string;
-    isMeasurement?: boolean;
 }
 interface IGDPRProperty {
     owner: string;

package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js

@@ -110,6 +110,7 @@ function removePropertiesWithPossibleUserInfo(property) {
         { label: 'Slack Token', regex: /xox[pbar]\-[A-Za-z0-9]/ },
         { label: 'GitHub Token', regex: /(gh[psuro]_[a-zA-Z0-9]{36}|github_pat_[a-zA-Z0-9]{22}_[a-zA-Z0-9]{59})/ },
         { label: 'Generic Secret', regex: /(key|token|sig|secret|signature|password|passwd|pwd|android:value)[^a-zA-Z0-9]/i },
+        { label: 'CLI Credentials', regex: /((login|psexec|(certutil|psexec)\.exe).{1,50}(\s-u(ser(name)?)?\s+.{3,100})?\s-(admin|user|vm|root)?p(ass(word)?)?\s+["']?[^$\-\/\s]|(^|[\s\r\n\\])net(\.exe)?.{1,5}(user\s+|share\s+\/user:| user -? secrets ? set) \s + [^ $\s \/])/ },
         { label: 'Email', regex: /@[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+/ }
     ];
     for (const secretRegex of userDataRegexes) {

package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.d.ts

@@ -1,5 +1,6 @@
 import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IPromptInputModel } from './commandDetection/promptInputModel.js';
 import { ICurrentPartialCommand } from './commandDetection/terminalCommand.js';
 import { ITerminalOutputMatcher, ITerminalOutputMatch } from '../terminal.js';
 
@@ -134,6 +135,7 @@ interface IBufferMarkCapability {
 }
 interface ICommandDetectionCapability {
     readonly type: TerminalCapability.CommandDetection;
+    readonly promptInputModel: IPromptInputModel;
     readonly commands: readonly ITerminalCommand[];
     /** The command currently being executed, otherwise undefined. */
     readonly executingCommand: string | undefined;
@@ -151,6 +153,7 @@ interface ICommandDetectionCapability {
     readonly onCommandExecuted: Event<ITerminalCommand>;
     readonly onCommandInvalidated: Event<ITerminalCommand[]>;
     readonly onCurrentCommandInvalidated: Event<ICommandInvalidationRequest>;
+    setContinuationPrompt(value: string): void;
     setCwd(value: string): void;
     setIsWindowsPty(value: boolean): void;
     setIsCommandStorageDisabled(): void;
@@ -207,6 +210,7 @@ interface IPartialCommandDetectionCapability {
 }
 interface IBaseTerminalCommand {
     command: string;
+    commandLineConfidence: 'low' | 'medium' | 'high';
     isTrusted: boolean;
     timestamp: number;
     duration: number;
@@ -224,6 +228,7 @@ interface ITerminalCommand extends IBaseTerminalCommand {
     readonly executedMarker?: IXtermMarker;
     readonly aliases?: string[][];
     readonly wasReplayed?: boolean;
+    extractCommandLine(): string;
     getOutput(): string | undefined;
     getOutputMatch(outputMatcher: ITerminalOutputMatcher): ITerminalOutputMatch | undefined;
     hasOutput(): boolean;

package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.d.ts

@@ -0,0 +1,30 @@
+import { Event } from '../../../../../base/common/event.js';
+
+/**
+ * A model of the prompt input state using shell integration and analyzing the terminal buffer. This
+ * may not be 100% accurate but provides a best guess.
+ */
+interface IPromptInputModel {
+    readonly onDidStartInput: Event<IPromptInputModelState>;
+    readonly onDidChangeInput: Event<IPromptInputModelState>;
+    readonly onDidFinishInput: Event<IPromptInputModelState>;
+    /**
+     * Fires immediately before {@link onDidFinishInput} when a SIGINT/Ctrl+C/^C is detected.
+     */
+    readonly onDidInterrupt: Event<IPromptInputModelState>;
+    readonly value: string;
+    readonly cursorIndex: number;
+    readonly ghostTextIndex: number;
+    /**
+     * Gets the prompt input as a user-friendly string where `|` is the cursor position and `[` and
+     * `]` wrap any ghost text.
+     */
+    getCombinedString(): string;
+}
+interface IPromptInputModelState {
+    readonly value: string;
+    readonly cursorIndex: number;
+    readonly ghostTextIndex: number;
+}
+
+export type { IPromptInputModel, IPromptInputModelState };

package/vscode/src/vs/platform/theme/browser/defaultStyles.js

@@ -120,6 +120,9 @@ const defaultListStyles = {
     listHoverOutline: asCssVariable(activeContrastBorder),
     treeIndentGuidesStroke: asCssVariable(treeIndentGuidesStroke),
     treeInactiveIndentGuidesStroke: asCssVariable(treeInactiveIndentGuidesStroke),
+    treeStickyScrollBackground: undefined,
+    treeStickyScrollBorder: undefined,
+    treeStickyScrollShadow: undefined,
     tableColumnsBorder: asCssVariable(tableColumnsBorder),
     tableOddRowsBackgroundColor: asCssVariable(tableOddRowsBackgroundColor),
 };
@@ -160,6 +163,9 @@ const defaultSelectBoxStyles = {
     tableOddRowsBackgroundColor: undefined,
     treeIndentGuidesStroke: undefined,
     treeInactiveIndentGuidesStroke: undefined,
+    treeStickyScrollBackground: undefined,
+    treeStickyScrollBorder: undefined,
+    treeStickyScrollShadow: undefined
 };
 function getSelectBoxStyles(override) {
     return overrideStyles(override, defaultSelectBoxStyles);