@codingame/monaco-vscode-extensions-service-override 18.4.0 → 19.0.0

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

@@ -19,19 +19,22 @@ import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
 import { DataTransfer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypeConverters';
 import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
 import { CallHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/search';
+import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search';
 import { TypeHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, ISuggestDataDtoField, ISuggestResultDtoField, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
 
 var MainThreadLanguageFeatures_1;
 let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThreadLanguageFeatures extends Disposable {
-    constructor(extHostContext, _languageService, _languageConfigurationService, _languageFeaturesService, _uriIdentService) {
+    constructor(extHostContext, _languageService, _languageConfigurationService, _languageFeaturesService, _uriIdentService, _telemetryService) {
         super();
         this._languageService = _languageService;
         this._languageConfigurationService = _languageConfigurationService;
         this._languageFeaturesService = _languageFeaturesService;
         this._uriIdentService = _uriIdentService;
+        this._telemetryService = _telemetryService;
         this._registrations = this._register(( new DisposableMap()));
         this._pasteEditProviders = ( new Map());
         this._documentOnDropEditProviders = ( new Map());
@@ -496,14 +499,11 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         }
         this._registrations.set(handle, this._languageFeaturesService.completionProvider.register(selector, provider));
     }
-    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, yieldsToExtensionIds, displayName, debounceDelayMs, eventHandle) {
+    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, extensionVersion, groupId, yieldsToExtensionIds, displayName, debounceDelayMs, eventHandle) {
         const provider = {
             provideInlineCompletions: async (model, position, context, token) => {
                 return this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
             },
-            provideInlineEditsForRange: async (model, range, context, token) => {
-                return this._proxy.$provideInlineEditsForRange(handle, model.uri, range, context, token);
-            },
             handleItemDidShow: async (completions, item, updatedInsertText) => {
                 if (supportsHandleEvents) {
                     await this._proxy.$handleInlineCompletionDidShow(handle, completions.pid, item.idx, updatedInsertText);
@@ -514,7 +514,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                     await this._proxy.$handleInlineCompletionPartialAccept(handle, completions.pid, item.idx, acceptedCharacters, info);
                 }
             },
-            handleEndOfLifetime: async (completions, item, reason) => {
+            handleEndOfLifetime: async (completions, item, reason, lifetimeSummary) => {
                 function mapReason(reason, f) {
                     if (reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored) {
                         return {
@@ -527,16 +527,44 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                 if (supportsHandleEvents) {
                     await this._proxy.$handleInlineCompletionEndOfLifetime(handle, completions.pid, item.idx, mapReason(reason, i => ({ pid: completions.pid, idx: i.idx })));
                 }
+                const endOfLifeSummary = {
+                    id: lifetimeSummary.requestUuid,
+                    shown: lifetimeSummary.shown,
+                    shownDuration: lifetimeSummary.shownDuration,
+                    shownDurationUncollapsed: lifetimeSummary.shownDurationUncollapsed,
+                    timeUntilShown: lifetimeSummary.timeUntilShown,
+                    editorType: lifetimeSummary.editorType,
+                    viewKind: lifetimeSummary.viewKind,
+                    requestReason: lifetimeSummary.requestReason,
+                    error: lifetimeSummary.error,
+                    languageId: lifetimeSummary.languageId,
+                    cursorColumnDistance: lifetimeSummary.cursorColumnDistance,
+                    cursorLineDistance: lifetimeSummary.cursorLineDistance,
+                    lineCountOriginal: lifetimeSummary.lineCountOriginal,
+                    lineCountModified: lifetimeSummary.lineCountModified,
+                    characterCountOriginal: lifetimeSummary.characterCountOriginal,
+                    characterCountModified: lifetimeSummary.characterCountModified,
+                    disjointReplacements: lifetimeSummary.disjointReplacements,
+                    sameShapeReplacements: lifetimeSummary.sameShapeReplacements,
+                    extensionId,
+                    extensionVersion,
+                    partiallyAccepted: lifetimeSummary.partiallyAccepted,
+                    superseded: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored && !!reason.supersededBy,
+                    reason: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted ? 'accepted'
+                        : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? 'rejected'
+                            : 'ignored'
+                };
+                this._telemetryService.publicLog2('inlineCompletion.endOfLife', endOfLifeSummary);
             },
-            freeInlineCompletions: (completions) => {
-                this._proxy.$freeInlineCompletionsList(handle, completions.pid);
+            disposeInlineCompletions: (completions, reason) => {
+                this._proxy.$freeInlineCompletionsList(handle, completions.pid, reason);
             },
             handleRejection: async (completions, item) => {
                 if (supportsHandleEvents) {
                     await this._proxy.$handleInlineCompletionRejection(handle, completions.pid, item.idx);
                 }
             },
-            groupId: extensionId,
+            groupId: groupId ?? extensionId,
             yieldsToGroupIds: yieldsToExtensionIds,
             debounceDelayMs,
             displayName,
@@ -544,12 +572,12 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                 return `InlineCompletionsProvider(${extensionId})`;
             },
         };
-        this._registrations.set(handle, this._languageFeaturesService.inlineCompletionsProvider.register(selector, provider));
         if (typeof eventHandle === 'number') {
             const emitter = ( new Emitter());
             this._registrations.set(eventHandle, emitter);
             provider.onDidChangeInlineCompletions = emitter.event;
         }
+        this._registrations.set(handle, this._languageFeaturesService.inlineCompletionsProvider.register(selector, provider));
     }
     $emitInlineCompletionsChange(handle) {
         const obj = this._registrations.get(handle);
@@ -557,18 +585,6 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             obj.fire(undefined);
         }
     }
-    $registerInlineEditProvider(handle, selector, extensionId, displayName) {
-        const provider = {
-            displayName,
-            provideInlineEdit: async (model, context, token) => {
-                return this._proxy.$provideInlineEdit(handle, model.uri, context, token);
-            },
-            freeInlineEdit: (edit) => {
-                this._proxy.$freeInlineEdit(handle, edit.pid);
-            }
-        };
-        this._registrations.set(handle, this._languageFeaturesService.inlineEditProvider.register(selector, provider));
-    }
     $registerSignatureHelpProvider(handle, selector, metadata) {
         this._registrations.set(handle, this._languageFeaturesService.signatureHelpProvider.register(selector, {
             signatureHelpTriggerCharacters: metadata.triggerCharacters,
@@ -865,7 +881,8 @@ MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = __decorate([
     ( __param(1, ILanguageService)),
     ( __param(2, ILanguageConfigurationService)),
     ( __param(3, ILanguageFeaturesService)),
-    ( __param(4, IUriIdentityService))
+    ( __param(4, IUriIdentityService)),
+    ( __param(5, ITelemetryService))
 ], MainThreadLanguageFeatures);
 let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
     constructor(_handle, _proxy, metadata, _uriIdentService) {

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

@@ -61,7 +61,7 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
                     this._runningToolCalls.delete(dto.callId);
                 }
             },
-            prepareToolInvocation: (parameters, token) => this._proxy.$prepareToolInvocation(id, parameters, token),
+            prepareToolInvocation: (context, token) => this._proxy.$prepareToolInvocation(id, context, token),
         });
         this._tools.set(id, disposable);
     }

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

@@ -9,7 +9,7 @@ import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codin
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { resizeImage } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -152,7 +152,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2437, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2452, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {
@@ -227,6 +227,14 @@ class LanguageModelAccessAuthProvider {
         }
         return Promise.resolve();
     }
+    confirmation(extensionName, _recreatingSession) {
+        return localize(
+            2453,
+            "The extension '{0}' wants to access the language models provided by {1}.",
+            extensionName,
+            this.label
+        );
+    }
     _createFakeSession(scopes) {
         return {
             id: 'fake-session',

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts

@@ -1,4 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata } from "@codingame/monaco-vscode-api/vscode/vs/base/common/oauth";
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
@@ -10,7 +11,6 @@ import { IAuthenticationMcpUsageService } from "@codingame/monaco-vscode-api/vsc
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata } from "@codingame/monaco-vscode-api/vscode/vs/base/common/oauth";
 export declare class MainThreadMcp extends Disposable implements MainThreadMcpShape {
     private readonly _extHostContext;
     private readonly _mcpRegistry;

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

@@ -1,12 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { LogLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
@@ -18,7 +19,6 @@ import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ExtensionHostKind, extensionHostKindToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let MainThreadMcp = class MainThreadMcp extends Disposable {
@@ -138,9 +138,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         let session;
         if (sessions.length) {
             if (matchingAccountPreferenceSession && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, server.id)) {
+                this.authenticationMCPServerUsageService.addAccountUsage(providerId, matchingAccountPreferenceSession.account.label, scopesSupported, server.id, server.label);
                 return matchingAccountPreferenceSession.accessToken;
             }
             if (!provider.supportsMultipleAccounts && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, sessions[0].account.label, server.id)) {
+                this.authenticationMCPServerUsageService.addAccountUsage(providerId, sessions[0].account.label, scopesSupported, server.id, server.label);
                 return sessions[0].accessToken;
             }
         }
@@ -172,9 +174,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2438, "Incorrect account detected")),
+            message: ( localize(2454, "Incorrect account detected")),
             detail: ( localize(
-                2439,
+                2455,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -183,11 +185,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2440, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2456, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2441, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2457, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -200,20 +202,20 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession
             ? ( localize(
-            2442,
+            2458,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ))
             : ( localize(
-            2443,
+            2459,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [
             {
-                label: ( localize(2444, "&&Allow")),
+                label: ( localize(2460, "&&Allow")),
                 run() {
                     return true;
                 },

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.d.ts

@@ -10,6 +10,7 @@ export declare class MainThreadMessageService implements MainThreadMessageServic
     private readonly _commandService;
     private readonly _dialogService;
     private extensionsListener;
+    private static readonly URGENT_NOTIFICATION_SOURCES;
     constructor(extHostContext: IExtHostContext, _notificationService: INotificationService, _commandService: ICommandService, _dialogService: IDialogService, extensionService: IExtensionService);
     dispose(): void;
     $showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: {

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

@@ -5,12 +5,19 @@ import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/act
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { NotificationPriority } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 
+var MainThreadMessageService_1;
 let MainThreadMessageService = class MainThreadMessageService {
+    static { MainThreadMessageService_1 = this; }
+    static { this.URGENT_NOTIFICATION_SOURCES = [
+        'vscode.github-authentication',
+        'vscode.microsoft-authentication'
+    ]; }
     constructor(extHostContext, _notificationService, _commandService, _dialogService, extensionService) {
         this._notificationService = _notificationService;
         this._commandService = _commandService;
@@ -44,20 +51,22 @@ let MainThreadMessageService = class MainThreadMessageService {
                 }
             })));
             let source;
+            let sourceIsUrgent = false;
             if (options.source) {
                 source = {
                     label: options.source.label,
                     id: options.source.identifier.value
                 };
+                sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2445, "Extension"));
+                source = ( localize(2461, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2446, "Manage Extension")),
+                    label: ( localize(2462, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -67,7 +76,9 @@ let MainThreadMessageService = class MainThreadMessageService {
                 severity,
                 message,
                 actions: { primary: primaryActions, secondary: secondaryActions },
-                source
+                source,
+                priority: sourceIsUrgent ? NotificationPriority.URGENT : NotificationPriority.DEFAULT,
+                sticky: sourceIsUrgent
             });
             Event.once(messageHandle.onDidClose)(() => {
                 resolve(undefined);
@@ -92,13 +103,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2447, "Cancel")),
+                    label: ( localize(2463, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2448, "&&OK")),
+                    label: ( localize(2464, "&&OK")),
                     run: () => undefined
                 };
             }
@@ -114,7 +125,7 @@ let MainThreadMessageService = class MainThreadMessageService {
         return result;
     }
 };
-MainThreadMessageService = __decorate([
+MainThreadMessageService = MainThreadMessageService_1 = __decorate([
     extHostNamedCustomer(MainContext.MainThreadMessageService),
     ( __param(1, INotificationService)),
     ( __param(2, ICommandService)),

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

@@ -11,7 +11,7 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';

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

@@ -8,8 +8,8 @@ import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.d.ts

@@ -1,8 +1,8 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { INotebookEditor } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { ICellRange } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

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

@@ -5,9 +5,9 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtHostContext, NotebookEditorRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

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

@@ -6,7 +6,7 @@ import { extHostCustomer } from '../../services/extensions/common/extHostCustome
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2449, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2465, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

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

@@ -69,11 +69,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2450, "Show Output")),
+            name: ( localize(2466, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2451, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2467, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2452, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2468, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.d.ts

@@ -5,6 +5,7 @@ import { IExtHostContext } from "../../services/extensions/common/extHostCustome
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 export declare class MainThreadProgress implements MainThreadProgressShape {
     private readonly _commandService;
+    private static readonly URGENT_PROGRESS_SOURCES;
     private readonly _progressService;
     private _progress;
     private readonly _proxy;

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

@@ -8,8 +8,15 @@ import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { onUnexpectedExternalError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { NotificationPriority } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 
+var MainThreadProgress_1;
 let MainThreadProgress = class MainThreadProgress {
+    static { MainThreadProgress_1 = this; }
+    static { this.URGENT_PROGRESS_SOURCES = [
+        'vscode.github-authentication',
+        'vscode.microsoft-authentication'
+    ]; }
     constructor(extHostContext, progressService, _commandService) {
         this._commandService = _commandService;
         this._progress = ( new Map());
@@ -23,12 +30,14 @@ let MainThreadProgress = class MainThreadProgress {
     async $startProgress(handle, options, extensionId) {
         const task = this._createTask(handle);
         if (options.location === ProgressLocation.Notification && extensionId) {
+            const sourceIsUrgent = MainThreadProgress_1.URGENT_PROGRESS_SOURCES.includes(extensionId);
             const notificationOptions = {
                 ...options,
+                priority: sourceIsUrgent ? NotificationPriority.URGENT : NotificationPriority.DEFAULT,
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                         id: extensionId,
-                        label: ( localize(2453, "Manage Extension")),
+                        label: ( localize(2469, "Manage Extension")),
                         run: () => this._commandService.executeCommand('_extensions.manage', extensionId)
                     })]
             };
@@ -60,7 +69,7 @@ let MainThreadProgress = class MainThreadProgress {
         };
     }
 };
-MainThreadProgress = __decorate([
+MainThreadProgress = MainThreadProgress_1 = __decorate([
     extHostNamedCustomer(MainContext.MainThreadProgress),
     ( __param(1, IProgressService)),
     ( __param(2, ICommandService))

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

@@ -12,7 +12,7 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
-import { ResourceTree } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/base/common/resourceTree';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -21,7 +21,7 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
-import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';

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

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2454, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2470, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error('listener failed')));

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

@@ -10,7 +10,7 @@ import { SearchProviderType, QueryType } from '@codingame/monaco-vscode-api/vsco
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { SearchContext } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/constants';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 
 let MainThreadSearch = class MainThreadSearch {

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

@@ -405,7 +405,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2455, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2471, '{0}: {1}', source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

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

@@ -19,7 +19,7 @@ import { Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asy
 import { ITerminalLinkProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service';
 import { TerminalQuickFixType } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
 import { ITerminalQuickFixService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service';
-import { TerminalCapability } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalCompletionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 

package/vscode/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.d.ts

@@ -8,6 +8,5 @@ export declare class MainThreadTerminalShellIntegration extends Disposable imple
     private readonly _proxy;
     constructor(extHostContext: IExtHostContext, _terminalService: ITerminalService, workbenchEnvironmentService: IWorkbenchEnvironmentService);
     $executeCommand(terminalId: number, commandLine: string): void;
-    private _convertCwdToUri;
     private _enableShellIntegration;
 }