@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -54,6 +54,9 @@ class ExtHostDocumentData extends MirrorTextModel {
                 validateRange(ran) { return that._validateRange(ran); },
                 validatePosition(pos) { return that._validatePosition(pos); },
                 getWordRangeAtPosition(pos, regexp) { return that._getWordRangeAtPosition(pos, regexp); },
+                [Symbol.for('debug.description')]() {
+                    return `TextDocument(${( that._uri.toString())})`;
+                }
             };
         }
         return ( Object.freeze(this._document));

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

@@ -19,6 +19,7 @@ class ExtHostEmbeddings {
         this._proxy.$registerEmbeddingProvider(handle, embeddingsModel);
         this._provider.set(handle, { id: embeddingsModel, provider });
         return toDisposable(() => {
+            this._allKnownModels.delete(embeddingsModel);
             this._proxy.$unregisterEmbeddingProvider(handle);
             this._provider.delete(handle);
         });

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { isCancellationError } from '../../../base/common/errors.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 import { ExtensionDescriptionRegistry } from '../../services/extensions/common/extensionDescriptionRegistry.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
 import { MissingExtensionDependency } from '../../services/extensions/common/extensions.js';
@@ -58,28 +59,28 @@ class ExtensionActivationTimesBuilder {
     }
 }
 class ActivatedExtension {
-    constructor(activationFailed, activationFailedError, activationTimes, module, exports, subscriptions) {
+    constructor(activationFailed, activationFailedError, activationTimes, module, exports, disposable) {
         this.activationFailed = activationFailed;
         this.activationFailedError = activationFailedError;
         this.activationTimes = activationTimes;
         this.module = module;
         this.exports = exports;
-        this.subscriptions = subscriptions;
+        this.disposable = disposable;
     }
 }
 class EmptyExtension extends ActivatedExtension {
     constructor(activationTimes) {
-        super(false, null, activationTimes, { activate: undefined, deactivate: undefined }, undefined, []);
+        super(false, null, activationTimes, { activate: undefined, deactivate: undefined }, undefined, Disposable.None);
     }
 }
 class HostExtension extends ActivatedExtension {
     constructor() {
-        super(false, null, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, []);
+        super(false, null, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, Disposable.None);
     }
 }
 class FailedExtension extends ActivatedExtension {
     constructor(activationError) {
-        super(true, activationError, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, []);
+        super(true, activationError, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, Disposable.None);
     }
 }
 let ExtensionsActivator = class ExtensionsActivator {

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

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { join, normalize } from '../../../base/common/path.js';
 import { mark, getMarks } from '../../../base/common/performance.js';
 import { joinPath, originalFSPath, extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
 import { Barrier, timeout, asPromise, IntervalTimer } from '../../../base/common/async.js';
-import { Disposable, dispose, toDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, toDisposable, dispose, DisposableStore } from '../../../base/common/lifecycle.js';
 import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
 import { URI } from '../../../base/common/uri.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
@@ -39,7 +39,6 @@ import { StopWatch } from '../../../base/common/stopwatch.js';
 import { isCI, isWebWorker, setTimeout0 } from '../../../base/common/platform.js';
 import { IExtHostManagedSockets } from './extHostManagedSockets.js';
 var AbstractExtHostExtensionService_1;
-const _moduleId = "vs/workbench/api/common/extHostExtensionService";
 const IHostUtils = ( createDecorator('IHostUtils'));
 let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class AbstractExtHostExtensionService extends Disposable {
     constructor(instaService, hostUtils, extHostContext, extHostWorkspace, extHostConfiguration, logService, initData, storagePath, extHostTunnelService, extHostTerminalService, extHostLocalizationService, _extHostManagedSockets, _extHostLanguageModels) {
@@ -80,7 +79,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         this._storage = ( new ExtHostStorage(this._extHostContext, this._logService));
         this._secretState = ( new ExtHostSecretState(this._extHostContext));
         this._storagePath = storagePath;
-        this._instaService = instaService.createChild(( new ServiceCollection([IExtHostStorage, this._storage], [IExtHostSecretState, this._secretState])));
+        this._instaService = this._store.add(instaService.createChild(( new ServiceCollection([IExtHostStorage, this._storage], [IExtHostSecretState, this._secretState]))));
         this._activator = this._register(( new ExtensionsActivator(this._myRegistry, this._globalRegistry, {
             onExtensionActivationError: (extensionId, error, missingExtensionDependency) => {
                 this._mainThreadExtensionsProxy.$onExtensionActivationError(extensionId, transformErrorForSerialization(error), missingExtensionDependency);
@@ -261,10 +260,10 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             this._logService.error(err);
         }
         try {
-            dispose(extension.subscriptions);
+            extension.disposable.dispose();
         }
         catch (err) {
-            this._logService.error(`An error occurred when deactivating the subscriptions for extension '${extensionId.value}':`);
+            this._logService.error(`An error occurred when disposing the subscriptions for extension '${extensionId.value}':`);
             this._logService.error(err);
         }
         return result;
@@ -303,23 +302,24 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         }
         this._logService.info(`ExtensionService#_doActivateExtension ${extensionDescription.identifier.value}, startup: ${reason.startup}, activationEvent: '${reason.activationEvent}'${extensionDescription.identifier.value !== reason.extensionId.value ? `, root cause: ${reason.extensionId.value}` : ``}`);
         this._logService.flush();
+        const extensionInternalStore = ( new DisposableStore());
         const activationTimesBuilder = ( new ExtensionActivationTimesBuilder(reason.startup));
         return Promise.all([
             this._loadCommonJSModule(extensionDescription, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
-            this._loadExtensionContext(extensionDescription)
+            this._loadExtensionContext(extensionDescription, extensionInternalStore)
         ]).then(values => {
             mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
-            return AbstractExtHostExtensionService_1._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
+            return AbstractExtHostExtensionService_1._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], extensionInternalStore, activationTimesBuilder);
         }).then((activatedExtension) => {
             mark(`code/extHost/didActivateExtension/${extensionDescription.identifier.value}`);
             return activatedExtension;
         });
     }
-    _loadExtensionContext(extensionDescription) {
+    _loadExtensionContext(extensionDescription, extensionInternalStore) {
         const lanuageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
-        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 globalState = extensionInternalStore.add(( new ExtensionGlobalMemento(extensionDescription, this._storage)));
+        const workspaceState = extensionInternalStore.add(( new ExtensionMemento(extensionDescription.identifier.value, false, this._storage)));
+        const secrets = extensionInternalStore.add(( new ExtensionSecrets(extensionDescription, this._secretState)));
         const extensionMode = extensionDescription.isUnderDevelopment
             ? (this._initData.environment.extensionTestsLocationURI ? ExtensionMode.Test : ExtensionMode.Development)
             : ExtensionMode.Production;
@@ -386,7 +386,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             }));
         });
     }
-    static _callActivate(logService, extensionId, extensionModule, context, activationTimesBuilder) {
+    static _callActivate(logService, extensionId, extensionModule, context, extensionInternalStore, activationTimesBuilder) {
         extensionModule = extensionModule || {
             activate: undefined,
             deactivate: undefined
@@ -398,7 +398,10 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
                 activationTimesBuilder.build(),
                 extensionModule,
                 extensionExports,
-                context.subscriptions
+                toDisposable(() => {
+                    extensionInternalStore.dispose();
+                    dispose(context.subscriptions);
+                })
             ));
         });
     }
