@codingame/monaco-vscode-api 9.0.3 → 10.0.0

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

@@ -1,6 +1,5 @@
 import { Schemas } from '../../../base/common/network.js';
 import { ExtUri } from '../../../base/common/resources.js';
-import { FileSystemProviderCapabilities } from '../../../platform/files/common/files.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 class ExtHostFileSystemInfo {
     constructor() {
@@ -11,7 +10,7 @@ class ExtHostFileSystemInfo {
             if (capabilities === undefined) {
                 return false;
             }
-            if (capabilities & FileSystemProviderCapabilities.PathCaseSensitive) {
+            if (capabilities & 1024 ) {
                 return false;
             }
             return true;

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

@@ -1,4 +1,4 @@
-import { isFalsyOrEmpty, isNonEmptyArray, coalesce, asArray } from '../../../base/common/arrays.js';
+import { isNonEmptyArray, coalesce, isFalsyOrEmpty, 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,17 +9,17 @@ 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 { NewSymbolNameTriggerKind, InlineEditTriggerKind, InlineCompletionTriggerKind } from '../../../editor/common/languages.js';
 import { encodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { localize } 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 { Selection as Selection$1, Range, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Position, Hover, 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 { CodeActionKind, NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, InternalDataTransferItem, DocumentDropOrPasteEditKind, 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';
+import { MainContext } from './extHost.protocol.js';
 class DocumentSymbolAdapter {
     constructor(_documents, _provider) {
         this._documents = _documents;
@@ -57,8 +57,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) {
@@ -68,7 +68,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;
@@ -106,7 +106,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)
             });
         }
@@ -241,7 +241,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;
@@ -283,7 +283,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)))
@@ -310,13 +310,22 @@ class DocumentHighlightAdapter {
     }
 }
 class MultiDocumentHighlightAdapter {
-    constructor(_documents, _provider) {
+    constructor(_documents, _provider, _logService) {
         this._documents = _documents;
         this._provider = _provider;
+        this._logService = _logService;
     }
     async provideMultiDocumentHighlights(resource, position, otherResources, token) {
         const doc = this._documents.getDocument(resource);
-        const otherDocuments = ( (otherResources.map(r => this._documents.getDocument(r))));
+        const otherDocuments = ( (otherResources.map(r => {
+            try {
+                return this._documents.getDocument(r);
+            }
+            catch (err) {
+                this._logService.error('Error: Unable to retrieve document from URI: ' + r + '. Error message: ' + err);
+                return undefined;
+            }
+        }))).filter(doc => doc !== undefined);
         const pos = Position.to(position);
         const value = await this._provider.provideMultiDocumentHighlights(doc, pos, otherDocuments, token);
         if (Array.isArray(value)) {
@@ -338,7 +347,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
             };
         }
@@ -379,7 +388,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)) {
@@ -434,7 +443,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
                 });
             }
@@ -487,7 +496,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()));
         });
@@ -503,7 +512,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;
         });
