@codingame/monaco-vscode-extensions-service-override 22.1.9 → 23.0.0

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

@@ -1,19 +1,38 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Toggle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/toggle/toggle';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { basenameOrAuthority, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { URI, isUriComponents } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { QuickInputButtonLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import { inputActiveOptionBackground, inputActiveOptionForeground, inputActiveOptionBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { ICustomEditorLabelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 
-function reviveIconPathUris(iconPath) {
-    iconPath.dark = URI.revive(iconPath.dark);
-    if (iconPath.light) {
-        iconPath.light = URI.revive(iconPath.light);
-    }
-}
 let MainThreadQuickOpen = class MainThreadQuickOpen {
-    constructor(extHostContext, quickInputService) {
+    constructor(extHostContext, quickInputService, labelService, customEditorLabelService, modelService, languageService) {
+        this.labelService = labelService;
+        this.customEditorLabelService = customEditorLabelService;
+        this.modelService = modelService;
+        this.languageService = languageService;
         this._items = {};
         this.sessions = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostQuickOpen));
@@ -55,6 +74,7 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
     }
     $setItems(instance, items) {
         if (this._items[instance]) {
+            items.forEach(item => this.expandItemProps(item));
             this._items[instance].resolve(items);
             delete this._items[instance];
         }
@@ -119,59 +139,71 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
             session = {
                 input,
                 handlesToItems: ( new Map()),
+                handlesToToggles: ( new Map()),
                 store
             };
             this.sessions.set(sessionId, session);
         }
         const { input, handlesToItems } = session;
