@codingame/monaco-vscode-api 1.82.6 → 1.83.0-next.0

package/monaco-treemending.js

@@ -847,8 +847,8 @@ async function run() {
         console.info('Monaco-editor has already been tree-mended, ignoring');
         process.exit(0);
     }
-    if ("0.43.0" !== monacoVersion) {
-        console.error(`Wrong monaco-editor version: expecting ${"0.43.0"}, got ${monacoVersion}`);
+    if ("0.44.0" !== monacoVersion) {
+        console.error(`Wrong monaco-editor version: expecting ${"0.44.0"}, got ${monacoVersion}`);
         process.exit(1);
     }
     // pnpm WA: copy files to a temp directory and patch files there. When finished copy back

package/monaco.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from './external/tslib/tslib.es6.js';
 import { StandaloneServices, StandaloneKeybindingService } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
 import { ITextResourceConfigurationService } from 'monaco-editor/esm/vs/editor/common/services/textResourceConfiguration.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { StandaloneDiffEditor, StandaloneEditor } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
+import { StandaloneDiffEditor2, StandaloneEditor } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
 import { isObject } from 'monaco-editor/esm/vs/base/common/types.js';
 import { distinct, deepClone } from 'monaco-editor/esm/vs/base/common/objects.js';
 export { errorHandler } from 'monaco-editor/esm/vs/base/common/errors.js';
@@ -119,7 +119,7 @@ ConfiguredStandaloneEditor = __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, ITextResourceConfigurationService))
 ], ConfiguredStandaloneEditor);
