@codingame/monaco-vscode-extensions-service-override 5.2.0 → 6.0.0

package/extensions.js

@@ -45,6 +45,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadEmbeddings.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadClipboard.js';
@@ -61,12 +62,12 @@ import './vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js';
 import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/editor/common/config/editorOptions';
+import 'vscode/vscode/vs/editor/common/core/selection';
+import 'vscode/vscode/vs/editor/common/editorCommon';
 import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/strings';
-import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/editor/contrib/editorState/browser/keybindingCancellation';
+import 'vscode/vscode/vs/editor/contrib/editorState/browser/editorState';
 import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
 import './vscode/src/vs/workbench/api/browser/mainThreadEditors.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js';
@@ -109,7 +110,6 @@ import './vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEdit
 import './vscode/src/vs/workbench/api/browser/mainThreadNotebookRenderers.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadInteractive.js';
-import './vscode/src/vs/workbench/api/browser/mainThreadInlineChat.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadTask.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLabelService.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0",
-    "@codingame/monaco-vscode-files-service-override": "5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0",
+    "@codingame/monaco-vscode-files-service-override": "6.0.0"
   }
 }

package/vscode/src/vs/base/common/console.js

@@ -1,3 +1,5 @@
+import 'vscode/vscode/vs/base/common/charCode';
+import 'vscode/vscode/vs/base/common/marshallingIds';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/base/common/platform';
 

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