+        const quickPick = input;
         for (const param in params) {
-            if (param === 'id' || param === 'type') {
-                continue;
-            }
-            if (param === 'visible') {
-                if (params.visible) {
-                    input.show();
-                }
-                else {
-                    input.hide();
-                }
-            }
-            else if (param === 'items') {
-                handlesToItems.clear();
-                params[param].forEach((item) => {
-                    if (item.type === 'separator') {
-                        return;
-                    }
-                    if (item.buttons) {
-                        item.buttons = ( item.buttons.map((button) => {
-                            if (button.iconPath) {
-                                reviveIconPathUris(button.iconPath);
-                            }
-                            return button;
-                        }));
+            switch (param) {
+                case 'id':
+                case 'type':
+                    continue;
+                case 'visible':
+                    if (params.visible) {
+                        input.show();
                     }
-                    handlesToItems.set(item.handle, item);
-                });
-                input[param] = params[param];
-            }
-            else if (param === 'activeItems' || param === 'selectedItems') {
-                input[param] = ( params[param]
-                    .filter((handle) => ( handlesToItems.has(handle)))
-                    .map((handle) => handlesToItems.get(handle)));
-            }
-            else if (param === 'buttons') {
-                input[param] = ( params.buttons.map(button => {
-                    if (button.handle === -1) {
-                        return this._quickInputService.backButton;
+                    else {
+                        input.hide();
                     }
-                    if (button.iconPath) {
-                        reviveIconPathUris(button.iconPath);
+                    break;
+                case 'items': {
+                    handlesToItems.clear();
+                    params.items?.forEach((item) => {
+                        this.expandItemProps(item);
+                        if (item.type !== 'separator') {
+                            item.buttons?.forEach(button => this.expandIconPath(button));
+                            handlesToItems.set(item.handle, item);
+                        }
+                    });
+                    quickPick.items = params.items;
+                    break;
+                }
+                case 'activeItems':
+                    quickPick.activeItems = params.activeItems
+                        ?.map((handle) => handlesToItems.get(handle))
+                        .filter(Boolean);
+                    break;
+                case 'selectedItems':
+                    quickPick.selectedItems = params.selectedItems
+                        ?.map((handle) => handlesToItems.get(handle))
+                        .filter(Boolean);
+                    break;
+                case 'buttons': {
+                    const buttons = [], toggles = [];
+                    for (const button of params.buttons) {
+                        if (button.handle === -1) {
+                            buttons.push(this._quickInputService.backButton);
+                        }
+                        else {
+                            this.expandIconPath(button);
+                            if (button.location === QuickInputButtonLocation.Input) {
+                                toggles.push(button);
+                            }
+                            else {
+                                buttons.push(button);
+                            }
+                        }
                     }
-                    return button;
-                }));
-            }
-            else {
-                input[param] = params[param];
+                    input.buttons = buttons;
+                    this.updateToggles(sessionId, session, toggles);
+                    break;
+                }
+                default:
+                    input[param] = params[param];
+                    break;
             }
         }
         return Promise.resolve(undefined);
@@ -184,10 +216,95 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
         }
         return Promise.resolve(undefined);
     }
+    expandItemProps(item) {
+        if (item.type === 'separator') {
+            return;
+        }
+        if (!item.resourceUri) {
+            this.expandIconPath(item);
+            return;
+        }
+        const resourceUri = ( URI.from(item.resourceUri));
+        item.label ??= this.customEditorLabelService.getName(resourceUri) || '';
+        if (item.label) {
+            item.description ??= this.labelService.getUriLabel(resourceUri, { relative: true });
+        }
+        else {
+            item.label = basenameOrAuthority(resourceUri);
+            item.description ??= this.labelService.getUriLabel(dirname(resourceUri), { relative: true });
+        }
+        const icon = item.iconPathDto;
+        if (ThemeIcon.isThemeIcon(icon) && (ThemeIcon.isFile(icon) || ThemeIcon.isFolder(icon))) {
+            const iconClasses = ( new Lazy(() => getIconClasses(this.modelService, this.languageService, resourceUri)));
+            Object.defineProperty(item, 'iconClasses', { get: () => iconClasses.value });
+        }
+        else {
+            this.expandIconPath(item);
+        }
+    }
+    expandIconPath(target) {
+        const icon = target.iconPathDto;
+        if (!icon) {
+            return;
+        }
+        else if (ThemeIcon.isThemeIcon(icon)) {
+            target.iconClass = ThemeIcon.asClassName(icon);
+        }
+        else if (isUriComponents(icon)) {
+            const uri = ( URI.from(icon));
+            target.iconPath = { dark: uri, light: uri };
+        }
+        else {
+            const { dark, light } = icon;
+            target.iconPath = { dark: ( URI.from(dark)), light: ( URI.from(light)) };
+        }
+    }
+    updateToggles(sessionId, session, buttons) {
+        const { input, handlesToToggles, store } = session;
+        const toggles = [];
+        for (const button of buttons) {
+            const title = button.tooltip || '';
+            const isChecked = !!button.checked;
+            const icon = ThemeIcon.isThemeIcon(button.iconPathDto) ? button.iconPathDto : undefined;
+            let { toggle } = handlesToToggles.get(button.handle) || {};
+            if (toggle) {
+                toggle.setTitle(title);
+                toggle.setIcon(icon);
+                toggle.checked = isChecked;
+            }
+            else {
+                toggle = store.add(( new Toggle({
+                    title,
+                    icon,
+                    isChecked,
+                    inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
+                    inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
+                    inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
+                })));
+                const listener = store.add(toggle.onChange(() => {
+                    this._proxy.$onDidTriggerButton(sessionId, button.handle, toggle.checked);
+                }));
+                handlesToToggles.set(button.handle, { toggle, listener });
+            }
+            toggles.push(toggle);
+        }
+        for (const [handle, { toggle, listener }] of handlesToToggles) {
+            if (!( buttons.some(button => button.handle === handle))) {
+                handlesToToggles.delete(handle);
+                store.delete(toggle);
+                store.delete(listener);
+            }
+        }
+        input.toggles = toggles;
+    }
 };
 MainThreadQuickOpen = __decorate([
     extHostNamedCustomer(MainContext.MainThreadQuickOpen),
-    ( __param(1, IQuickInputService))
+    ( __param(1, IQuickInputService)),
+    ( __param(2, ILabelService)),
+    ( __param(3, ICustomEditorLabelService)),
+    ( __param(4, IModelService)),
+    ( __param(5, ILanguageService))
 ], MainThreadQuickOpen);
 
 export { MainThreadQuickOpen };

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

@@ -1,5 +1,5 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { InputValidationType } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
+import { InputValidationType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm";
 import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { MainThreadSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, SCMHistoryItemRefsChangeEventDto, SCMHistoryItemRefDto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
@@ -53,4 +53,5 @@ export declare class MainThreadSCM implements MainThreadSCMShape {
     $setValidationProviderIsEnabled(sourceControlHandle: number, enabled: boolean): Promise<void>;
     $onDidChangeHistoryProviderCurrentHistoryItemRefs(sourceControlHandle: number, historyItemRef?: SCMHistoryItemRefDto, historyItemRemoteRef?: SCMHistoryItemRefDto, historyItemBaseRef?: SCMHistoryItemRefDto): Promise<void>;
     $onDidChangeHistoryProviderHistoryItemRefs(sourceControlHandle: number, historyItemRefs: SCMHistoryItemRefsChangeEventDto): Promise<void>;
+    $onDidChangeArtifacts(sourceControlHandle: number, groups: string[]): Promise<void>;
 }

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-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-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-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-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';
@@ -141,6 +141,30 @@ class MainThreadSCMResource {
         };
     }
 }
+class MainThreadSCMArtifactProvider {
+    constructor(proxy, handle) {
+        this.proxy = proxy;
+        this.handle = handle;
+        this._onDidChangeArtifacts = ( new Emitter());
+        this.onDidChangeArtifacts = this._onDidChangeArtifacts.event;
+        this._disposables = ( new DisposableStore());
+        this._disposables.add(this._onDidChangeArtifacts);
+    }
+    async provideArtifactGroups(token) {
+        const artifactGroups = await this.proxy.$provideArtifactGroups(this.handle, token ?? CancellationToken.None);
+        return artifactGroups?.map(group => ({ ...group, icon: getIconFromIconDto(group.icon) }));
+    }
+    async provideArtifacts(group, token) {
+        const artifacts = await this.proxy.$provideArtifacts(this.handle, group, token ?? CancellationToken.None);
+        return artifacts?.map(artifact => ({ ...artifact, icon: getIconFromIconDto(artifact.icon) }));
+    }
+    $onDidChangeArtifacts(groups) {
+        this._onDidChangeArtifacts.fire(groups);
+    }
+    dispose() {
+        this._disposables.dispose();
+    }
+}
 class MainThreadSCMHistoryProvider {
     get historyItemRef() { return this._historyItemRef; }
     get historyItemRemoteRef() { return this._historyItemRemoteRef; }
@@ -226,6 +250,7 @@ class MainThreadSCMProvider {
     get name() { return this._name ?? this._label; }
     get commitTemplate() { return this._commitTemplate; }
     get actionButton() { return this._actionButton; }
+    get artifactProvider() { return this._artifactProvider; }
     get historyProvider() { return this._historyProvider; }
     constructor(proxy, _handle, _parentHandle, _providerId, _label, _rootUri, _iconPath, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
         this.proxy = proxy;
@@ -251,6 +276,7 @@ class MainThreadSCMProvider {
         this._statusBarCommands = observableValue(this, undefined);
         this._commitTemplate = observableValue(this, '');
         this._actionButton = observableValue(this, undefined);
+        this._artifactProvider = observableValue(this, undefined);
         this._historyProvider = observableValue(this, undefined);
         if (_rootUri) {
             const folder = this._workspaceContextService.getWorkspaceFolder(_rootUri);
@@ -317,6 +343,13 @@ class MainThreadSCMProvider {
             this._stagedQuickDiff.dispose();
             this._stagedQuickDiff = undefined;
         }
+        if (features.hasArtifactProvider && !this.artifactProvider.get()) {
+            const artifactProvider = ( new MainThreadSCMArtifactProvider(this.proxy, this.handle));
+            this._artifactProvider.set(artifactProvider, undefined);
+        }
+        else if (features.hasArtifactProvider === false && this.artifactProvider.get()) {
+            this._artifactProvider.set(undefined, undefined);
+        }
         if (features.hasHistoryProvider && !this.historyProvider.get()) {
             const historyProvider = ( new MainThreadSCMHistoryProvider(this.proxy, this.handle));
             this._historyProvider.set(historyProvider, undefined);
@@ -414,16 +447,25 @@ class MainThreadSCMProvider {
         return result && URI.revive(result);
     }
     $onDidChangeHistoryProviderCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef) {
-        if (!this.historyProvider.get()) {
+        const provider = this.historyProvider.get();
+        if (!provider) {
             return;
         }
-        this._historyProvider.get()?.$onDidChangeCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef);
+        provider.$onDidChangeCurrentHistoryItemRefs(historyItemRef, historyItemRemoteRef, historyItemBaseRef);
     }
     $onDidChangeHistoryProviderHistoryItemRefs(historyItemRefs) {
-        if (!this.historyProvider.get()) {
+        const provider = this.historyProvider.get();
+        if (!provider) {
+            return;
+        }
+        provider.$onDidChangeHistoryItemRefs(historyItemRefs);
+    }
+    $onDidChangeArtifacts(groups) {
+        const provider = this.artifactProvider.get();
+        if (!provider) {
             return;
         }
-        this._historyProvider.get()?.$onDidChangeHistoryItemRefs(historyItemRefs);
+        provider.$onDidChangeArtifacts(groups);
     }
     toJSON() {
         return {
@@ -628,6 +670,15 @@ let MainThreadSCM = class MainThreadSCM {
         const provider = repository.provider;
         provider.$onDidChangeHistoryProviderHistoryItemRefs(historyItemRefs);
     }
+    async $onDidChangeArtifacts(sourceControlHandle, groups) {
+        await this._repositoryBarriers.get(sourceControlHandle)?.wait();
+        const repository = this._repositories.get(sourceControlHandle);
+        if (!repository) {
+            return;
+        }
+        const provider = repository.provider;
+        provider.$onDidChangeArtifacts(groups);
+    }
 };
 MainThreadSCM = __decorate([
     extHostNamedCustomer(MainContext.MainThreadSCM),

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(2507, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2519, "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.d.ts

@@ -1,5 +1,6 @@
 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 { ITelemetryData } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { IRawFileMatch2 } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search";
@@ -22,5 +23,5 @@ export declare class MainThreadSearch implements MainThreadSearchShape {
     $handleFileMatch(handle: number, session: number, data: UriComponents[]): void;
     $handleTextMatch(handle: number, session: number, data: IRawFileMatch2[]): void;
     $handleKeywordResult(handle: number, session: number, data: AISearchKeyword): void;
-    $handleTelemetry(eventName: string, data: any): void;
+    $handleTelemetry(eventName: string, data: ITelemetryData | undefined): void;
 }

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-5084de40-f866-5cb5-9d9b-33a10f6f235d-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

@@ -335,7 +335,7 @@ var TaskHandleDTO;
 (function (TaskHandleDTO) {
     function is(value) {
         const candidate = value;
-        return candidate && isString(candidate.id) && !!candidate.workspaceFolder;
+        return !!candidate && isString(candidate.id) && !!candidate.workspaceFolder;
     }
     TaskHandleDTO.is = is;
 })(TaskHandleDTO || (TaskHandleDTO = {}));
@@ -405,7 +405,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2508, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2520, '{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/mainThreadTelemetry.d.ts

@@ -3,6 +3,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/gdprTypings";
+import { ITelemetryData } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadTelemetryShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
@@ -15,6 +16,6 @@ export declare class MainThreadTelemetry extends Disposable implements MainThrea
     private static readonly _name;
     constructor(extHostContext: IExtHostContext, _telemetryService: ITelemetryService, _configurationService: IConfigurationService, _environmentService: IEnvironmentService, _productService: IProductService);
     private get telemetryLevel();
-    $publicLog(eventName: string, data?: any): void;
+    $publicLog(eventName: string, data?: ITelemetryData): void;
     $publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
 }

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-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-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';
 
@@ -226,19 +226,19 @@ let MainThreadTerminalService = class MainThreadTerminalService {
     $registerCompletionProvider(id, extensionIdentifier, ...triggerCharacters) {
         this._completionProviders.set(id, this._terminalCompletionService.registerTerminalCompletionProvider(extensionIdentifier, id, {
             id,
-            provideCompletions: async (commandLine, cursorPosition, allowFallbackCompletions, token) => {
-                const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition, allowFallbackCompletions }, token);
+            provideCompletions: async (commandLine, cursorIndex, token) => {
+                const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorIndex }, token);
                 if (!completions) {
                     return undefined;
                 }
-                if (completions.resourceRequestConfig) {
-                    const { cwd, globPattern, ...rest } = completions.resourceRequestConfig;
+                if (completions.resourceOptions) {
+                    const { cwd, globPattern, ...rest } = completions.resourceOptions;
                     return {
                         items: completions.items?.map(c => ({
                             provider: `ext:${id}`,
                             ...c,
                         })),
-                        resourceRequestConfig: {
+                        resourceOptions: {
                             ...rest,
                             cwd,
                             globPattern

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
@@ -29,10 +29,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
             }
         }
         const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
-            return ( Event.map(
-                Event.filter(instance.capabilities.onDidAddCapabilityType, e => e === TerminalCapability.CommandDetection),
-                () => instance
-            ));
+            return ( Event.map(instance.capabilities.onDidAddCommandDetectionCapability, () => instance));
         })).event;
         this._store.add(onDidAddCommandDetection(e => this._enableShellIntegration(e)));
         const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));
@@ -56,7 +53,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
             }
             currentCommand = e.data;
             const instanceId = e.instance.instanceId;
-            this._proxy.$shellExecutionStart(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.cwd);
+            this._proxy.$shellExecutionStart(instanceId, instanceSupportsExecuteCommandApi(e.instance), e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.cwd);
             instanceDataListeners.get(instanceId)?.dispose();
             instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => {
                 this._proxy.$shellExecutionData(instanceId, events.join(''));
@@ -79,7 +76,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
         if (instance.shellType) {
             this._extensionService.activateByEvent(`onTerminalShellIntegration:${instance.shellType}`);
         }
-        this._proxy.$shellIntegrationChange(instance.instanceId);
+        this._proxy.$shellIntegrationChange(instance.instanceId, instanceSupportsExecuteCommandApi(instance));
         const cwdDetection = instance.capabilities.get(TerminalCapability.CwdDetection);
         if (cwdDetection) {
             this._proxy.$cwdChange(instance.instanceId, cwdDetection.getCwd());
@@ -103,5 +100,8 @@ function convertToExtHostCommandLineConfidence(command) {
             return TerminalShellExecutionCommandLineConfidence.Low;
     }
 }
+function instanceSupportsExecuteCommandApi(instance) {
+    return instance.shellLaunchConfig.type !== 'Task';
+}
 
 export { MainThreadTerminalShellIntegration };

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

@@ -112,13 +112,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2509,
+            2521,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-                label: ( localize(2510, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2522, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
                 run: async () => {
                     this.elevateionRetry = true;
                     await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);

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

@@ -52,7 +52,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 }
                 catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action('default', ( localize(2511, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action('default', ( localize(2523, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId,
@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2512, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
+                            message: ( localize(2524, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
                             actions: {
                                 primary: [
                                     openDefaultAction

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { WebviewInput } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 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";