@codingame/monaco-vscode-extensions-service-override 37.1.0 → 37.3.0

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

@@ -5,7 +5,7 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 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 { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { MainThreadTelemetryShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadTelemetry extends Disposable implements MainThreadTelemetryShape {
     private readonly _telemetryService;

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

@@ -9,7 +9,7 @@ import { isValidAssignmentContext } from '../../../platform/telemetry/common/ass
 import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TelemetryLevel } 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 { supportsTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 
 var MainThreadTelemetry_1;

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

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { MainThreadTerminalServiceShape, TerminalLaunchConfig, ExtHostTerminalIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProcessProperty, IProcessReadyWindowsPty, ITerminalOutputMatch, ITerminalOutputMatcher } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
@@ -11,7 +11,7 @@ import { IEnvironmentVariableService } from "@codingame/monaco-vscode-api/vscode
 import { ITerminalProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
-import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariable";
 import { ITerminalLinkProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.service";
 import { ITerminalQuickFixService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service";
 import { ITerminalCompletionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service";

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, DisposableMap, MutableDisposable, combinedDisposable, 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';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -111,9 +111,9 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         }
         if (this._environmentVariableService.collections.size > 0) {
             const collectionAsArray = [...this._environmentVariableService.collections.entries()];
-            const serializedCollections = ( collectionAsArray.map(e => {
+            const serializedCollections = collectionAsArray.map(e => {
                 return [e[0], serializeEnvironmentVariableCollection(e[1].map)];
-            }));
+            });
             this._proxy.$initEnvironmentVariableCollections(serializedCollections);
         }
         remoteAgentService.getEnvironment().then(async env => {
@@ -351,7 +351,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
                 if (matchResult) {
                     const result = await this._proxy.$provideTerminalQuickFixes(id, matchResult, token);
                     if (result && Array.isArray(result)) {
-                        return ( result.map(r => parseQuickFix(id, extensionId, r)));
+                        return result.map(r => parseQuickFix(id, extensionId, r));
                     } else if (result) {
                         return parseQuickFix(id, extensionId, result);
                     }
@@ -521,13 +521,13 @@ class ExtensionTerminalLinkProvider {
     async provideLinks(instance, line) {
         const proxy = this._proxy;
         const extHostLinks = await proxy.$provideLinks(instance.instanceId, line);
-        return ( extHostLinks.map(dto => ({
+        return extHostLinks.map(dto => ({
             id: dto.id,
             startIndex: dto.startIndex,
             length: dto.length,
             label: dto.label,
             activate: () => proxy.$activateLink(instance.instanceId, dto.id)
-        })));
+        }));
     }
 }
 function getOutputMatchForLines(lines, outputMatcher) {

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

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { type MainThreadTerminalShellIntegrationShape } 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";
-import { type IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { type IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 export declare class MainThreadTerminalShellIntegration extends Disposable implements MainThreadTerminalShellIntegrationShape {
     private readonly _terminalService;

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

@@ -6,7 +6,7 @@ import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platf
 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';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { TerminalShellExecutionCommandLineConfidence } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 
@@ -34,7 +34,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
             }
         }
         const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
-            return ( Event.map(instance.capabilities.onDidAddCommandDetectionCapability, () => instance));
+            return Event.map(instance.capabilities.onDidAddCommandDetectionCapability, () => instance);
         })).event;
         this._store.add(onDidAddCommandDetection(e => this._enableShellIntegration(e)));
         const cwdChangeEvent = this._store.add(

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

@@ -7,7 +7,7 @@ import { ITestProfileService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { ITestResultService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testResultService.service";
 import { ITestService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testService.service";
 import { CoverageDetails, ExtensionRunTestsRequest, IFileCoverage, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestControllerCapability, TestResultState, TestsDiffOp } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testTypes";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { ILocationDto, ITestControllerPatch, MainThreadTestingShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadTesting extends Disposable implements MainThreadTestingShape {
     private readonly uriIdentityService;

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

@@ -14,7 +14,7 @@ import { LiveTestResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ITestResultService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testResultService.service';
 import { ITestService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testService.service';
 import { TestRunProfileBitset, ITestItem, IFileCoverage, CoverageDetails, ITestMessage, TestsDiffOp } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testTypes';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -105,7 +105,10 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
         this.testProfiles.removeProfile(controllerId, profileId);
     }
     $addTestsToRun(controllerId, runId, tests) {
-        this.withLiveRun(runId, r => r.addTestChainToRun(controllerId, ( tests.map(t => ITestItem.deserialize(this.uriIdentityService, t)))));
+        this.withLiveRun(runId, r => r.addTestChainToRun(
+            controllerId,
+            tests.map(t => ITestItem.deserialize(this.uriIdentityService, t))
+        ));
     }
     $appendCoverage(runId, taskId, coverage) {
         this.withLiveRun(runId, run => {
@@ -118,7 +121,7 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
                 let value = task.coverage.read(undefined);
                 if (!value) {
                     value = ( new TestCoverage(run, taskId, this.uriIdentityService, {
-                        getCoverageDetails: (id, testId, token) => this.proxy.$getCoverageDetails(id, testId, token).then(r => ( r.map(CoverageDetails.deserialize)))
+                        getCoverageDetails: (id, testId, token) => this.proxy.$getCoverageDetails(id, testId, token).then(r => r.map(CoverageDetails.deserialize))
                     }));
                     value.append(deserialized, tx);
                     task.coverage.set(value, tx);
@@ -172,10 +175,10 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
             runTests: (reqs, token) => this.proxy.$runControllerTests(reqs, token),
             startContinuousRun: (reqs, token) => this.proxy.$startContinuousRun(reqs, token),
             expandTest: (testId, levels) => this.proxy.$expandTest(testId, isFinite(levels) ? levels : -1),
-            getRelatedCode: (testId, token) => this.proxy.$getCodeRelatedToTest(testId, token).then(locations => ( locations.map(l => ({
+            getRelatedCode: (testId, token) => this.proxy.$getCodeRelatedToTest(testId, token).then(locations => locations.map(l => ({
                 uri: URI.revive(l.uri),
                 range: Range.lift(l.range)
-            }))))
+            })))
         };
         disposable.add(toDisposable(() => this.testProfiles.removeProfile(controllerId)));
         disposable.add(this.testService.registerTestController(controllerId, controller));
@@ -205,14 +208,17 @@ let MainThreadTesting = class MainThreadTesting extends Disposable {
         this.testProviderRegistrations.delete(controllerId);
     }
     $subscribeToDiffs() {
-        this.proxy.$acceptDiff(( this.testService.collection.getReviverDiff().map(TestsDiffOp.serialize)));
+        this.proxy.$acceptDiff(this.testService.collection.getReviverDiff().map(TestsDiffOp.serialize));
         this.diffListener.value = this.testService.onDidProcessDiff(this.proxy.$acceptDiff, this.proxy);
     }
     $unsubscribeFromDiffs() {
         this.diffListener.clear();
     }
     $publishDiff(controllerId, diff) {
-        this.testService.publishDiff(controllerId, ( diff.map(d => TestsDiffOp.deserialize(this.uriIdentityService, d))));
+        this.testService.publishDiff(
+            controllerId,
+            diff.map(d => TestsDiffOp.deserialize(this.uriIdentityService, d))
+        );
     }
     async $runTests(req, token) {
         const result = await this.testService.runResolvedTests(req, token);

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

@@ -1,5 +1,5 @@
 import { MainThreadThemingShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 export declare class MainThreadTheming implements MainThreadThemingShape {
     private readonly _themeService;

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 
 let MainThreadTheming = class MainThreadTheming {

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

@@ -1,6 +1,6 @@
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { MainThreadTimelineShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { TimelineChangeEvent, TimelineProviderDescriptor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/timeline/common/timeline";
 import { ITimelineService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/timeline/common/timeline.service";
 export declare class MainThreadTimeline implements MainThreadTimelineShape {

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { ITimelineService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/timeline/common/timeline.service';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { MainThreadTreeViewsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { ITreeItem, IRevealOptions, IViewBadge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable, DisposableMap, 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';
 import { Extensions, NoTreeViewError, ResolvableTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { distinct } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { isUndefinedOrNull, isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -197,23 +197,23 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
         disposables.add(
             treeView.onDidCollapseItem(item => this._proxy.$setExpanded(treeViewId, item.handle, false))
         );
-        disposables.add(
-            treeView.onDidChangeSelectionAndFocus(items => this._proxy.$setSelectionAndFocus(treeViewId, ( items.selection.map((
+        disposables.add(treeView.onDidChangeSelectionAndFocus(
+            items => this._proxy.$setSelectionAndFocus(treeViewId, items.selection.map((
                 {
                     handle
                 }
-            ) => handle)), items.focus.handle))
-        );
+            ) => handle), items.focus.handle)
+        ));
         disposables.add(
             treeView.onDidChangeVisibility(isVisible => this._proxy.$setVisible(treeViewId, isVisible))
         );
         disposables.add(treeView.onDidChangeCheckboxState(items => {
-            this._proxy.$changeCheckboxState(treeViewId, ( items.map(item => {
+            this._proxy.$changeCheckboxState(treeViewId, items.map(item => {
                 return {
                     treeItemHandle: item.handle,
                     newState: item.checkbox?.isChecked ?? false
                 };
-            })));
+            }));
         }));
     }
     getTreeView(treeViewId) {
@@ -280,7 +280,9 @@ class TreeViewDragAndDropController {
         }
         const additionalDataTransfer = ( new VSDataTransfer());
         additionalDataTransferDTO.items.forEach(([type, item]) => {
-            const value = type === Mimes.uriList && item.uriListData ? UriList.create(( item.uriListData.map(part => typeof part === "string" ? part : URI.revive(part)))) : item.asString;
+            const value = type === Mimes.uriList && item.uriListData ? UriList.create(
+                item.uriListData.map(part => typeof part === "string" ? part : URI.revive(part))
+            ) : item.asString;
             additionalDataTransfer.replace(type, createStringDataTransferItem(value));
         });
         return additionalDataTransfer;
@@ -305,7 +307,10 @@ class TreeViewDataProvider {
         if (!treeItems) {
             this.itemsMap.clear();
         }
-        return this._proxy.$getChildren(this.treeViewId, treeItems ? ( treeItems.map(item => item.handle)) : undefined).then(children => {
+        return this._proxy.$getChildren(
+            this.treeViewId,
+            treeItems ? treeItems.map(item => item.handle) : undefined
+        ).then(children => {
             const convertedChildren = this.convertTransferChildren(treeItems ?? [], children);
             return this.postGetChildren(convertedChildren);
         }, err => {

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

@@ -1,5 +1,5 @@
 import { MainThreadTunnelServiceShape, CandidatePortSource, PortAttributesSelector, TunnelDto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IRemoteExplorerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteExplorerService.service";
 import { TunnelProviderFeatures, TunnelOptions, ProvidedPortAttributes, PortAttributesProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel";
 import { ITunnelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service";

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ExtHostContext, CandidatePortSource, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { TunnelDtoConverter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTunnelService';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_OUTPUT, PortsEnablement, PORT_AUTO_SOURCE_SETTING_HYBRID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteExplorerService';
 import { IRemoteExplorerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
 import { TunnelProtocol } from '@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel';
@@ -83,13 +83,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
         if (this.portsAttributesProviders.size === 0) {
             return [];
         }
-        const appropriateHandles = ( Array.from(this.portsAttributesProviders.entries()).filter(entry => {
+        const appropriateHandles = Array.from(this.portsAttributesProviders.entries()).filter(entry => {
             const selector = entry[1];
             const portRange = (typeof selector.portRange === "number") ? [selector.portRange, selector.portRange + 1] : selector.portRange;
             const portInRange = portRange ? ( ports.some(port => portRange[0] <= port && port < portRange[1])) : true;
             const commandMatches = !selector.commandPattern || (commandLine && (commandLine.match(selector.commandPattern)));
             return portInRange && commandMatches;
-        }).map(entry => entry[0]));
+        }).map(entry => entry[0]);
         if (appropriateHandles.length === 0) {
             return [];
         }
@@ -116,13 +116,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            3038,
+            5009,
             "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(3039, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(5010, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 this.elevateionRetry = true;
                 await this.remoteExplorerService.close({
@@ -147,7 +147,7 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
         return this.remoteExplorerService.close(remote, TunnelCloseReason.Other);
     }
     async $getTunnels() {
-        return ( (await this.tunnelService.tunnels).map(tunnel => {
+        return (await this.tunnelService.tunnels).map(tunnel => {
             return {
                 remoteAddress: {
                     port: tunnel.tunnelRemotePort,
@@ -157,7 +157,7 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
                 privacy: tunnel.privacy,
                 protocol: tunnel.protocol
             };
-        }));
+        });
     }
     async $onFoundNewCandidates(candidates) {
         this.remoteExplorerService.onFoundNewCandidates(candidates);

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

@@ -8,7 +8,7 @@ import { MainThreadUriOpenersShape } from "@codingame/monaco-vscode-api/vscode/v
 import { IExternalOpenerProvider, IExternalUriOpener } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService";
 import { IExternalUriOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 export declare class MainThreadUriOpeners extends Disposable implements MainThreadUriOpenersShape, IExternalOpenerProvider {
     private readonly extensionService;
     private readonly openerService;

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

@@ -16,7 +16,7 @@ import { defaultExternalUriOpenerId } from '@codingame/monaco-vscode-api/vscode/
 import { ContributedExternalUriOpenersStore } from '../../contrib/externalUriOpener/common/contributedOpeners.js';
 import { IExternalUriOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
@@ -63,7 +63,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                     }, token);
                 } catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action("default", ( localize(3040, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(5011, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId
@@ -72,7 +72,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(3041, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(5012, "Could not open uri with '{0}': {1}", id, (e.toString()))),
                             actions: {
                                 primary: [openDefaultAction]
                             }

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

@@ -1,5 +1,5 @@
 import { MainThreadUrlsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IURLService } from "@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service";
 import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IExtensionUrlHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler.service';

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

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 export declare class MainThreadWebviewManager extends Disposable {
     constructor(context: IExtHostContext, instantiationService: IInstantiationService);
 }

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

@@ -7,7 +7,7 @@ import { MainThreadWebviewPanels } from './mainThreadWebviewPanels.js';
 import { MainThreadWebviews } from './mainThreadWebviews.js';
 import { MainThreadWebviewsViews } from './mainThreadWebviewViews.js';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { MainThreadChatOutputRenderer } from './mainThreadChatOutputRenderer.js';
 
 let MainThreadWebviewManager = class MainThreadWebviewManager extends Disposable {

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

@@ -7,7 +7,7 @@ import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs
 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 { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { MainThreadWebviews } from "./mainThreadWebviews.js";
 export declare class MainThreadWebviewPanels extends Disposable implements extHostProtocol.MainThreadWebviewPanelsShape {

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

@@ -4,7 +4,7 @@ import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IViewBadge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
 import { IWebviewViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewView/browser/webviewViewService.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 export declare class MainThreadWebviewsViews extends Disposable implements extHostProtocol.MainThreadWebviewViewsShape {
     private readonly mainThreadWebviews;
     private readonly _telemetryService;

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

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IWebview, WebviewContentOptions, WebviewExtensionDescription } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadWebviews extends Disposable implements extHostProtocol.MainThreadWebviewsShape {
     private readonly _openerService;

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

@@ -118,7 +118,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
                 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
                 <meta http-equiv="Content-Security-Policy" content="default-src 'none';">
             </head>
-            <body>${( localize(3042, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(5013, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };
@@ -135,7 +135,7 @@ function reviveWebviewContentOptions(webviewOptions) {
         allowForms: webviewOptions.enableForms,
         forwardUntrustedKeypressEvents: true,
         enableCommandUris: webviewOptions.enableCommandUris,
-        localResourceRoots: Array.isArray(webviewOptions.localResourceRoots) ? ( webviewOptions.localResourceRoots.map(r => URI.revive(r))) : undefined,
+        localResourceRoots: Array.isArray(webviewOptions.localResourceRoots) ? webviewOptions.localResourceRoots.map(r => URI.revive(r)) : undefined,
         portMapping: webviewOptions.portMapping
     };
 }

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

@@ -1,6 +1,6 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IOpenUriOptions, MainThreadWindowShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IUserActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service";

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

@@ -4,7 +4,7 @@ import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event'
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IUserActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service';

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

@@ -12,7 +12,7 @@ import { WorkspaceTrustRequestOptions } from "@codingame/monaco-vscode-api/vscod
 import { IWorkspaceTrustRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/queryBuilder";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IPatternInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search";