-class ConfiguredStandaloneDiffEditor extends StandaloneDiffEditor {
+class ConfiguredStandaloneDiffEditor extends StandaloneDiffEditor2 {
     _createInnerEditor(instantiationService, container, options) {
         return instantiationService.createInstance(ConfiguredStandaloneEditor, container, true, options);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.82.6",
+  "version": "1.83.0-next.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -80,6 +80,6 @@
     "monaco-treemending": "./monaco-treemending.js"
   },
   "dependencies": {
-    "monaco-editor": "0.43.0"
+    "monaco-editor": "0.44.0"
   }
 }

package/service-override/extensions.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../external/tslib/tslib.es6.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { ILifecycleService } from '../vscode/src/vs/workbench/services/lifecycle/common/lifecycle.js';
-import { nullExtensionDescription, toExtensionDescription, IExtensionService, ExtensionHostExtensions } from '../vscode/src/vs/workbench/services/extensions/common/extensions.js';
+import { nullExtensionDescription, toExtensionDescription, IExtensionService } from '../vscode/src/vs/workbench/services/extensions/common/extensions.js';
 import { ILogService, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { ExtensionIdentifierMap } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
@@ -57,6 +57,7 @@ import '../vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadChatProvider.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadChatSlashCommands.js';
+import '../vscode/src/vs/workbench/api/browser/mainThreadChatAgents.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadClipboard.js';
@@ -76,7 +77,6 @@ import '../vscode/src/vs/workbench/api/browser/mainThreadErrors.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js';
-import '../vscode/src/vs/workbench/api/browser/mainThreadKeytar.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadLanguages.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadLogService.js';
@@ -197,7 +197,7 @@ let LocalExtensionHost = class LocalExtensionHost {
         this._productService = _productService;
         this._userDataProfilesService = _userDataProfilesService;
         this.remoteAuthority = null;
-        this.extensions = new ExtensionHostExtensions();
+        this.extensions = null;
         this.onExit = Event.None;
         this._protocolPromise = null;
         this._extensionHostLogsLocation = joinPath(this._environmentService.extHostLogsPath, 'local');
@@ -217,8 +217,8 @@ let LocalExtensionHost = class LocalExtensionHost {
     }
     async _createExtHostInitData() {
         const initData = await this._initDataProvider.getInitData();
+        this.extensions = initData.extensions;
         const workspace = this._contextService.getWorkspace();
-        const deltaExtensions = this.extensions.set(initData.allExtensions, initData.myExtensions);
         const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
         let nlsUrlWithDetails;
         if (nlsBaseUrl != null && this._productService.commit != null && !platform.Language.isDefaultVariant()) {
@@ -255,9 +255,7 @@ let LocalExtensionHost = class LocalExtensionHost {
                 includeStack: false,
                 logNative: this._environmentService.debugRenderer
             },
-            allExtensions: deltaExtensions.toAdd,
-            activationEvents: deltaExtensions.addActivationEvents,
-            myExtensions: deltaExtensions.myToAdd,
+            extensions: initData.extensions.toSnapshot(),
             nlsBaseUrl: nlsUrlWithDetails,
             telemetryInfo: {
                 sessionId: this._telemetryService.sessionId,
@@ -324,8 +322,8 @@ EsmWebWorkerExtensionHost = __decorate([
     ( __param(13, IStorageService))
 ], EsmWebWorkerExtensionHost);
 let LocalBrowserExtensionHostFactory = class LocalBrowserExtensionHostFactory extends BrowserExtensionHostFactory {
-    constructor(workerConfig, _extensionsProposedApi, _scanWebExtensions, _getExtensions, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService) {
-        super(_extensionsProposedApi, _scanWebExtensions, _getExtensions, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService);
+    constructor(workerConfig, _extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
+        super(_extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService);
         this.workerConfig = workerConfig;
     }
     createExtensionHost(runningLocations, runningLocation, isInitialStart) {
@@ -350,7 +348,8 @@ LocalBrowserExtensionHostFactory = __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IRemoteAgentService)),
     ( __param(6, IRemoteAuthorityResolverService)),
-    ( __param(7, IWorkbenchExtensionEnablementService))
+    ( __param(7, IWorkbenchExtensionEnablementService)),
+    ( __param(8, ILogService))
 ], LocalBrowserExtensionHostFactory);
 let LocalBrowserExtensionHostKindPicker = class LocalBrowserExtensionHostKindPicker extends BrowserExtensionHostKindPicker {
     constructor(allowedExtHostKinds, _logService) {
@@ -382,7 +381,7 @@ LocalBrowserExtensionHostKindPicker = __decorate([
 let SimpleExtensionService = class SimpleExtensionService extends AbstractExtensionService {
     constructor(workerConfig, instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, dialogService) {
         const extensionsProposedApi = instantiationService.createInstance(ExtensionsProposedApi);
-        const extensionHostFactory = new LocalBrowserExtensionHostFactory(workerConfig, extensionsProposedApi, async () => [], () => this._getExtensions(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService);
+        const extensionHostFactory = new LocalBrowserExtensionHostFactory(workerConfig, extensionsProposedApi, async () => [], () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
         super(extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerConfig != null ? [2 , 1 , 3 ] : [1 , 3 ], logService), instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, dialogService);
         void lifecycleService.when(2 ).then(async () => {
             await userDataInitializationService.initializeInstalledExtensions(instantiationService);

package/services.d.ts

@@ -28,7 +28,7 @@ export { IQuickInputService } from './vscode/src/vs/platform/quickinput/common/q
 export { ITelemetryService } from './vscode/src/vs/platform/telemetry/common/telemetry.js';
 export { IUriIdentityService } from './vscode/src/vs/platform/uriIdentity/common/uriIdentity.js';
 export { IBreadcrumbsService } from './vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js';
-export { EditorGroupLayout, GroupDirection, GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, IAddGroupOptions, ICloseAllEditorsOptions, ICloseEditorOptions, ICloseEditorsFilter, IEditorGroup, IEditorGroupsService, IEditorReplacement, IEditorSideGroup, IFindGroupScope, IMergeGroupOptions, MergeGroupMode } from './vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
+export { EditorGroupLayout, GroupDirection, GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, ICloseAllEditorsOptions, ICloseEditorOptions, ICloseEditorsFilter, IEditorGroup, IEditorGroupsService, IEditorReplacement, IEditorSideGroup, IFindGroupScope, IMergeGroupOptions, MergeGroupMode } from './vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
 export { CloseDirection, EditorInputWithOptions, EditorsOrder, GroupIdentifier, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorControl, IEditorPane, IEditorPartOptions, IEditorPartOptionsChangeEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IFindEditorOptions, IMatchEditorOptions, IUntypedEditorInput, IVisibleEditorPane } from './vscode/src/vs/workbench/common/editor.js';
 export { IDimension } from './vscode/src/vs/editor/common/core/dimension.js';
 export { IEditorOptions, IResourceEditorInput, ITextEditorOptions } from './vscode/src/vs/platform/editor/common/editor.js';

package/vscode/src/vs/base/browser/ui/menu/menubar.js

@@ -379,7 +379,7 @@ class MenuBar extends Disposable {
                 menuBarMenu.buttonElement.style.visibility = 'hidden';
             }
         }
-        if (this.numMenusShown - 1 <= showableMenus.length / 2) {
+        if (this.numMenusShown - 1 <= showableMenus.length / 4) {
             for (const menuBarMenu of showableMenus) {
                 menuBarMenu.buttonElement.style.visibility = 'hidden';
             }

package/vscode/src/vs/base/common/event.d.ts

@@ -173,20 +173,7 @@ declare namespace Event {
      * this.onInstallExtension = Event.buffer(service.onInstallExtension, true);
      * ```
      */
-    function buffer<T>(event: Event<T>, flushAfterTimeout?: boolean, _buffer?: T[]): Event<T>;
-    interface IChainableEvent<T> extends IDisposable {
-        event: Event<T>;
-        map<O>(fn: (i: T) => O): IChainableEvent<O>;
-        forEach(fn: (i: T) => void): IChainableEvent<T>;
-        filter(fn: (e: T) => boolean): IChainableEvent<T>;
-        filter<R>(fn: (e: T | R) => e is R): IChainableEvent<R>;
-        reduce<R>(merge: (last: R | undefined, event: T) => R, initial?: R): IChainableEvent<R>;
-        latch(): IChainableEvent<T>;
-        debounce(merge: (last: T | undefined, event: T) => T, delay?: number, leading?: boolean, flushOnListenerRemove?: boolean, leakWarningThreshold?: number): IChainableEvent<T>;
-        debounce<R>(merge: (last: R | undefined, event: T) => R, delay?: number, leading?: boolean, flushOnListenerRemove?: boolean, leakWarningThreshold?: number): IChainableEvent<R>;
-        on(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable;
-        once(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
-    }
+    function buffer<T>(event: Event<T>, flushAfterTimeout?: boolean, _buffer?: T[], disposable?: DisposableStore): Event<T>;
     /**
      * Wraps the event in an {@link IChainableEvent}, allowing a more functional programming style.
      *
@@ -199,13 +186,22 @@ declare namespace Event {
      * ).event;
      *
      * // Using chain
-     * const onEnterPressChain = Event.chain(onKeyPress.event)
+     * const onEnterPressChain = Event.chain(onKeyPress.event, $ => $
      *   .map(e => new StandardKeyboardEvent(e))
      *   .filter(e => e.keyCode === KeyCode.Enter)
-     *   .event;
+     * );
      * ```
      */
-    function chain<T>(event: Event<T>): IChainableEvent<T>;
+    function chain<T, R>(event: Event<T>, sythensize: ($: IChainableSythensis<T>) => IChainableSythensis<R>): Event<R>;
+    interface IChainableSythensis<T> {
+        map<O>(fn: (i: T) => O): IChainableSythensis<O>;
+        forEach(fn: (i: T) => void): IChainableSythensis<T>;
+        filter(fn: (e: T) => boolean): IChainableSythensis<T>;
+        filter<R>(fn: (e: T | R) => e is R): IChainableSythensis<R>;
+        reduce<R>(merge: (last: R, event: T) => R, initial: R): IChainableSythensis<R>;
+        reduce<R>(merge: (last: R | undefined, event: T) => R): IChainableSythensis<R>;
+        latch(equals?: (a: T, b: T) => boolean): IChainableSythensis<T>;
+    }
     interface NodeEventEmitter {
         on(event: string | symbol, listener: Function): unknown;
         removeListener(event: string | symbol, listener: Function): unknown;

package/vscode/src/vs/base/common/keyCodes.d.ts

@@ -156,28 +156,28 @@ declare const enum KeyCode {
      * Either the angle bracket key or the backslash key on the RT 102-key keyboard.
      */
     IntlBackslash = 97,
-    Numpad0 = 98,
-    Numpad1 = 99,
-    Numpad2 = 100,
-    Numpad3 = 101,
-    Numpad4 = 102,
-    Numpad5 = 103,
-    Numpad6 = 104,
-    Numpad7 = 105,
-    Numpad8 = 106,
-    Numpad9 = 107,
-    NumpadMultiply = 108,
-    NumpadAdd = 109,
-    NUMPAD_SEPARATOR = 110,
-    NumpadSubtract = 111,
-    NumpadDecimal = 112,
-    NumpadDivide = 113,
+    Numpad0 = 98,// VK_NUMPAD0, 0x60, Numeric keypad 0 key
+    Numpad1 = 99,// VK_NUMPAD1, 0x61, Numeric keypad 1 key
+    Numpad2 = 100,// VK_NUMPAD2, 0x62, Numeric keypad 2 key
+    Numpad3 = 101,// VK_NUMPAD3, 0x63, Numeric keypad 3 key
+    Numpad4 = 102,// VK_NUMPAD4, 0x64, Numeric keypad 4 key
+    Numpad5 = 103,// VK_NUMPAD5, 0x65, Numeric keypad 5 key
+    Numpad6 = 104,// VK_NUMPAD6, 0x66, Numeric keypad 6 key
+    Numpad7 = 105,// VK_NUMPAD7, 0x67, Numeric keypad 7 key
+    Numpad8 = 106,// VK_NUMPAD8, 0x68, Numeric keypad 8 key
+    Numpad9 = 107,// VK_NUMPAD9, 0x69, Numeric keypad 9 key
+    NumpadMultiply = 108,// VK_MULTIPLY, 0x6A, Multiply key
+    NumpadAdd = 109,// VK_ADD, 0x6B, Add key
+    NUMPAD_SEPARATOR = 110,// VK_SEPARATOR, 0x6C, Separator key
+    NumpadSubtract = 111,// VK_SUBTRACT, 0x6D, Subtract key
+    NumpadDecimal = 112,// VK_DECIMAL, 0x6E, Decimal key
+    NumpadDivide = 113,// VK_DIVIDE, 0x6F,
     /**
      * Cover all key codes when IME is processing input.
      */
     KEY_IN_COMPOSITION = 114,
-    ABNT_C1 = 115,
-    ABNT_C2 = 116,
+    ABNT_C1 = 115,// Brazilian (ABNT) Keyboard
+    ABNT_C2 = 116,// Brazilian (ABNT) Keyboard
     AudioVolumeMute = 117,
     AudioVolumeUp = 118,
     AudioVolumeDown = 119,

package/vscode/src/vs/base/common/lifecycle.d.ts

@@ -40,6 +40,15 @@ declare class DisposableStore implements IDisposable {
      * Add a new {@link IDisposable disposable} to the collection.
      */
     add<T extends IDisposable>(o: T): T;
+    /**
+     * Deletes a disposable from store and disposes of it. This will not throw or warn and proceed to dispose the
+     * disposable even when the disposable is not part in the store.
+     */
+    delete<T extends IDisposable>(o: T): void;
+    /**
+     * Deletes the value from the store, but does not dispose it.
+     */
+    deleteAndLeak<T extends IDisposable>(o: T): void;
 }
 /**
  * Abstract base class for a {@link IDisposable disposable} object.

package/vscode/src/vs/base/common/observableInternal/base.d.ts

@@ -1,5 +1,6 @@
 /**
  * Represents an observable value.
+ *
  * @template T The type of the value.
  * @template TChange The type of delta information (usually `void` and only used in advanced scenarios).
  */
@@ -43,6 +44,7 @@ interface IObservable<T, TChange = unknown> {
      * (see {@link ConvenientObservable.map}).
      */
     map<TNew>(fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
+    map<TNew>(owner: object, fn: (value: T, reader: IReader) => TNew): IObservable<TNew>;
     /**
      * A human-readable name for debugging purposes.
      */

package/vscode/src/vs/base/common/product.d.ts

@@ -108,6 +108,7 @@ interface IProductConfiguration {
     readonly languageExtensionTips?: readonly string[];
     readonly trustedExtensionUrlPublicKeys?: IStringDictionary<string[]>;
     readonly trustedExtensionAuthAccess?: readonly string[];
+    readonly trustedExtensionProtocolHandlers?: readonly string[];
     readonly commandPaletteSuggestedCommandIds?: string[];
     readonly crashReporter?: {
         readonly companyName: string;

package/vscode/src/vs/base/parts/ipc/common/ipc.js

@@ -256,7 +256,6 @@ class ChannelServer {
         const id = request.id;
         promise.then(data => {
             this.sendResponse({ id, data, type: 201  });
-            this.activeRequests.delete(request.id);
         }, err => {
             if (err instanceof Error) {
                 this.sendResponse({
@@ -270,6 +269,8 @@ class ChannelServer {
             else {
                 this.sendResponse({ id, data: err, type: 203  });
             }
+        }).finally(() => {
+            disposable.dispose();
             this.activeRequests.delete(request.id);
         });
         const disposable = toDisposable(() => cancellationTokenSource.cancel());
@@ -428,7 +429,10 @@ class ChannelClient {
             disposable = combinedDisposable(toDisposable(cancel), cancellationTokenListener);
             this.activeRequests.add(disposable);
         }));
-        return result.finally(() => { this.activeRequests.delete(disposable); });
+        return result.finally(() => {
+            disposable.dispose();
+            this.activeRequests.delete(disposable);
+        });
     }
     requestEvent(channelName, name, arg) {
         const id = this.lastRequestId++;

package/vscode/src/vs/base/parts/storage/common/storage.d.ts

@@ -38,6 +38,7 @@ interface IStorage extends IDisposable {
     delete(key: string, external?: boolean): Promise<void>;
     flush(delay?: number): Promise<void>;
     whenFlushed(): Promise<void>;
+    optimize(): Promise<void>;
     close(): Promise<void>;
 }
 

package/vscode/src/vs/editor/common/config/editorOptions.d.ts

@@ -1,5 +1,4 @@
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
-import { IDocumentDiffProvider } from '../diff/documentDiffProvider.js';
 
 /**
  * Configuration options for auto closing quotes and brackets
@@ -436,6 +435,11 @@ interface IEditorOptions {
      * Defaults to language defined behavior.
      */
     autoClosingBrackets?: EditorAutoClosingStrategy;
+    /**
+     * Options for auto closing comments.
+     * Defaults to language defined behavior.
+     */
+    autoClosingComments?: EditorAutoClosingStrategy;
     /**
      * Options for auto closing quotes.
      * Defaults to language defined behavior.
@@ -698,7 +702,7 @@ interface IEditorOptions {
      */
     pasteAs?: IPasteAsOptions;
     /**
-     * Controls whether the editor receives tabs or defers them to the workbench for navigation.
+     * Controls whether the editor / terminal receives tabs or defers them to the workbench for navigation.
      */
     tabFocusMode?: boolean;
     /**
@@ -780,7 +784,7 @@ interface IDiffEditorBaseOptions {
     /**
      * Diff Algorithm
     */
-    diffAlgorithm?: 'legacy' | 'advanced' | IDocumentDiffProvider;
+    diffAlgorithm?: 'legacy' | 'advanced';
     /**
      * Whether the diff editor aria label should be verbose.
      */
@@ -891,6 +895,11 @@ interface IEditorHoverOptions {
      * Defaults to true.
      */
     sticky?: boolean;
+    /**
+     * Controls how long the hover is visible after you hovered out of it.
+     * Require sticky setting to be true.
+     */
+    hidingDelay?: number;
     /**
      * Should the hover be shown above the line if possible?
      * Defaults to false.

package/vscode/src/vs/editor/common/core/lineRange.d.ts

@@ -11,11 +11,6 @@ declare class LineRange {
      * @param lineRanges An array of sorted line ranges.
      */
     static joinMany(lineRanges: readonly (readonly LineRange[])[]): readonly LineRange[];
-    /**
-     * @param lineRanges1 Must be sorted.
-     * @param lineRanges2 Must be sorted.
-     */
-    static join(lineRanges1: readonly LineRange[], lineRanges2: readonly LineRange[]): readonly LineRange[];
     static ofLength(startLineNumber: number, length: number): LineRange;
     /**
      * @internal

package/vscode/src/vs/editor/common/core/offsetRange.d.ts

@@ -1,7 +1,11 @@
+interface IOffsetRange {
+    readonly start: number;
+    readonly endExclusive: number;
+}
 /**
  * A range of offsets (0-based).
 */
-declare class OffsetRange {
+declare class OffsetRange implements IOffsetRange {
     readonly start: number;
     readonly endExclusive: number;
     static addRange(range: OffsetRange, sortedRanges: OffsetRange[]): void;
@@ -29,6 +33,7 @@ declare class OffsetRange {
      * If the ranges don't even touch, the result is undefined.
      */
     intersect(other: OffsetRange): OffsetRange | undefined;
+    intersectsOrTouches(other: OffsetRange): boolean;
     slice<T>(arr: T[]): T[];
     /**
      * Returns the given value if it is contained in this instance, otherwise the closest value that is contained.
@@ -42,6 +47,8 @@ declare class OffsetRange {
      * E.g. `[5, 10).clipCyclic(10) === 5`, `[5, 10).clipCyclic(11) === 6` and `[5, 10).clipCyclic(4) === 9`.
      */
     clipCyclic(value: number): number;
+    map<T>(f: (offset: number) => T): T[];
+    forEach(f: (offset: number) => void): void;
 }
 
-export { OffsetRange };
+export { type IOffsetRange, OffsetRange };

package/vscode/src/vs/editor/common/diff/documentDiffProvider.d.ts

@@ -1,24 +1,9 @@
-import { CancellationToken } from '../../../base/common/cancellation.js';
-import { Event } from '../../../base/common/event.js';
-import { LineRangeMapping, MovedText } from './linesDiffComputer.js';
-import { ITextModel } from '../model.js';
+import { MovedText } from './linesDiffComputer.js';
+import { DetailedLineRangeMapping } from './rangeMapping.js';
 
-/**
- * A document diff provider computes the diff between two text models.
- */
-interface IDocumentDiffProvider {
-    /**
-     * Computes the diff between the text models `original` and `modified`.
-     */
-    computeDiff(original: ITextModel, modified: ITextModel, options: IDocumentDiffProviderOptions, cancellationToken: CancellationToken): Promise<IDocumentDiff>;
-    /**
-     * Is fired when settings of the diff algorithm change that could alter the result of the diffing computation.
-     * Any user of this provider should recompute the diff when this event is fired.
-     */
-    onDidChange: Event<void>;
-}
 /**
  * Options for the diff computation.
+ * @internal
  */
 interface IDocumentDiffProviderOptions {
     /**
@@ -36,6 +21,7 @@ interface IDocumentDiffProviderOptions {
 }
 /**
  * Represents a diff between two text models.
+ * @internal
  */
 interface IDocumentDiff {
     /**
@@ -49,7 +35,7 @@ interface IDocumentDiff {
     /**
      * Maps all modified line ranges in the original to the corresponding line ranges in the modified text model.
      */
-    readonly changes: readonly LineRangeMapping[];
+    readonly changes: readonly DetailedLineRangeMapping[];
     /**
      * Sorted by original line ranges.
      * The original line ranges and the modified line ranges must be disjoint (but can be touching).
@@ -57,4 +43,4 @@ interface IDocumentDiff {
     readonly moves: readonly MovedText[];
 }
 
-export type { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions };
+export type { IDocumentDiff, IDocumentDiffProviderOptions };

package/vscode/src/vs/editor/common/diff/legacyLinesDiffComputer.d.ts

@@ -1,4 +1,4 @@
-import { LineRangeMapping } from './linesDiffComputer.js';
+import { DetailedLineRangeMapping } from './rangeMapping.js';
 
 interface IDiffComputationResult {
     quitEarly: boolean;
@@ -11,7 +11,7 @@ interface IDiffComputationResult {
     /**
      * The changes as (modern) line range mapping array.
      */
-    changes2: readonly LineRangeMapping[];
+    changes2: readonly DetailedLineRangeMapping[];
 }
 /**
  * A change

package/vscode/src/vs/editor/common/diff/linesDiffComputer.d.ts

@@ -1,65 +1,15 @@
-import { LineRange } from '../core/lineRange.js';
-import { Range } from '../core/range.js';
+import { LineRangeMapping, DetailedLineRangeMapping } from './rangeMapping.js';
 
-/**
- * Maps a line range in the original text model to a line range in the modified text model.
- */
-declare class LineRangeMapping {
-    static inverse(mapping: readonly LineRangeMapping[], originalLineCount: number, modifiedLineCount: number): LineRangeMapping[];
-    /**
-     * The line range in the original text model.
-     */
-    readonly originalRange: LineRange;
-    /**
-     * The line range in the modified text model.
-     */
-    readonly modifiedRange: LineRange;
-    /**
-     * If inner changes have not been computed, this is set to undefined.
-     * Otherwise, it represents the character-level diff in this line range.
-     * The original range of each range mapping should be contained in the original line range (same for modified), exceptions are new-lines.
-     * Must not be an empty array.
-     */
-    readonly innerChanges: RangeMapping[] | undefined;
-    constructor(originalRange: LineRange, modifiedRange: LineRange, innerChanges: RangeMapping[] | undefined);
-    toString(): string;
-    get changedLineCount(): number;
-    flip(): LineRangeMapping;
-}
-/**
- * Maps a range in the original text model to a range in the modified text model.
- */
-declare class RangeMapping {
-    /**
-     * The original range.
-     */
-    readonly originalRange: Range;
-    /**
-     * The modified range.
-     */
-    readonly modifiedRange: Range;
-    constructor(originalRange: Range, modifiedRange: Range);
-    toString(): string;
-    flip(): RangeMapping;
-}
-declare class SimpleLineRangeMapping {
-    readonly original: LineRange;
-    readonly modified: LineRange;
-    constructor(original: LineRange, modified: LineRange);
-    toString(): string;
-    flip(): SimpleLineRangeMapping;
-    join(other: SimpleLineRangeMapping): SimpleLineRangeMapping;
-}
 declare class MovedText {
-    readonly lineRangeMapping: SimpleLineRangeMapping;
+    readonly lineRangeMapping: LineRangeMapping;
     /**
      * The diff from the original text to the moved text.
      * Must be contained in the original/modified line range.
      * Can be empty if the text didn't change (only moved).
      */
-    readonly changes: readonly LineRangeMapping[];
-    constructor(lineRangeMapping: SimpleLineRangeMapping, changes: readonly LineRangeMapping[]);
+    readonly changes: readonly DetailedLineRangeMapping[];
+    constructor(lineRangeMapping: LineRangeMapping, changes: readonly DetailedLineRangeMapping[]);
     flip(): MovedText;
 }
 
-export { LineRangeMapping, MovedText, RangeMapping, SimpleLineRangeMapping };
+export { MovedText };

package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts

@@ -0,0 +1,55 @@
+import { LineRange } from '../core/lineRange.js';
+import { Range } from '../core/range.js';
+
+/**
+ * Maps a line range in the original text model to a line range in the modified text model.
+ */
+declare class LineRangeMapping {
+    static inverse(mapping: readonly DetailedLineRangeMapping[], originalLineCount: number, modifiedLineCount: number): DetailedLineRangeMapping[];
+    /**
+     * The line range in the original text model.
+     */
+    readonly original: LineRange;
+    /**
+     * The line range in the modified text model.
+     */
+    readonly modified: LineRange;
+    constructor(originalRange: LineRange, modifiedRange: LineRange);
+    toString(): string;
+    flip(): LineRangeMapping;
+    join(other: LineRangeMapping): LineRangeMapping;
+    get changedLineCount(): number;
+}
+/**
+ * Maps a line range in the original text model to a line range in the modified text model.
+ * Also contains inner range mappings.
+ */
+declare class DetailedLineRangeMapping extends LineRangeMapping {
+    /**
+     * If inner changes have not been computed, this is set to undefined.
+     * Otherwise, it represents the character-level diff in this line range.
+     * The original range of each range mapping should be contained in the original line range (same for modified), exceptions are new-lines.
+     * Must not be an empty array.
+     */
+    readonly innerChanges: RangeMapping[] | undefined;
+    constructor(originalRange: LineRange, modifiedRange: LineRange, innerChanges: RangeMapping[] | undefined);
+    flip(): DetailedLineRangeMapping;
+}
+/**
+ * Maps a range in the original text model to a range in the modified text model.
+ */
+declare class RangeMapping {
+    /**
+     * The original range.
+     */
+    readonly originalRange: Range;
+    /**
+     * The modified range.
+     */
+    readonly modifiedRange: Range;
+    constructor(originalRange: Range, modifiedRange: Range);
+    toString(): string;
+    flip(): RangeMapping;
+}
+
+export { DetailedLineRangeMapping, LineRangeMapping, RangeMapping };