@@ -6,10 +6,10 @@ import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { InstallOperation, EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { ExtensionType, EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
 const _moduleId = "vs/platform/extensionManagement/common/extensionManagementCLI";
 const notFound = (id) => ( localizeWithPath(_moduleId, 0, "Extension '{0}' not found.", id));
@@ -29,7 +29,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         return undefined;
     }
     async listExtensions(showVersions, category, profileLocation) {
-        let extensions = await this.extensionManagementService.getInstalled(1 , profileLocation);
+        let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User, profileLocation);
         const categories = ( (EXTENSION_CATEGORIES.map(c => c.toLowerCase())));
         if (category && category !== '') {
             if (categories.indexOf(category.toLowerCase()) < 0) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         }
     }
     async updateExtensions(profileLocation) {
-        const installedExtensions = await this.extensionManagementService.getInstalled(1 , profileLocation);
+        const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User, profileLocation);
         const installedExtensionsQuery = [];
         for (const extension of installedExtensions) {
             if (!!extension.identifier.uuid) {
@@ -145,7 +145,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 if (areSameExtensions(oldVersion.identifier, newVersion.identifier) && semverExports.gt(newVersion.version, oldVersion.manifest.version)) {
                     extensionsToUpdate.push({
                         extension: newVersion,
-                        options: { operation: 3 , installPreReleaseVersion: oldVersion.preRelease, profileLocation }
+                        options: { operation: InstallOperation.Update, installPreReleaseVersion: oldVersion.preRelease, profileLocation }
                     });
                 }
             }
@@ -364,7 +364,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (!extensionsToUninstall.length) {
                 throw ( (new Error(`${this.notInstalled(id)}\n${useId}`)));
             }
-            if (( (extensionsToUninstall.some(e => e.type === 0 )))) {
+            if (( (extensionsToUninstall.some(e => e.type === ExtensionType.System)))) {
                 this.logger.info(( localizeWithPath(
                     _moduleId,
                     24,

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -2,11 +2,13 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { INTERNAL_AUTH_PROVIDER_PREFIX } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { ActivationKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -75,7 +77,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async $ensureProvider(id) {
         if (!this.authenticationService.isAuthenticationProviderRegistered(id)) {
-            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), 1 );
+            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate);
         }
     }
     $sendDidChangeSessions(providerId, event) {
@@ -87,25 +89,37 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     $removeSession(providerId, sessionId) {
         return this.authenticationService.removeSession(providerId, sessionId);
     }
-    async loginPrompt(providerName, extensionName, recreatingSession, options) {
-        const message = recreatingSession
-            ? ( localizeWithPath(
-            _moduleId,
-            1,
-            "The extension '{0}' wants you to sign in again using {1}.",
-            extensionName,
-            providerName
-        ))
-            : ( localizeWithPath(
-            _moduleId,
-            2,
-            "The extension '{0}' wants to sign in using {1}.",
-            extensionName,
-            providerName
-        ));
+    async loginPrompt(provider, extensionName, recreatingSession, options) {
+        let message;
+        if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
+            message = ( localizeWithPath(
+                _moduleId,
+                1,
+                "The extension '{0}' wants to access the language models provided by {1}.",
+                extensionName,
+                provider.label
+            ));
+        }
+        else {
+            message = recreatingSession
+                ? ( localizeWithPath(
+                _moduleId,
+                2,
+                "The extension '{0}' wants you to sign in again using {1}.",
+                extensionName,
+                provider.label
+            ))
+                : ( localizeWithPath(
+                _moduleId,
+                3,
+                "The extension '{0}' wants to sign in using {1}.",
+                extensionName,
+                provider.label
+            ));
+        }
         const buttons = [
             {
-                label: ( localizeWithPath(_moduleId, 3, "&&Allow")),
+                label: ( localizeWithPath(_moduleId, 4, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -113,9 +127,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localizeWithPath(_moduleId, 4, "Learn more")),
+                label: ( localizeWithPath(_moduleId, 5, "Learn more")),
                 run: async () => {
-                    const result = this.loginPrompt(providerName, extensionName, recreatingSession, options);
+                    const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
                     return await result;
                 }
@@ -173,7 +187,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 uiOptions = options.forceNewSession;
             }
             const recreatingSession = !!(options.forceNewSession && sessions.length);
-            const isAllowed = await this.loginPrompt(provider.label, extensionName, recreatingSession, uiOptions);
+            const isAllowed = await this.loginPrompt(provider, extensionName, recreatingSession, uiOptions);
             if (!isAllowed) {
                 throw ( (new Error('User did not consent to login.')));
             }

package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js

@@ -6,6 +6,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadBulkEdits = class MainThreadBulkEdits {
@@ -61,7 +62,7 @@ function reviveWorkspaceEditDto(data, uriIdentityService, resolveDataTransferFil
         if (ResourceNotebookCellEdit.is(edit)) {
             edit.resource = uriIdentityService.asCanonicalUri(edit.resource);
             const cellEdit = edit.cellEdit;
-            if (cellEdit.editType === 1 ) {
+            if (cellEdit.editType === CellEditType.Replace) {
                 edit.cellEdit = {
                     ...cellEdit,
                     cells: ( cellEdit.cells.map(cell => ({

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -1,10 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { getWordAtText } from 'vscode/vscode/vs/editor/common/core/wordHelper';
+import { CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -21,6 +25,29 @@ import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/cha
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
+class MainThreadChatTask {
+    get onDidAddProgress() { return this._onDidAddProgress.event; }
+    constructor(content) {
+        this.content = content;
+        this.kind = 'progressTask';
+        this.deferred = ( new DeferredPromise());
+        this._onDidAddProgress = ( new Emitter());
+        this.progress = [];
+    }
+    task() {
+        return this.deferred.p;
+    }
+    isSettled() {
+        return this.deferred.isSettled;
+    }
+    complete(v) {
+        this.deferred.complete(v);
+    }
+    add(progress) {
+        this.progress.push(progress);
+        this._onDidAddProgress.fire(progress);
+    }
+}
 let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     constructor(extHostContext, _chatAgentService, _chatService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService) {
         super();
@@ -33,7 +60,10 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._extensionService = _extensionService;
         this._agents = this._register(( new DisposableMap()));
         this._agentCompletionProviders = this._register(( new DisposableMap()));
+        this._agentIdsToCompletionProviders = this._register(( new DisposableMap()));
         this._pendingProgress = ( new Map());
+        this._responsePartHandlePool = 0;
+        this._activeTasks = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatAgents2));
         this._register(this._chatService.onDidDisposeSession(e => {
             this._proxy.$releaseSession(e.sessionId);
@@ -105,12 +135,13 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             const extensionDescription = this._extensionService.extensions.find(e => ExtensionIdentifier.equals(e.identifier, extension));
             disposable = this._chatAgentService.registerDynamicAgent({
                 id,
-                name: dynamicProps.name,
+                name: dynamicProps.name ?? '',
                 description: dynamicProps.description,
                 extensionId: extension,
                 extensionDisplayName: extensionDescription?.displayName ?? extension.value,
                 extensionPublisherId: extensionDescription?.publisher ?? '',
-                extensionPublisherDisplayName: extensionDescription?.publisherDisplayName,
+                publisherDisplayName: dynamicProps.publisherName,
+                fullName: dynamicProps.fullName,
                 metadata: revive(metadata),
                 slashCommands: [],
                 locations: [ChatAgentLocation.Panel]
@@ -134,11 +165,43 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         data.hasFollowups = metadataUpdate.hasFollowups;
         this._chatAgentService.updateAgent(data.id, revive(metadataUpdate));
     }
-    async $handleProgressChunk(requestId, progress) {
+    async $handleProgressChunk(requestId, progress, responsePartHandle) {
         const revivedProgress = revive(progress);
+        if (revivedProgress.kind === 'progressTask') {
+            const handle = ++this._responsePartHandlePool;
+            const responsePartId = `${requestId}_${handle}`;
+            const task = ( new MainThreadChatTask(revivedProgress.content));
+            this._activeTasks.set(responsePartId, task);
+            this._pendingProgress.get(requestId)?.(task);
+            return handle;
+        }
+        else if (responsePartHandle !== undefined) {
+            const responsePartId = `${requestId}_${responsePartHandle}`;
+            const task = this._activeTasks.get(responsePartId);
+            switch (revivedProgress.kind) {
+                case 'progressTaskResult':
+                    if (task && revivedProgress.content) {
+                        task.complete(revivedProgress.content.value);
+                        this._activeTasks.delete(responsePartId);
+                    }
+                    else {
+                        task?.complete(undefined);
+                    }
+                    return responsePartHandle;
+                case 'warning':
+                case 'reference':
+                    task?.add(revivedProgress);
+                    return;
+            }
+        }
         this._pendingProgress.get(requestId)?.(revivedProgress);
     }
-    $registerAgentCompletionsProvider(handle, triggerCharacters) {
+    $registerAgentCompletionsProvider(handle, id, triggerCharacters) {
+        const provide = async (query, token) => {
+            const completions = await this._proxy.$invokeCompletionProvider(handle, query, token);
+            return ( completions.map((c) => ({ ...c, icon: c.icon ? ThemeIcon.fromId(c.icon) : undefined })));
+        };
+        this._agentIdsToCompletionProviders.set(id, this._chatAgentService.registerAgentCompletionProvider(id, provide));
         this._agentCompletionProviders.set(handle, this._languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
             _debugDisplayName: 'chatAgentCompletions:' + handle,
             triggerCharacters,
@@ -163,7 +226,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 if (!range) {
                     return null;
                 }
-                const result = await this._proxy.$invokeCompletionProvider(handle, query, token);
+                const result = await provide(query, token);
                 const variableItems = ( result.map(v => {
                     const insertText = v.insertText ?? (typeof v.label === 'string' ? v.label : v.label.label);
                     const rangeAfterInsert = ( new Range(
@@ -176,10 +239,10 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                         label: v.label,
                         range,
                         insertText: insertText + ' ',
-                        kind: 18 ,
+                        kind: CompletionItemKind.Text,
                         detail: v.detail,
                         documentation: v.documentation,
-                        command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ widget, range: rangeAfterInsert, variableData: revive(v.values), command: v.command }] }
+                        command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] }
                     };
                 }));
                 return {
@@ -188,8 +251,9 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             }
         }));
     }
-    $unregisterAgentCompletionsProvider(handle) {
+    $unregisterAgentCompletionsProvider(handle, id) {
         this._agentCompletionProviders.deleteAndDispose(handle);
+        this._agentIdsToCompletionProviders.deleteAndDispose(id);
     }
 };
 MainThreadChatAgents2 = __decorate([

package/vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js

@@ -32,6 +32,9 @@ let MainThreadChatVariables = class MainThreadChatVariables {
     $unregisterVariable(handle) {
         this._variables.deleteAndDispose(handle);
     }
+    $attachContext(name, value, location) {
+        this._chatVariablesService.attachContext(name, revive(value), location);
+    }
 };
 MainThreadChatVariables = __decorate([
     extHostNamedCustomer(MainContext.MainThreadChatVariables),

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -9,13 +9,14 @@ import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/bro
 import { CommentsPanel } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
@@ -69,8 +70,10 @@ class MainThreadCommentThread {
         return this._collapsibleState;
     }
     set collapsibleState(newState) {
-        this._collapsibleState = newState;
-        this._onDidChangeCollapsibleState.fire(this._collapsibleState);
+        if (newState !== this._collapsibleState) {
+            this._collapsibleState = newState;
+            this._onDidChangeCollapsibleState.fire(this._collapsibleState);
+        }
     }
     get initialCollapsibleState() {
         return this._initialCollapsibleState;
@@ -105,7 +108,7 @@ class MainThreadCommentThread {
     get isTemplate() {
         return this._isTemplate;
     }
-    constructor(commentThreadHandle, controllerHandle, extensionId, threadId, resource, _range, _canReply, _isTemplate) {
+    constructor(commentThreadHandle, controllerHandle, extensionId, threadId, resource, _range, _canReply, _isTemplate, editorId) {
         this.commentThreadHandle = commentThreadHandle;
         this.controllerHandle = controllerHandle;
         this.extensionId = extensionId;
@@ -114,6 +117,7 @@ class MainThreadCommentThread {
         this._range = _range;
         this._canReply = _canReply;
         this._isTemplate = _isTemplate;
+        this.editorId = editorId;
         this._onDidChangeInput = ( (new Emitter()));
         this._onDidChangeLabel = ( (new Emitter()));
         this.onDidChangeLabel = this._onDidChangeLabel.event;
@@ -175,7 +179,7 @@ class MainThreadCommentThread {
     }
     toJSON() {
         return {
-            $mid: 7 ,
+            $mid: MarshalledId.CommentThread,
             commentControlHandle: this.controllerHandle,
             commentThreadHandle: this.commentThreadHandle,
         };
@@ -228,7 +232,7 @@ class MainThreadCommentController {
     updateFeatures(features) {
         this._features = features;
     }
-    createCommentThread(extensionId, commentThreadHandle, threadId, resource, range, isTemplate) {
+    createCommentThread(extensionId, commentThreadHandle, threadId, resource, range, isTemplate, editorId) {
         const thread = ( (new MainThreadCommentThread(
             commentThreadHandle,
             this.handle,
@@ -237,7 +241,8 @@ class MainThreadCommentController {
              (URI.revive(resource).toString()),
             range,
             true,
-            isTemplate
+            isTemplate,
+            editorId
         )));
         this._threads.set(commentThreadHandle, thread);
         if (thread.isDocumentCommentThread()) {
@@ -341,7 +346,9 @@ class MainThreadCommentController {
         for (const thread of [...( (this._threads.keys()))]) {
             const commentThread = this._threads.get(thread);
             if (commentThread.resource === ( (resource.toString()))) {
-                ret.push(commentThread);
+                if (commentThread.isDocumentCommentThread()) {
+                    ret.push(commentThread);
+                }
             }
         }
         const commentingRanges = await this._proxy.$provideCommentingRanges(this.handle, resource, token);
@@ -352,7 +359,7 @@ class MainThreadCommentController {
             commentingRanges: {
                 resource: resource,
                 ranges: commentingRanges?.ranges || [],
-                fileComments: commentingRanges?.fileComments
+                fileComments: !!commentingRanges?.fileComments
             }
         };
     }
@@ -368,7 +375,9 @@ class MainThreadCommentController {
         for (const thread of [...( (this._threads.keys()))]) {
             const commentThread = this._threads.get(thread);
             if (commentThread.resource === ( (resource.toString()))) {
-                ret.push(commentThread);
+                if (!commentThread.isDocumentCommentThread()) {
+                    ret.push(commentThread);
+                }
             }
         }
         return {
@@ -387,15 +396,15 @@ class MainThreadCommentController {
         }
         return ret;
     }
-    createCommentThreadTemplate(resource, range) {
-        return this._proxy.$createCommentThreadTemplate(this.handle, resource, range);
+    createCommentThreadTemplate(resource, range, editorId) {
+        return this._proxy.$createCommentThreadTemplate(this.handle, resource, range, editorId);
     }
     async updateCommentThreadTemplate(threadHandle, range) {
         await this._proxy.$updateCommentThreadTemplate(this.handle, threadHandle, range);
     }
     toJSON() {
         return {
-            $mid: 6 ,
+            $mid: MarshalledId.CommentController,
             handle: this.handle
         };
     }
@@ -455,12 +464,12 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         }
         provider.updateFeatures(features);
     }
-    $createCommentThread(handle, commentThreadHandle, threadId, resource, range, extensionId, isTemplate) {
+    $createCommentThread(handle, commentThreadHandle, threadId, resource, range, extensionId, isTemplate, editorId) {
         const provider = this._commentControllers.get(handle);
         if (!provider) {
             return undefined;
         }
-        return provider.createCommentThread(extensionId.value, commentThreadHandle, threadId, resource, range, isTemplate);
+        return provider.createCommentThread(extensionId.value, commentThreadHandle, threadId, resource, range, isTemplate, editorId);
     }
     $updateCommentThread(handle, commentThreadHandle, threadId, resource, changes) {
         const provider = this._commentControllers.get(handle);
@@ -496,7 +505,7 @@ let MainThreadComments = class MainThreadComments extends Disposable {
                 hideIfEmpty: true,
                 icon: commentsViewIcon,
                 order: 10,
-            }, 1 );
+            }, ViewContainerLocation.Panel);
             ( (Registry.as(Extensions.ViewsRegistry))).registerViews([{
                     id: COMMENTS_VIEW_ID,
                     name: COMMENTS_VIEW_TITLE,

package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js

@@ -1,10 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { getScopes, Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { getScopes, Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 
@@ -41,13 +43,13 @@ let MainThreadConfiguration = class MainThreadConfiguration {
         target = target !== null && target !== undefined ? target : this.deriveConfigurationTarget(key, overrides);
         const configurationValue = this.configurationService.inspect(key, overrides);
         switch (target) {
-            case 8 :
+            case ConfigurationTarget.MEMORY:
                 return this._updateValue(key, value, target, configurationValue?.memory?.override, overrides, scopeToLanguage);
-            case 6 :
+            case ConfigurationTarget.WORKSPACE_FOLDER:
                 return this._updateValue(key, value, target, configurationValue?.workspaceFolder?.override, overrides, scopeToLanguage);
-            case 5 :
+            case ConfigurationTarget.WORKSPACE:
                 return this._updateValue(key, value, target, configurationValue?.workspace?.override, overrides, scopeToLanguage);
-            case 4 :
+            case ConfigurationTarget.USER_REMOTE:
                 return this._updateValue(key, value, target, configurationValue?.userRemote?.override, overrides, scopeToLanguage);
             default:
                 return this._updateValue(key, value, target, configurationValue?.userLocal?.override, overrides, scopeToLanguage);
@@ -61,13 +63,13 @@ let MainThreadConfiguration = class MainThreadConfiguration {
         return this.configurationService.updateValue(key, value, overrides, configurationTarget, { donotNotifyError: true });
     }
     deriveConfigurationTarget(key, overrides) {
-        if (overrides.resource && this._workspaceContextService.getWorkbenchState() === 3 ) {
+        if (overrides.resource && this._workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             const configurationProperties = ( Registry.as(Extensions.Configuration)).getConfigurationProperties();
-            if (configurationProperties[key] && ((configurationProperties[key].scope === 4  || configurationProperties[key].scope === 5) )) {
-                return 6 ;
+            if (configurationProperties[key] && (configurationProperties[key].scope === ConfigurationScope.RESOURCE || configurationProperties[key].scope === ConfigurationScope.LANGUAGE_OVERRIDABLE)) {
+                return ConfigurationTarget.WORKSPACE_FOLDER;
             }
         }
-        return 5 ;
+        return ConfigurationTarget.WORKSPACE;
     }
 };
 MainThreadConfiguration = __decorate([