@@ -519,7 +528,7 @@ class DocumentPasteEditProvider {
              (edits.map((edit, i) => ({
                 _cacheId: [cacheId, i],
                 title: edit.title ?? ( localize(
-                    4549,
+                    4576,
                     "Paste using '{0}' extension",
                     this._extension.displayName || this._extension.name
                 )),
@@ -567,7 +576,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 (
@@ -579,7 +588,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 (
@@ -693,7 +702,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);
             }
@@ -708,7 +717,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);
@@ -747,7 +756,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);
@@ -920,7 +929,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;
         }
@@ -950,7 +959,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));
@@ -967,10 +976,10 @@ class CompletionsAdapter {
         const completions = [];
         const result = {
             x: pid,
-            [ISuggestResultDtoField.completions]: completions,
-            [ISuggestResultDtoField.defaultRanges]: { replace: Range$1.from(replaceRange), insert: Range$1.from(insertRange) },
-            [ISuggestResultDtoField.isIncomplete]: list.isIncomplete || undefined,
-            [ISuggestResultDtoField.duration]: sw.elapsed()
+            ["b" ]: completions,
+            ["a" ]: { replace: Range.from(replaceRange), insert: Range.from(insertRange) },
+            ["c" ]: list.isIncomplete || undefined,
+            ["d" ]: sw.elapsed()
         };
         for (let i = 0; i < list.items.length; i++) {
             const item = list.items[i];
@@ -993,25 +1002,25 @@ class CompletionsAdapter {
             return undefined;
         }
         const dto2 = this._convertCompletionItem(resolvedItem, id);
-        if (dto1[ISuggestDataDtoField.insertText] !== dto2[ISuggestDataDtoField.insertText]
-            || dto1[ISuggestDataDtoField.insertTextRules] !== dto2[ISuggestDataDtoField.insertTextRules]) {
+        if (dto1["h" ] !== dto2["h" ]
+            || dto1["i" ] !== dto2["i" ]) {
             this._apiDeprecation.report('CompletionItem.insertText', this._extension, 'extension MAY NOT change \'insertText\' of a CompletionItem during resolve');
         }
-        if (dto1[ISuggestDataDtoField.commandIdent] !== dto2[ISuggestDataDtoField.commandIdent]
-            || dto1[ISuggestDataDtoField.commandId] !== dto2[ISuggestDataDtoField.commandId]
-            || !equals(dto1[ISuggestDataDtoField.commandArguments], dto2[ISuggestDataDtoField.commandArguments])) {
+        if (dto1["n" ] !== dto2["n" ]
+            || dto1["o" ] !== dto2["o" ]
+            || !equals(dto1["p" ], dto2["p" ])) {
             this._apiDeprecation.report('CompletionItem.command', this._extension, 'extension MAY NOT change \'command\' of a CompletionItem during resolve');
         }
         return {
             ...dto1,
-            [ISuggestDataDtoField.documentation]: dto2[ISuggestDataDtoField.documentation],
-            [ISuggestDataDtoField.detail]: dto2[ISuggestDataDtoField.detail],
-            [ISuggestDataDtoField.additionalTextEdits]: dto2[ISuggestDataDtoField.additionalTextEdits],
-            [ISuggestDataDtoField.insertText]: dto2[ISuggestDataDtoField.insertText],
-            [ISuggestDataDtoField.insertTextRules]: dto2[ISuggestDataDtoField.insertTextRules],
-            [ISuggestDataDtoField.commandIdent]: dto2[ISuggestDataDtoField.commandIdent],
-            [ISuggestDataDtoField.commandId]: dto2[ISuggestDataDtoField.commandId],
-            [ISuggestDataDtoField.commandArguments]: dto2[ISuggestDataDtoField.commandArguments],
+            ["d" ]: dto2["d" ],
+            ["c" ]: dto2["c" ],
+            ["l" ]: dto2["l" ],
+            ["h" ]: dto2["h" ],
+            ["i" ]: dto2["i" ],
+            ["n" ]: dto2["n" ],
+            ["o" ]: dto2["o" ],
+            ["p" ]: dto2["p" ],
         };
     }
     releaseCompletionItems(id) {
@@ -1027,31 +1036,31 @@ class CompletionsAdapter {
         const command = this._commands.toInternal(item.command, disposables);
         const result = {
             x: id,
-            [ISuggestDataDtoField.label]: item.label,
-            [ISuggestDataDtoField.kind]: item.kind !== undefined ? CompletionItemKind.from(item.kind) : undefined,
-            [ISuggestDataDtoField.kindModifier]: item.tags && ( (item.tags.map(CompletionItemTag.from))),
-            [ISuggestDataDtoField.detail]: item.detail,
-            [ISuggestDataDtoField.documentation]: typeof item.documentation === 'undefined' ? undefined : MarkdownString.fromStrict(item.documentation),
-            [ISuggestDataDtoField.sortText]: item.sortText !== item.label ? item.sortText : undefined,
-            [ISuggestDataDtoField.filterText]: item.filterText !== item.label ? item.filterText : undefined,
-            [ISuggestDataDtoField.preselect]: item.preselect || undefined,
-            [ISuggestDataDtoField.insertTextRules]: item.keepWhitespace ? CompletionItemInsertTextRule.KeepWhitespace : CompletionItemInsertTextRule.None,
-            [ISuggestDataDtoField.commitCharacters]: item.commitCharacters?.join(''),
-            [ISuggestDataDtoField.additionalTextEdits]: item.additionalTextEdits && ( (item.additionalTextEdits.map(TextEdit.from))),
-            [ISuggestDataDtoField.commandIdent]: command?.$ident,
-            [ISuggestDataDtoField.commandId]: command?.id,
-            [ISuggestDataDtoField.commandArguments]: command?.$ident ? undefined : command?.arguments,
+            ["a" ]: item.label,
+            ["b" ]: item.kind !== undefined ? CompletionItemKind.from(item.kind) : undefined,
+            ["m" ]: item.tags && ( (item.tags.map(CompletionItemTag.from))),
+            ["c" ]: item.detail,
+            ["d" ]: typeof item.documentation === 'undefined' ? undefined : MarkdownString.fromStrict(item.documentation),
+            ["e" ]: item.sortText !== item.label ? item.sortText : undefined,
+            ["f" ]: item.filterText !== item.label ? item.filterText : undefined,
+            ["g" ]: item.preselect || undefined,
+            ["i" ]: item.keepWhitespace ? 1  : 0 ,
+            ["k" ]: item.commitCharacters?.join(''),
+            ["l" ]: item.additionalTextEdits && ( (item.additionalTextEdits.map(TextEdit.from))),
+            ["n" ]: command?.$ident,
+            ["o" ]: command?.id,
+            ["p" ]: command?.$ident ? undefined : command?.arguments,
         };
         if (item.textEdit) {
             this._apiDeprecation.report('CompletionItem.textEdit', this._extension, `Use 'CompletionItem.insertText' and 'CompletionItem.range' instead.`);
-            result[ISuggestDataDtoField.insertText] = item.textEdit.newText;
+            result["h" ] = item.textEdit.newText;
         }
         else if (typeof item.insertText === 'string') {
-            result[ISuggestDataDtoField.insertText] = item.insertText;
+            result["h" ] = item.insertText;
         }
         else if (item.insertText instanceof SnippetString) {
-            result[ISuggestDataDtoField.insertText] = item.insertText.value;
-            result[ISuggestDataDtoField.insertTextRules] |= CompletionItemInsertTextRule.InsertAsSnippet;
+            result["h" ] = item.insertText.value;
+            result["i" ] |= 4 ;
         }
         let range;
         if (item.textEdit) {
@@ -1060,13 +1069,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["j" ] = 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)
+            result["j" ] = {
+                insert: Range.from(range.inserting),
+                replace: Range.from(range.replacing)
             };
         }
         return result;
@@ -1076,7 +1085,7 @@ class InlineCompletionAdapterBase {
     async provideInlineCompletions(resource, position, context, token) {
         return undefined;
     }
-    async provideInlineEdits(resource, range, context, token) {
+    async provideInlineEditsForRange(resource, range, context, token) {
         return undefined;
     }
     disposeCompletions(pid) { }
@@ -1108,7 +1117,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,
@@ -1144,7 +1153,7 @@ 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,
@@ -1160,17 +1169,17 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
             enableForwardStability,
         };
     }
-    async provideInlineEdits(resource, range, context, token) {
-        if (!this._provider.provideInlineEdits) {
+    async provideInlineEditsForRange(resource, range, context, token) {
+        if (!this._provider.provideInlineEditsForRange) {
             return undefined;
         }
         checkProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
         const doc = this._documents.getDocument(resource);
-        const r = Range$1.to(range);
-        const result = await this._provider.provideInlineEdits(doc, r, {
+        const r = Range.to(range);
+        const result = await this._provider.provideInlineEditsForRange(doc, r, {
             selectedCompletionInfo: context.selectedSuggestionInfo
                 ? {
-                    range: Range$1.to(context.selectedSuggestionInfo.range),
+                    range: Range.to(context.selectedSuggestionInfo.range),
                     text: context.selectedSuggestionInfo.text
                 }
                 : undefined,
@@ -1207,7 +1216,7 @@ 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,
@@ -1281,7 +1290,7 @@ class InlineEditAdapter {
         const langResult = {
             pid,
             text: result.text,
-            range: Range$1.from(result.range),
+            range: Range.from(result.range),
             accepted: acceptCommand,
             rejected: rejectCommand,
         };
@@ -1370,7 +1379,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)}`);
@@ -1535,14 +1544,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)) {
@@ -1645,7 +1654,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))))
                 };
             }))
         );
@@ -1663,7 +1672,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))))
                 };
             }))
         );
@@ -1776,7 +1785,7 @@ class DocumentDropEditAdapter {
              (editsArray.map((edit, i) => ({
                 _cacheId: [cacheId, i],
                 title: edit.title ?? ( localize(
-                    4550,
+                    4577,
                     "Drop using '{0}' extension",
                     this._extension.displayName || this._extension.name
                 )),
@@ -1809,16 +1818,30 @@ class MappedEditsAdapter {
     async provideMappedEdits(resource, codeBlocks, context, token) {
         const uri = URI.revive(resource);
         const doc = this._documents.getDocument(uri);
-        const usedContext = ( (context.documents.map((docSubArray) => ( (docSubArray.map((r) => {
-            return {
-                uri: URI.revive(r.uri),
-                version: r.version,
-                ranges: ( (r.ranges.map((range) => Range$1.to(range)))),
-            };
-        }))))));
+        const reviveContextItem = (item) => ({
+            uri: URI.revive(item.uri),
+            version: item.version,
+            ranges: ( (item.ranges.map(r => Range.to(r)))),
+        });
+        const usedContext = ( (context.documents.map(docSubArray => ( (docSubArray.map(reviveContextItem))))));
         const ctx = {
             documents: usedContext,
-            selections: usedContext[0]?.[0]?.ranges ?? []
+            selections: usedContext[0]?.[0]?.ranges ?? [],
+            conversation: context.conversation?.map(c => {
+                if (c.type === 'response') {
+                    return {
+                        type: 'response',
+                        message: c.message,
+                        references: c.references?.map(reviveContextItem)
+                    };
+                }
+                else {
+                    return {
+                        type: 'request',
+                        message: c.message,
+                    };
+                }
+            })
         };
         const mappedEdits = await this._provider.provideMappedEdits(doc, codeBlocks, ctx, token);
         return mappedEdits ? WorkspaceEdit.from(mappedEdits) : null;
@@ -2002,7 +2025,7 @@ class ExtHostLanguageFeatures {
         return this._createDisposable(handle);
     }
     registerMultiDocumentHighlightProvider(extension, selector, provider) {
-        const handle = this._addNewAdapter(( (new MultiDocumentHighlightAdapter(this._documents, provider))), extension);
+        const handle = this._addNewAdapter(( (new MultiDocumentHighlightAdapter(this._documents, provider, this._logService))), extension);
         this._proxy.$registerMultiDocumentHighlightProvider(handle, this._transformDocumentSelector(selector, extension));
         return this._createDisposable(handle);
     }
@@ -2185,8 +2208,8 @@ 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);
+    $provideInlineEditsForRange(handle, resource, range, context, token) {
+        return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineEditsForRange(URI.revive(resource), range, context, token), undefined, token);
     }
     $handleInlineCompletionDidShow(handle, pid, idx, updatedInsertText) {
         this._withAdapter(handle, InlineCompletionAdapterBase, async (adapter) => {

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

@@ -5,7 +5,7 @@ import { toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { MainContext } from './extHost.protocol.js';
-import { LanguageModelToolResult, LanguageModelToolDescription } from './extHostTypeConverters.js';
+import { LanguageModelToolDescription, MarkdownString } from './extHostTypeConverters.js';
 class ExtHostLanguageModelTools {
     constructor(mainContext) {
         this._registeredTools = ( new Map());
@@ -26,6 +26,11 @@ class ExtHostLanguageModelTools {
         return await fn(input, token);
     }
     async invokeTool(toolId, options, token) {
+        if (!options.requestedContentTypes?.length) {
+            throw ( new Error(
+                'LanguageModelToolInvocationOptions.requestedContentTypes is required to be set'
+            ));
+        }
         const callId = generateUuid();
         if (options.tokenOptions) {
             this._tokenCountFuncs.set(callId, options.tokenOptions.countTokens);
@@ -36,8 +41,10 @@ class ExtHostLanguageModelTools {
                 callId,
                 parameters: options.parameters,
                 tokenBudget: options.tokenOptions?.tokenBudget,
+                context: options.toolInvocationToken,
+                requestedContentTypes: options.requestedContentTypes,
             }, token);
-            return LanguageModelToolResult.to(result);
+            return result;
         }
         finally {
             this._tokenCountFuncs.delete(callId);
@@ -58,7 +65,7 @@ class ExtHostLanguageModelTools {
         if (!item) {
             throw ( new Error(`Unknown tool ${dto.toolId}`));
         }
-        const options = { parameters: dto.parameters };
+        const options = { parameters: dto.parameters, toolInvocationToken: dto.context, requestedContentTypes: dto.requestedContentTypes };
         if (dto.tokenBudget !== undefined) {
             options.tokenOptions = {
                 tokenBudget: dto.tokenBudget,
@@ -74,15 +81,45 @@ class ExtHostLanguageModelTools {
             if (value instanceof Promise) {
                 throw ( new Error(`Tool result for '${key}' cannot be a Promise`));
             }
+            else if (!options.requestedContentTypes.includes(key) && key !== 'toString') {
+                throw ( new Error(`Tool result for '${key}' was not requested from ${dto.toolId}.`));
+            }
+        }
+        return extensionResult;
+    }
+    async $provideToolConfirmationMessages(toolId, participantName, parameters, token) {
+        const item = this._registeredTools.get(toolId);
+        if (!item) {
+            throw ( new Error(`Unknown tool ${toolId}`));
+        }
+        if (!item.tool.provideToolConfirmationMessages) {
+            return undefined;
+        }
+        const result = await item.tool.provideToolConfirmationMessages({ participantName, parameters }, token);
+        if (!result) {
+            return undefined;
+        }
+        return {
+            title: result.title,
+            message: typeof result.message === 'string' ? result.message : MarkdownString.from(result.message),
+        };
+    }
+    async $provideToolInvocationMessage(toolId, parameters, token) {
+        const item = this._registeredTools.get(toolId);
+        if (!item) {
+            throw ( new Error(`Unknown tool ${toolId}`));
+        }
+        if (!item.tool.provideToolInvocationMessage) {
+            return undefined;
         }
-        return LanguageModelToolResult.from(extensionResult);
+        return await item.tool.provideToolInvocationMessage(parameters, token);
     }
-    registerTool(extension, name, tool) {
-        this._registeredTools.set(name, { extension, tool });
-        this._proxy.$registerTool(name);
+    registerTool(extension, id, tool) {
+        this._registeredTools.set(id, { extension, tool });
+        this._proxy.$registerTool(id);
         return toDisposable(() => {
-            this._registeredTools.delete(name);
-            this._proxy.$unregisterTool(name);
+            this._registeredTools.delete(id);
+            this._proxy.$unregisterTool(id);
         });
     }
 }