@codingame/monaco-vscode-api 6.0.3 → 7.0.0

package/vscode/src/vs/workbench/api/common/extHostComments.js

@@ -149,7 +149,7 @@ function createExtHostComments(mainContext, commands, documents) {
                 else if (rangesResult) {
                     ranges = {
                         ranges: rangesResult.ranges || [],
-                        fileComments: rangesResult.fileComments || false
+                        fileComments: rangesResult.enableFileComments || false
                     };
                 }
                 else {
@@ -293,13 +293,14 @@ function createExtHostComments(mainContext, commands, documents) {
             if (this._id === undefined) {
                 this._id = `${commentControllerId}.${this.handle}`;
             }
-            proxy.$createCommentThread(_commentControllerHandle, this.handle, this._id, this._uri, Range.from(this._range), extensionDescription.identifier, this._isTemplate, editorId);
+            proxy.$createCommentThread(_commentControllerHandle, this.handle, this._id, this._uri, Range.from(this._range), ( this._comments.map(
+                cmt => convertToDTOComment(this, cmt, this._commentsMap, this.extensionDescription)
+            )), extensionDescription.identifier, this._isTemplate, editorId);
             this._localDisposables = [];
             this._isDiposed = false;
             this._localDisposables.push(this.onDidUpdateCommentThread(() => {
                 this.eventuallyUpdateCommentThread();
             }));
-            this.comments = _comments;
             this._localDisposables.push({
                 dispose: () => {
                     proxy.$deleteCommentThread(_commentControllerHandle, this.handle);
@@ -322,6 +323,7 @@ function createExtHostComments(mainContext, commands, documents) {
                 set label(value) { that.label = value; },
                 get state() { return that.state; },
                 set state(value) { that.state = value; },
+                reveal: (options) => that.reveal(options),
                 dispose: () => {
                     that.dispose();
                 }
@@ -386,6 +388,10 @@ function createExtHostComments(mainContext, commands, documents) {
             }
             return;
         }
+        async reveal(options) {
+            checkProposedApiEnabled(this.extensionDescription, 'commentReveal');
+            return proxy.$revealCommentThread(this._commentControllerHandle, this.handle, { preserveFocus: false, focusReply: false, ...options });
+        }
         dispose() {
             this._isDiposed = true;
             this._acceptInputDisposables.dispose();

package/vscode/src/vs/workbench/api/common/extHostDebugService.js

@@ -2,39 +2,42 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { asPromise } from '../../../base/common/async.js';
 import { Emitter } from '../../../base/common/event.js';
 import { URI } from '../../../base/common/uri.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostEditorTabs } from './extHostEditorTabs.js';
 import { IExtHostExtensionService } from './extHostExtensionService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { SourceBreakpoint, DebugConsoleMode, Disposable, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint, DebugThread, DebugStackFrame } from './extHostTypes.js';
+import { SourceBreakpoint, DebugConsoleMode, Disposable as Disposable$1, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint, DebugThread, DebugStackFrame } from './extHostTypes.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
 import { DebugVisualizationType } from '../../contrib/debug/common/debug.js';
 import { convertToVSCPaths, convertToDAPaths, isDebuggerMainContribution } from '../../contrib/debug/common/debugUtils.js';
 import { IExtHostConfiguration } from './extHostConfiguration.js';
 import { IExtHostVariableResolverProvider } from './extHostVariableResolverService.js';
-import { toDisposable } from '../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { IExtHostCommands } from './extHostCommands.js';
 import { DebugTreeItem } from './extHostTypeConverters.js';
 import { coalesce } from '../../../base/common/arrays.js';
+import { IExtHostTesting } from './extHostTesting.js';
 const IExtHostDebugService = ( createDecorator('IExtHostDebugService'));
-let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
+let ExtHostDebugServiceBase = class ExtHostDebugServiceBase extends Disposable {
     get onDidStartDebugSession() { return this._onDidStartDebugSession.event; }
     get onDidTerminateDebugSession() { return this._onDidTerminateDebugSession.event; }
     get onDidChangeActiveDebugSession() { return this._onDidChangeActiveDebugSession.event; }
     get activeDebugSession() { return this._activeDebugSession?.api; }
     get onDidReceiveDebugSessionCustomEvent() { return this._onDidReceiveDebugSessionCustomEvent.event; }
     get activeDebugConsole() { return this._activeDebugConsole.value; }
-    constructor(extHostRpcService, _workspaceService, _extensionService, _configurationService, _editorTabs, _variableResolver, _commands) {
+    constructor(extHostRpcService, _workspaceService, _extensionService, _configurationService, _editorTabs, _variableResolver, _commands, _testing) {
+        super();
         this._workspaceService = _workspaceService;
         this._extensionService = _extensionService;
         this._configurationService = _configurationService;
         this._editorTabs = _editorTabs;
         this._variableResolver = _variableResolver;
         this._commands = _commands;
+        this._testing = _testing;
         this._debugSessions = ( new Map());
         this._debugVisualizationTreeItemIdsCounter = 0;
         this._debugVisualizationProviders = ( new Map());
@@ -51,19 +54,19 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
         this._trackerFactories = [];
         this._debugAdapters = ( new Map());
         this._debugAdaptersTrackers = ( new Map());
-        this._onDidStartDebugSession = ( new Emitter());
-        this._onDidTerminateDebugSession = ( new Emitter());
-        this._onDidChangeActiveDebugSession = ( new Emitter());
-        this._onDidReceiveDebugSessionCustomEvent = ( new Emitter());
+        this._onDidStartDebugSession = this._register(( new Emitter()));
+        this._onDidTerminateDebugSession = this._register(( new Emitter()));
+        this._onDidChangeActiveDebugSession = this._register(( new Emitter()));
+        this._onDidReceiveDebugSessionCustomEvent = this._register(( new Emitter()));
         this._debugServiceProxy = ( extHostRpcService.getProxy(MainContext.MainThreadDebugService));
-        this._onDidChangeBreakpoints = ( new Emitter());
-        this._onDidChangeActiveStackItem = ( new Emitter());
+        this._onDidChangeBreakpoints = this._register(( new Emitter()));
+        this._onDidChangeActiveStackItem = this._register(( new Emitter()));
         this._activeDebugConsole = ( new ExtHostDebugConsole(this._debugServiceProxy));
         this._breakpoints = ( new Map());
         this._extensionService.getExtensionRegistry().then((extensionRegistry) => {
-            extensionRegistry.onDidChange(_ => {
+            this._register(extensionRegistry.onDidChange(_ => {
                 this.registerAllDebugTypes(extensionRegistry);
-            });
+            }));
             this.registerAllDebugTypes(extensionRegistry);
         });
     }
@@ -322,6 +325,7 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
         return this._debugServiceProxy.$unregisterBreakpoints(ids, fids, dids);
     }
     startDebugging(folder, nameOrConfig, options) {
+        const testRunMeta = options.testRun && this._testing.getMetadataForRun(options.testRun);
         return this._debugServiceProxy.$startDebugging(folder ? folder.uri : undefined, nameOrConfig, {
             parentSessionID: options.parentSession ? options.parentSession.id : undefined,
             lifecycleManagedByParent: options.lifecycleManagedByParent,
@@ -329,6 +333,10 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
             noDebug: options.noDebug,
             compact: options.compact,
             suppressSaveBeforeStart: options.suppressSaveBeforeStart,
+            testRun: testRunMeta && {
+                runId: testRunMeta.runId,
+                taskId: testRunMeta.taskId,
+            },
             suppressDebugStatusbar: options.suppressDebugStatusbar ?? options.debugUI?.simple,
             suppressDebugToolbar: options.suppressDebugToolbar ?? options.debugUI?.simple,
             suppressDebugView: options.suppressDebugView ?? options.debugUI?.simple,
@@ -339,19 +347,19 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
     }
     registerDebugConfigurationProvider(type, provider, trigger) {
         if (!provider) {
-            return ( new Disposable(() => { }));
+            return ( new Disposable$1(() => { }));
         }
         const handle = this._configProviderHandleCounter++;
         this._configProviders.push({ type, handle, provider });
         this._debugServiceProxy.$registerDebugConfigurationProvider(type, trigger, !!provider.provideDebugConfigurations, !!provider.resolveDebugConfiguration, !!provider.resolveDebugConfigurationWithSubstitutedVariables, handle);
-        return ( new Disposable(() => {
+        return ( new Disposable$1(() => {
             this._configProviders = this._configProviders.filter(p => p.provider !== provider);
             this._debugServiceProxy.$unregisterDebugConfigurationProvider(handle);
         }));
     }
     registerDebugAdapterDescriptorFactory(extension, type, factory) {
         if (!factory) {
-            return ( new Disposable(() => { }));
+            return ( new Disposable$1(() => { }));
         }
         if (!this.definesDebugType(extension, type)) {
             throw ( new Error(
@@ -364,18 +372,18 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
         const handle = this._adapterFactoryHandleCounter++;
         this._adapterFactories.push({ type, handle, factory });
         this._debugServiceProxy.$registerDebugAdapterDescriptorFactory(type, handle);
-        return ( new Disposable(() => {
+        return ( new Disposable$1(() => {
             this._adapterFactories = this._adapterFactories.filter(p => p.factory !== factory);
             this._debugServiceProxy.$unregisterDebugAdapterDescriptorFactory(handle);
         }));
     }
     registerDebugAdapterTrackerFactory(type, factory) {
         if (!factory) {
-            return ( new Disposable(() => { }));
+            return ( new Disposable$1(() => { }));
         }
         const handle = this._trackerFactoryHandleCounter++;
         this._trackerFactories.push({ type, handle, factory });
-        return ( new Disposable(() => {
+        return ( new Disposable$1(() => {
             this._trackerFactories = this._trackerFactories.filter(p => p.factory !== factory);
         }));
     }
@@ -896,7 +904,8 @@ ExtHostDebugServiceBase = ( __decorate([
     ( __param(3, IExtHostConfiguration)),
     ( __param(4, IExtHostEditorTabs)),
     ( __param(5, IExtHostVariableResolverProvider)),
-    ( __param(6, IExtHostCommands))
+    ( __param(6, IExtHostCommands)),
+    ( __param(7, IExtHostTesting))
 ], ExtHostDebugServiceBase));
 class ExtHostDebugSession {
     constructor(_debugServiceProxy, _id, _type, _name, _workspaceFolder, _configuration, _parentSession) {
@@ -999,8 +1008,8 @@ class DirectDebugAdapter extends AbstractDebugAdapter {
     }
 }
 let WorkerExtHostDebugService = class WorkerExtHostDebugService extends ExtHostDebugServiceBase {
-    constructor(extHostRpcService, workspaceService, extensionService, configurationService, editorTabs, variableResolver, commands) {
-        super(extHostRpcService, workspaceService, extensionService, configurationService, editorTabs, variableResolver, commands);
+    constructor(extHostRpcService, workspaceService, extensionService, configurationService, editorTabs, variableResolver, commands, testing) {
+        super(extHostRpcService, workspaceService, extensionService, configurationService, editorTabs, variableResolver, commands, testing);
     }
 };
 WorkerExtHostDebugService = ( __decorate([
@@ -1010,6 +1019,7 @@ WorkerExtHostDebugService = ( __decorate([
     ( __param(3, IExtHostConfiguration)),
     ( __param(4, IExtHostEditorTabs)),
     ( __param(5, IExtHostVariableResolverProvider)),
-    ( __param(6, IExtHostCommands))
+    ( __param(6, IExtHostCommands)),
+    ( __param(7, IExtHostTesting))
 ], WorkerExtHostDebugService));
 export { ExtHostDebugConsole, ExtHostDebugServiceBase, ExtHostDebugSession, IExtHostDebugService, WorkerExtHostDebugService };

package/vscode/src/vs/workbench/api/common/extHostExtensionService.js

@@ -317,9 +317,9 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     }
     _loadExtensionContext(extensionDescription) {
         const lanuageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
-        const globalState = ( new ExtensionGlobalMemento(extensionDescription, this._storage));
-        const workspaceState = ( new ExtensionMemento(extensionDescription.identifier.value, false, this._storage));
-        const secrets = ( new ExtensionSecrets(extensionDescription, this._secretState));
+        const globalState = this._register(( new ExtensionGlobalMemento(extensionDescription, this._storage)));
+        const workspaceState = this._register(( new ExtensionMemento(extensionDescription.identifier.value, false, this._storage)));
+        const secrets = this._register(( new ExtensionSecrets(extensionDescription, this._secretState)));
         const extensionMode = extensionDescription.isUnderDevelopment
             ? (this._initData.environment.extensionTestsLocationURI ? ExtensionMode.Test : ExtensionMode.Development)
             : ExtensionMode.Production;

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -1,4 +1,4 @@
-import { isFalsyOrEmpty, isNonEmptyArray, coalesce, asArray } from '../../../base/common/arrays.js';
+import { isFalsyOrEmpty, coalesce, isNonEmptyArray, asArray } from '../../../base/common/arrays.js';
 import { raceCancellationError } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { isCancellationError, NotImplementedError } from '../../../base/common/errors.js';
@@ -9,15 +9,15 @@ import { StopWatch } from '../../../base/common/stopwatch.js';
 import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
 import { assertType, isObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
-import { Range as Range$2 } from '../../../editor/common/core/range.js';
+import { Range as Range$1 } from '../../../editor/common/core/range.js';
 import { Selection } from '../../../editor/common/core/selection.js';
 import { NewSymbolNameTriggerKind, CompletionItemInsertTextRule, InlineEditTriggerKind, InlineCompletionTriggerKind } from '../../../editor/common/languages.js';
 import { encodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { localizeWithPath } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { Position, Hover, Selection as Selection$1, Range as Range$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink, PartialAcceptInfo } from './extHostTypeConverters.js';
-import { Range, CodeActionKind, NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, Disposable, SyntaxTokenType, DocumentSymbol, InternalDataTransferItem, DocumentDropOrPasteEditKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, InlineEditTriggerKind as InlineEditTriggerKind$1, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
-import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Range, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink, PartialAcceptInfo } from './extHostTypeConverters.js';
+import { Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, CodeActionKind, InternalDataTransferItem, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, InlineEditTriggerKind as InlineEditTriggerKind$1, Location, CompletionList, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from './extHostTypes.js';
+import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Cache } from './cache.js';
 import { MainContext, ISuggestResultDtoField, ISuggestDataDtoField } from './extHost.protocol.js';
 const _moduleId = "vs/workbench/api/common/extHostLanguageFeatures";
@@ -58,8 +58,8 @@ class DocumentSymbolAdapter {
                 tags: info.tags?.map(SymbolTag.from) || [],
                 detail: '',
                 containerName: info.containerName,
-                range: Range$1.from(info.location.range),
-                selectionRange: Range$1.from(info.location.range),
+                range: Range.from(info.location.range),
+                selectionRange: Range.from(info.location.range),
                 children: []
             };
             while (true) {
@@ -69,7 +69,7 @@ class DocumentSymbolAdapter {
                     break;
                 }
                 const parent = parentStack[parentStack.length - 1];
-                if (Range$2.containsRange(parent.range, element.range) && !Range$2.equalsRange(parent.range, element.range)) {
+                if (Range$1.containsRange(parent.range, element.range) && !Range$1.equalsRange(parent.range, element.range)) {
                     parent.children?.push(element);
                     parentStack.push(element);
                     break;
@@ -107,7 +107,7 @@ class CodeLensAdapter {
         for (let i = 0; i < lenses.length; i++) {
             result.lenses.push({
                 cacheId: [cacheId, i],
-                range: Range$1.from(lenses[i].range),
+                range: Range.from(lenses[i].range),
                 command: this._commands.toInternal(lenses[i].command, disposables)
             });
         }
@@ -242,7 +242,7 @@ class HoverAdapter {
             value.range = doc.getWordRangeAtPosition(pos);
         }
         if (!value.range) {
-            value.range = ( (new Range(pos, pos)));
+            value.range = ( (new Range$2(pos, pos)));
         }
         const convertedHover = Hover.from(value);
         const id = this._hoverCounter;
@@ -284,7 +284,7 @@ class InlineValuesAdapter {
     }
     async provideInlineValues(resource, viewPort, context, token) {
         const doc = this._documents.getDocument(resource);
-        const value = await this._provider.provideInlineValues(doc, Range$1.to(viewPort), InlineValueContext.to(context), token);
+        const value = await this._provider.provideInlineValues(doc, Range.to(viewPort), InlineValueContext.to(context), token);
         if (Array.isArray(value)) {
             return (
                  (value.map(iv => InlineValue.from(iv)))
@@ -339,7 +339,7 @@ class LinkedEditingRangeAdapter {
         const value = await this._provider.provideLinkedEditingRanges(doc, pos, token);
         if (value && Array.isArray(value.ranges)) {
             return {
-                ranges: coalesce(( (value.ranges.map(Range$1.from)))),
+                ranges: coalesce(( (value.ranges.map(Range.from)))),
                 wordPattern: value.wordPattern
             };
         }
@@ -380,7 +380,7 @@ class CodeActionAdapter {
         const doc = this._documents.getDocument(resource);
         const ran = Selection.isISelection(rangeOrSelection)
             ? Selection$1.to(rangeOrSelection)
-            : Range$1.to(rangeOrSelection);
+            : Range.to(rangeOrSelection);
         const allDiagnostics = [];
         for (const diagnostic of this._diagnostics.getDiagnostics(resource)) {
             if (ran.intersection(diagnostic.range)) {
@@ -419,10 +419,10 @@ class CodeActionAdapter {
             else {
                 if (codeActionContext.only) {
                     if (!candidate.kind) {
-                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
+                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
                     }
                     else if (!codeActionContext.only.contains(candidate.kind)) {
-                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
+                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
                     }
                 }
                 const range = candidate.ranges ?? [];
@@ -435,7 +435,7 @@ class CodeActionAdapter {
                     kind: candidate.kind && candidate.kind.value,
                     isPreferred: candidate.isPreferred,
                     isAI: isProposedApiEnabled(this._extension, 'codeActionAI') ? candidate.isAI : false,
-                    ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( (range.map(Range$1.from)))) : undefined,
+                    ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( (range.map(Range.from)))) : undefined,
                     disabled: candidate.disabled?.reason
                 });
             }
@@ -488,7 +488,7 @@ class DocumentPasteEditProvider {
             return;
         }
         const doc = this._documents.getDocument(resource);
-        const vscodeRanges = ( (ranges.map(range => Range$1.to(range))));
+        const vscodeRanges = ( (ranges.map(range => Range.to(range))));
         const dataTransfer = DataTransfer.toDataTransfer(dataTransferDto, () => {
             throw ( (new NotImplementedError()));
         });
@@ -504,7 +504,7 @@ class DocumentPasteEditProvider {
             return [];
         }
         const doc = this._documents.getDocument(resource);
-        const vscodeRanges = ( (ranges.map(range => Range$1.to(range))));
+        const vscodeRanges = ( (ranges.map(range => Range.to(range))));
         const dataTransfer = DataTransfer.toDataTransfer(dataTransferDto, async (id) => {
             return (await this._proxy.$resolvePasteFileData(this._handle, requestId, id)).buffer;
         });
@@ -569,7 +569,7 @@ class RangeFormattingAdapter {
     }
     async provideDocumentRangeFormattingEdits(resource, range, options, token) {
         const document = this._documents.getDocument(resource);
-        const ran = Range$1.to(range);
+        const ran = Range.to(range);
         const value = await this._provider.provideDocumentRangeFormattingEdits(document, ran, options, token);
         if (Array.isArray(value)) {
             return (
@@ -581,7 +581,7 @@ class RangeFormattingAdapter {
     async provideDocumentRangesFormattingEdits(resource, ranges, options, token) {
         assertType(typeof this._provider.provideDocumentRangesFormattingEdits === 'function', 'INVALID invocation of `provideDocumentRangesFormattingEdits`');
         const document = this._documents.getDocument(resource);
-        const _ranges = ( (ranges.map(Range$1.to)));
+        const _ranges = ( (ranges.map(Range.to)));
         const value = await this._provider.provideDocumentRangesFormattingEdits(document, _ranges, options, token);
         if (Array.isArray(value)) {
             return (
@@ -695,7 +695,7 @@ class RenameAdapter {
             const rangeOrLocation = await this._provider.prepareRename(doc, pos, token);
             let range;
             let text;
-            if (Range.isRange(rangeOrLocation)) {
+            if (Range$2.isRange(rangeOrLocation)) {
                 range = rangeOrLocation;
                 text = doc.getText(rangeOrLocation);
             }
@@ -710,7 +710,7 @@ class RenameAdapter {
                 this._logService.warn('INVALID rename location: position line must be within range start/end lines');
                 return undefined;
             }
-            return { range: Range$1.from(range), text };
+            return { range: Range.from(range), text };
         }
         catch (err) {
             const rejectReason = RenameAdapter._asMessage(err);
@@ -749,7 +749,7 @@ class NewSymbolNamesAdapter {
     }
     async provideNewSymbolNames(resource, range, triggerKind, token) {
         const doc = this._documents.getDocument(resource);
-        const pos = Range$1.to(range);
+        const pos = Range.to(range);
         try {
             const kind = NewSymbolNamesAdapter.languageTriggerKindToVSCodeTriggerKind[triggerKind];
             const value = await this._provider.provideNewSymbolNames(doc, pos, kind, token);
@@ -922,7 +922,7 @@ class DocumentRangeSemanticTokensAdapter {
     }
     async provideDocumentRangeSemanticTokens(resource, range, token) {
         const doc = this._documents.getDocument(resource);
-        const value = await this._provider.provideDocumentRangeSemanticTokens(doc, Range$1.to(range), token);
+        const value = await this._provider.provideDocumentRangeSemanticTokens(doc, Range.to(range), token);
         if (!value) {
             return null;
         }
@@ -952,7 +952,7 @@ class CompletionsAdapter {
     async provideCompletionItems(resource, position, context, token) {
         const doc = this._documents.getDocument(resource);
         const pos = Position.to(position);
-        const replaceRange = doc.getWordRangeAtPosition(pos) || ( (new Range(pos, pos)));
+        const replaceRange = doc.getWordRangeAtPosition(pos) || ( (new Range$2(pos, pos)));
         const insertRange = replaceRange.with({ end: pos });
         const sw = ( (new StopWatch()));
         const itemsOrList = await this._provider.provideCompletionItems(doc, pos, token, CompletionContext.to(context));
@@ -970,7 +970,7 @@ class CompletionsAdapter {
         const result = {
             x: pid,
             [ISuggestResultDtoField.completions]: completions,
-            [ISuggestResultDtoField.defaultRanges]: { replace: Range$1.from(replaceRange), insert: Range$1.from(insertRange) },
+            [ISuggestResultDtoField.defaultRanges]: { replace: Range.from(replaceRange), insert: Range.from(insertRange) },
             [ISuggestResultDtoField.isIncomplete]: list.isIncomplete || undefined,
             [ISuggestResultDtoField.duration]: sw.elapsed()
         };
@@ -1062,13 +1062,13 @@ class CompletionsAdapter {
         else if (item.range) {
             range = item.range;
         }
-        if (Range.isRange(range)) {
-            result[ISuggestDataDtoField.range] = Range$1.from(range);
+        if (Range$2.isRange(range)) {
+            result[ISuggestDataDtoField.range] = Range.from(range);
         }
         else if (range && (!defaultInsertRange?.isEqual(range.inserting) || !defaultReplaceRange?.isEqual(range.replacing))) {
             result[ISuggestDataDtoField.range] = {
-                insert: Range$1.from(range.inserting),
-                replace: Range$1.from(range.replacing)
+                insert: Range.from(range.inserting),
+                replace: Range.from(range.replacing)
             };
         }
         return result;
@@ -1078,6 +1078,9 @@ class InlineCompletionAdapterBase {
     async provideInlineCompletions(resource, position, context, token) {
         return undefined;
     }
+    async provideInlineEdits(resource, range, context, token) {
+        return undefined;
+    }
     disposeCompletions(pid) { }
     handleDidShowCompletionItem(pid, idx, updatedInsertText) { }
     handlePartialAccept(pid, idx, acceptedCharacters, info) { }
@@ -1107,7 +1110,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
         const result = await this._provider.provideInlineCompletionItems(doc, pos, {
             selectedCompletionInfo: context.selectedSuggestionInfo
                 ? {
-                    range: Range$1.to(context.selectedSuggestionInfo.range),
+                    range: Range.to(context.selectedSuggestionInfo.range),
                     text: context.selectedSuggestionInfo.text
                 }
                 : undefined,
@@ -1143,7 +1146,70 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
                 return ({
                     insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
                     filterText: item.filterText,
-                    range: item.range ? Range$1.from(item.range) : undefined,
+                    range: item.range ? Range.from(item.range) : undefined,
+                    command,
+                    idx: idx,
+                    completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
+                });
+            }))),
+            commands: ( (commands.map(c => {
+                if (!disposableStore) {
+                    disposableStore = ( (new DisposableStore()));
+                }
+                return this._commands.toInternal(c, disposableStore);
+            }))),
+            suppressSuggestions: false,
+            enableForwardStability,
+        };
+    }
+    async provideInlineEdits(resource, range, context, token) {
+        if (!this._provider.provideInlineEdits) {
+            return undefined;
+        }
+        checkProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
+        const doc = this._documents.getDocument(resource);
+        const r = Range.to(range);
+        const result = await this._provider.provideInlineEdits(doc, r, {
+            selectedCompletionInfo: context.selectedSuggestionInfo
+                ? {
+                    range: Range.to(context.selectedSuggestionInfo.range),
+                    text: context.selectedSuggestionInfo.text
+                }
+                : undefined,
+            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
+            userPrompt: context.userPrompt,
+        }, token);
+        if (!result) {
+            return undefined;
+        }
+        if (token.isCancellationRequested) {
+            return undefined;
+        }
+        const normalizedResult = Array.isArray(result) ? result : result.items;
+        const commands = this._isAdditionsProposedApiEnabled ? Array.isArray(result) ? [] : result.commands || [] : [];
+        const enableForwardStability = this._isAdditionsProposedApiEnabled && !Array.isArray(result) ? result.enableForwardStability : undefined;
+        let disposableStore = undefined;
+        const pid = this._references.createReferenceId({
+            dispose() {
+                disposableStore?.dispose();
+            },
+            items: normalizedResult
+        });
+        return {
+            pid,
+            items: ( (normalizedResult.map((item, idx) => {
+                let command = undefined;
+                if (item.command) {
+                    if (!disposableStore) {
+                        disposableStore = ( (new DisposableStore()));
+                    }
+                    command = this._commands.toInternal(item.command, disposableStore);
+                }
+                const insertText = item.insertText;
+                return ({
+                    insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
+                    filterText: item.filterText,
+                    range: item.range ? Range.from(item.range) : undefined,
                     command,
                     idx: idx,
                     completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
@@ -1217,7 +1283,7 @@ class InlineEditAdapter {
         const langResult = {
             pid,
             text: result.text,
-            range: Range$1.from(result.range),
+            range: Range.from(result.range),
             accepted: acceptCommand,
             rejected: rejectCommand,
         };
@@ -1306,7 +1372,7 @@ class InlayHintsAdapter {
     }
     async provideInlayHints(resource, ran, token) {
         const doc = this._documents.getDocument(resource);
-        const range = Range$1.to(ran);
+        const range = Range.to(ran);
         const hints = await this._provider.provideInlayHints(doc, range, token);
         if (!Array.isArray(hints) || hints.length === 0) {
             this._logService.trace(`[InlayHints] NO inlay hints from '${this._extension.identifier.value}' for range ${JSON.stringify(ran)}`);
@@ -1471,14 +1537,14 @@ class ColorProviderAdapter {
         const colorInfos = ( (colors.map(ci => {
             return {
                 color: Color.from(ci.color),
-                range: Range$1.from(ci.range)
+                range: Range.from(ci.range)
             };
         })));
         return colorInfos;
     }
     async provideColorPresentations(resource, raw, token) {
         const document = this._documents.getDocument(resource);
-        const range = Range$1.to(raw.range);
+        const range = Range.to(raw.range);
         const color = Color.to(raw.color);
         const value = await this._provider.provideColorPresentations(color, { document, range }, token);
         if (!Array.isArray(value)) {
@@ -1581,7 +1647,7 @@ class CallHierarchyAdapter {
              (calls.map(call => {
                 return {
                     from: this._cacheAndConvertItem(sessionId, call.from),
-                    fromRanges: ( (call.fromRanges.map(r => Range$1.from(r))))
+                    fromRanges: ( (call.fromRanges.map(r => Range.from(r))))
                 };
             }))
         );
@@ -1599,7 +1665,7 @@ class CallHierarchyAdapter {
              (calls.map(call => {
                 return {
                     to: this._cacheAndConvertItem(sessionId, call.to),
-                    fromRanges: ( (call.fromRanges.map(r => Range$1.from(r))))
+                    fromRanges: ( (call.fromRanges.map(r => Range.from(r))))
                 };
             }))
         );
@@ -1750,7 +1816,7 @@ class MappedEditsAdapter {
             return {
                 uri: URI.revive(r.uri),
                 version: r.version,
-                ranges: ( (r.ranges.map((range) => Range$1.to(range)))),
+                ranges: ( (r.ranges.map((range) => Range.to(range)))),
             };
         }))))));
         const ctx = {
@@ -2122,6 +2188,9 @@ class ExtHostLanguageFeatures {
     $provideInlineCompletions(handle, resource, position, context, token) {
         return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
     }
+    $provideInlineEdits(handle, resource, range, context, token) {
+        return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineEdits(URI.revive(resource), range, context, token), undefined, token);
+    }
     $handleInlineCompletionDidShow(handle, pid, idx, updatedInsertText) {
         this._withAdapter(handle, InlineCompletionAdapterBase, async (adapter) => {
             adapter.handleDidShowCompletionItem(pid, idx, updatedInsertText);
@@ -2290,7 +2359,7 @@ class ExtHostLanguageFeatures {
     $resolveDropEdit(handle, id, token) {
         return this._withAdapter(handle, DocumentDropEditAdapter, adapter => adapter.resolveDropEdit(id, token), {}, undefined);
     }
-    $releaseDropEdits(handle, cacheId) {
+    $releaseDocumentOnDropEdits(handle, cacheId) {
         this._withAdapter(handle, DocumentDropEditAdapter, adapter => Promise.resolve(adapter.releaseDropEdits(cacheId)), undefined, undefined);
     }
     registerMappedEditsProvider(extension, selector, provider) {