@@ -533,12 +536,11 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(localizeWithPath(_moduleId, 0, "Cannot load test runner.")));
+            throw ( new Error(localize(0, "Cannot load test runner.")));
         }
         const testRunner = await this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false)));
         if (!testRunner || typeof testRunner.run !== 'function') {
-            throw ( new Error(localizeWithPath(
-                _moduleId,
+            throw ( new Error(localize(
                 1,
                 "Path {0} does not point to a valid extension test runner.",
                 ( extensionTestsLocationURI.toString())

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

@@ -1,4 +1,4 @@
-import { isFalsyOrEmpty, coalesce, isNonEmptyArray, asArray } from '../../../base/common/arrays.js';
+import { isFalsyOrEmpty, isNonEmptyArray, coalesce, 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,18 +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$1 } from '../../../editor/common/core/range.js';
+import { Range as Range$2 } 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 { localize } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/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 { 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, 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";
 class DocumentSymbolAdapter {
     constructor(_documents, _provider) {
         this._documents = _documents;
@@ -58,8 +57,8 @@ class DocumentSymbolAdapter {
                 tags: info.tags?.map(SymbolTag.from) || [],
                 detail: '',
                 containerName: info.containerName,
-                range: Range.from(info.location.range),
-                selectionRange: Range.from(info.location.range),
+                range: Range$1.from(info.location.range),
+                selectionRange: Range$1.from(info.location.range),
                 children: []
             };
             while (true) {
@@ -69,7 +68,7 @@ class DocumentSymbolAdapter {
                     break;
                 }
                 const parent = parentStack[parentStack.length - 1];
-                if (Range$1.containsRange(parent.range, element.range) && !Range$1.equalsRange(parent.range, element.range)) {
+                if (Range$2.containsRange(parent.range, element.range) && !Range$2.equalsRange(parent.range, element.range)) {
                     parent.children?.push(element);
                     parentStack.push(element);
                     break;
@@ -107,7 +106,7 @@ class CodeLensAdapter {
         for (let i = 0; i < lenses.length; i++) {
             result.lenses.push({
                 cacheId: [cacheId, i],
-                range: Range.from(lenses[i].range),
+                range: Range$1.from(lenses[i].range),
                 command: this._commands.toInternal(lenses[i].command, disposables)
             });
         }
@@ -242,7 +241,7 @@ class HoverAdapter {
             value.range = doc.getWordRangeAtPosition(pos);
         }
         if (!value.range) {
-            value.range = ( (new Range$2(pos, pos)));
+            value.range = ( (new Range(pos, pos)));
         }
         const convertedHover = Hover.from(value);
         const id = this._hoverCounter;
@@ -284,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.to(viewPort), InlineValueContext.to(context), token);
+        const value = await this._provider.provideInlineValues(doc, Range$1.to(viewPort), InlineValueContext.to(context), token);
         if (Array.isArray(value)) {
             return (
                  (value.map(iv => InlineValue.from(iv)))
@@ -339,7 +338,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.from)))),
+                ranges: coalesce(( (value.ranges.map(Range$1.from)))),
                 wordPattern: value.wordPattern
             };
         }
@@ -380,7 +379,7 @@ class CodeActionAdapter {
         const doc = this._documents.getDocument(resource);
         const ran = Selection.isISelection(rangeOrSelection)
             ? Selection$1.to(rangeOrSelection)
-            : Range.to(rangeOrSelection);
+            : Range$1.to(rangeOrSelection);
         const allDiagnostics = [];
         for (const diagnostic of this._diagnostics.getDiagnostics(resource)) {
             if (ran.intersection(diagnostic.range)) {
@@ -435,7 +434,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.from)))) : undefined,
+                    ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( (range.map(Range$1.from)))) : undefined,
                     disabled: candidate.disabled?.reason
                 });
             }
@@ -488,7 +487,7 @@ class DocumentPasteEditProvider {
             return;
         }
         const doc = this._documents.getDocument(resource);
-        const vscodeRanges = ( (ranges.map(range => Range.to(range))));
+        const vscodeRanges = ( (ranges.map(range => Range$1.to(range))));
         const dataTransfer = DataTransfer.toDataTransfer(dataTransferDto, () => {
             throw ( (new NotImplementedError()));
         });
@@ -504,7 +503,7 @@ class DocumentPasteEditProvider {
             return [];
         }
         const doc = this._documents.getDocument(resource);
-        const vscodeRanges = ( (ranges.map(range => Range.to(range))));
+        const vscodeRanges = ( (ranges.map(range => Range$1.to(range))));
         const dataTransfer = DataTransfer.toDataTransfer(dataTransferDto, async (id) => {
             return (await this._proxy.$resolvePasteFileData(this._handle, requestId, id)).buffer;
         });
@@ -519,9 +518,8 @@ class DocumentPasteEditProvider {
         return (
              (edits.map((edit, i) => ({
                 _cacheId: [cacheId, i],
-                title: edit.title ?? ( localizeWithPath(
-                    _moduleId,
-                    0,
+                title: edit.title ?? ( localize(
+                    4076,
                     "Paste using '{0}' extension",
                     this._extension.displayName || this._extension.name
                 )),
@@ -569,7 +567,7 @@ class RangeFormattingAdapter {
     }
     async provideDocumentRangeFormattingEdits(resource, range, options, token) {
         const document = this._documents.getDocument(resource);
-        const ran = Range.to(range);
+        const ran = Range$1.to(range);
         const value = await this._provider.provideDocumentRangeFormattingEdits(document, ran, options, token);
         if (Array.isArray(value)) {
             return (
@@ -581,7 +579,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.to)));
+        const _ranges = ( (ranges.map(Range$1.to)));
         const value = await this._provider.provideDocumentRangesFormattingEdits(document, _ranges, options, token);
         if (Array.isArray(value)) {
             return (
@@ -695,7 +693,7 @@ class RenameAdapter {
             const rangeOrLocation = await this._provider.prepareRename(doc, pos, token);
             let range;
             let text;
-            if (Range$2.isRange(rangeOrLocation)) {
+            if (Range.isRange(rangeOrLocation)) {
                 range = rangeOrLocation;
                 text = doc.getText(rangeOrLocation);
             }
@@ -710,7 +708,7 @@ class RenameAdapter {
                 this._logService.warn('INVALID rename location: position line must be within range start/end lines');
                 return undefined;
             }
-            return { range: Range.from(range), text };
+            return { range: Range$1.from(range), text };
         }
         catch (err) {
             const rejectReason = RenameAdapter._asMessage(err);
@@ -749,7 +747,7 @@ class NewSymbolNamesAdapter {
     }
     async provideNewSymbolNames(resource, range, triggerKind, token) {
         const doc = this._documents.getDocument(resource);
-        const pos = Range.to(range);
+        const pos = Range$1.to(range);
         try {
             const kind = NewSymbolNamesAdapter.languageTriggerKindToVSCodeTriggerKind[triggerKind];
             const value = await this._provider.provideNewSymbolNames(doc, pos, kind, token);
@@ -922,7 +920,7 @@ class DocumentRangeSemanticTokensAdapter {
     }
     async provideDocumentRangeSemanticTokens(resource, range, token) {
         const doc = this._documents.getDocument(resource);
-        const value = await this._provider.provideDocumentRangeSemanticTokens(doc, Range.to(range), token);
+        const value = await this._provider.provideDocumentRangeSemanticTokens(doc, Range$1.to(range), token);
         if (!value) {
             return null;
         }
@@ -952,7 +950,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$2(pos, pos)));
+        const replaceRange = doc.getWordRangeAtPosition(pos) || ( (new Range(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 +968,7 @@ class CompletionsAdapter {
         const result = {
             x: pid,
             [ISuggestResultDtoField.completions]: completions,
-            [ISuggestResultDtoField.defaultRanges]: { replace: Range.from(replaceRange), insert: Range.from(insertRange) },
+            [ISuggestResultDtoField.defaultRanges]: { replace: Range$1.from(replaceRange), insert: Range$1.from(insertRange) },
             [ISuggestResultDtoField.isIncomplete]: list.isIncomplete || undefined,
             [ISuggestResultDtoField.duration]: sw.elapsed()
         };
@@ -1062,13 +1060,13 @@ class CompletionsAdapter {
         else if (item.range) {
             range = item.range;
         }
-        if (Range$2.isRange(range)) {
-            result[ISuggestDataDtoField.range] = Range.from(range);
+        if (Range.isRange(range)) {
+            result[ISuggestDataDtoField.range] = Range$1.from(range);
         }
         else if (range && (!defaultInsertRange?.isEqual(range.inserting) || !defaultReplaceRange?.isEqual(range.replacing))) {
             result[ISuggestDataDtoField.range] = {
-                insert: Range.from(range.inserting),
-                replace: Range.from(range.replacing)
+                insert: Range$1.from(range.inserting),
+                replace: Range$1.from(range.replacing)
             };
         }
         return result;
@@ -1110,7 +1108,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
         const result = await this._provider.provideInlineCompletionItems(doc, pos, {
             selectedCompletionInfo: context.selectedSuggestionInfo
                 ? {
-                    range: Range.to(context.selectedSuggestionInfo.range),
+                    range: Range$1.to(context.selectedSuggestionInfo.range),
                     text: context.selectedSuggestionInfo.text
                 }
                 : undefined,
@@ -1146,7 +1144,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
                 return ({
                     insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
                     filterText: item.filterText,
-                    range: item.range ? Range.from(item.range) : undefined,
+                    range: item.range ? Range$1.from(item.range) : undefined,
                     command,
                     idx: idx,
                     completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
@@ -1168,11 +1166,11 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
         }
         checkProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
         const doc = this._documents.getDocument(resource);
-        const r = Range.to(range);
+        const r = Range$1.to(range);
         const result = await this._provider.provideInlineEdits(doc, r, {
             selectedCompletionInfo: context.selectedSuggestionInfo
                 ? {
-                    range: Range.to(context.selectedSuggestionInfo.range),
+                    range: Range$1.to(context.selectedSuggestionInfo.range),
                     text: context.selectedSuggestionInfo.text
                 }
                 : undefined,
@@ -1209,7 +1207,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
                 return ({
                     insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
                     filterText: item.filterText,
-                    range: item.range ? Range.from(item.range) : undefined,
+                    range: item.range ? Range$1.from(item.range) : undefined,
                     command,
                     idx: idx,
                     completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
@@ -1283,7 +1281,7 @@ class InlineEditAdapter {
         const langResult = {
             pid,
             text: result.text,
-            range: Range.from(result.range),
+            range: Range$1.from(result.range),
             accepted: acceptCommand,
             rejected: rejectCommand,
         };
@@ -1372,7 +1370,7 @@ class InlayHintsAdapter {
     }
     async provideInlayHints(resource, ran, token) {
         const doc = this._documents.getDocument(resource);
-        const range = Range.to(ran);
+        const range = Range$1.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)}`);
@@ -1537,14 +1535,14 @@ class ColorProviderAdapter {
         const colorInfos = ( (colors.map(ci => {
             return {
                 color: Color.from(ci.color),
-                range: Range.from(ci.range)
+                range: Range$1.from(ci.range)
             };
         })));
         return colorInfos;
     }
     async provideColorPresentations(resource, raw, token) {
         const document = this._documents.getDocument(resource);
-        const range = Range.to(raw.range);
+        const range = Range$1.to(raw.range);
         const color = Color.to(raw.color);
         const value = await this._provider.provideColorPresentations(color, { document, range }, token);
         if (!Array.isArray(value)) {
@@ -1647,7 +1645,7 @@ class CallHierarchyAdapter {
              (calls.map(call => {
                 return {
                     from: this._cacheAndConvertItem(sessionId, call.from),
-                    fromRanges: ( (call.fromRanges.map(r => Range.from(r))))
+                    fromRanges: ( (call.fromRanges.map(r => Range$1.from(r))))
                 };
             }))
         );
@@ -1665,7 +1663,7 @@ class CallHierarchyAdapter {
              (calls.map(call => {
                 return {
                     to: this._cacheAndConvertItem(sessionId, call.to),
-                    fromRanges: ( (call.fromRanges.map(r => Range.from(r))))
+                    fromRanges: ( (call.fromRanges.map(r => Range$1.from(r))))
                 };
             }))
         );
@@ -1777,9 +1775,8 @@ class DocumentDropEditAdapter {
         return (
              (editsArray.map((edit, i) => ({
                 _cacheId: [cacheId, i],
-                title: edit.title ?? ( localizeWithPath(
-                    _moduleId,
-                    1,
+                title: edit.title ?? ( localize(
+                    4077,
                     "Drop using '{0}' extension",
                     this._extension.displayName || this._extension.name
                 )),
@@ -1816,7 +1813,7 @@ class MappedEditsAdapter {
             return {
                 uri: URI.revive(r.uri),
                 version: r.version,
-                ranges: ( (r.ranges.map((range) => Range.to(range)))),
+                ranges: ( (r.ranges.map((range) => Range$1.to(range)))),
             };
         }))))));
         const ctx = {
@@ -2364,7 +2361,7 @@ class ExtHostLanguageFeatures {
     }
     registerMappedEditsProvider(extension, selector, provider) {
         const handle = this._addNewAdapter(( (new MappedEditsAdapter(this._documents, provider))), extension);
-        this._proxy.$registerMappedEditsProvider(handle, this._transformDocumentSelector(selector, extension));
+        this._proxy.$registerMappedEditsProvider(handle, this._transformDocumentSelector(selector, extension), extension.displayName ?? extension.name);
         return this._createDisposable(handle);
     }
     $provideMappedEdits(handle, document, codeBlocks, context, token) {

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

@@ -1,4 +1,5 @@
 import { toDisposable } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
 import { MainContext } from './extHost.protocol.js';
 import { LanguageModelToolDescription } from './extHostTypeConverters.js';
 class ExtHostLanguageModelTools {
@@ -8,7 +9,7 @@ class ExtHostLanguageModelTools {
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadLanguageModelTools));
         this._proxy.$getTools().then(tools => {
             for (const tool of tools) {
-                this._allTools.set(tool.name, tool);
+                this._allTools.set(tool.name, revive(tool));
             }
         });
     }

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

@@ -6,7 +6,7 @@ import { transformErrorForSerialization, CancellationError, transformErrorFromSe
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { ExtensionIdentifierMap, ExtensionIdentifier, ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
@@ -19,7 +19,6 @@ import { LanguageModelError, LanguageModelChatMessageRole, LanguageModelFunction
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var ExtHostLanguageModels_1;
-const _moduleId = "vs/workbench/api/common/extHostLanguageModels";
 const IExtHostLanguageModels = ( (createDecorator('IExtHostLanguageModels')));
 class LanguageModelResponseStream {
     constructor(option, stream) {
@@ -330,7 +329,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localizeWithPath(_moduleId, 0, "Justification: {1}", to.displayName, justification))
+                ? ( localize(573, "Justification: {1}", to.displayName, justification))
                 : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);

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

@@ -1,13 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { ILoggerService } from '../../../platform/log/common/log.service.js';
 import { LogService } from '../../../platform/log/common/logService.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
-const _moduleId = "vs/workbench/api/common/extHostLogService";
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? 'remoteexthost' : isWorker ? 'workerexthost' : 'exthost';
-        const name = initData.remote.isRemote ? ( localizeWithPath(_moduleId, 0, "Extension Host (Remote)")) : isWorker ? ( localizeWithPath(_moduleId, 1, "Extension Host (Worker)")) : ( localizeWithPath(_moduleId, 2, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(574, "Extension Host (Remote)")) : isWorker ? ( localize(575, "Extension Host (Worker)")) : ( localize(576, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { Emitter } from '../../../base/common/event.js';
 import { toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
@@ -22,7 +22,6 @@ import { QueryType } from '../../services/search/common/search.js';
 import { CellSearchModel } from '../../contrib/search/common/cellSearchModel.js';
 import { genericCellMatchesToTextSearchMatches } from '../../contrib/search/common/searchNotebookHelpers.js';
 import { RegisteredEditorPriority, globMatchesResource } from '../../services/editor/common/editorResolverService.js';
-const _moduleId = "vs/workbench/api/common/extHostNotebook";
 class ExtHostNotebookController {
     static { this._notebookStatusBarItemProviderHandlePool = 0; }
     get activeNotebookEditor() {
@@ -255,12 +254,7 @@ class ExtHostNotebookController {
             throw ( new Error('Document version mismatch'));
         }
         if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-            throw new FileOperationError(localizeWithPath(
-                _moduleId,
-                0,
-                "Unable to modify read-only file '{0}'",
-                this._resourceForError(uri)
-            ), FileOperationResult.FILE_PERMISSION_DENIED);
+            throw new FileOperationError(localize(4078, "Unable to modify read-only file '{0}'", this._resourceForError(uri)), FileOperationResult.FILE_PERMISSION_DENIED);
         }
         const data = {
             metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
@@ -432,7 +426,7 @@ class ExtHostNotebookController {
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
-            throw new FileOperationError(localizeWithPath(_moduleId, 1, "File Modified Since"), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(localize(4079, "File Modified Since"), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

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

@@ -160,6 +160,9 @@ class ExtHostNotebookDocument {
                 },
                 save() {
                     return that._save();
+                },
+                [Symbol.for('debug.description')]() {
+                    return `NotebookDocument(${( this.uri.toString())})`;
                 }
             };
             this._notebook = ( Object.freeze(apiObject));

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

@@ -46,6 +46,9 @@ class ExtHostNotebookEditor {
                 get viewColumn() {
                     return that._viewColumn;
                 },
+                [Symbol.for('debug.description')]() {
+                    return `NotebookEditor(${( this.notebook.uri.toString())})`;
+                }
             };
             ExtHostNotebookEditor.apiEditorsToExtHost.set(this._editor, this);
         }