@codingame/monaco-vscode-extensions-service-override 23.3.0 → 24.1.1

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { DisposableStore, MutableDisposable, combinedDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, toDisposable, 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 { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -9,7 +9,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { TerminalLocation, TerminalExitReason, ProcessPropertyType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { TerminalDataBufferer } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminalDataBuffering';
 import { ITerminalService, ITerminalGroupService, ITerminalEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { TerminalProcessExtHostProxy } from '@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
+import { TerminalProcessExtHostProxy } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
 import { IEnvironmentVariableService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/environmentVariable.service';
 import { serializeEnvironmentVariableCollection, deserializeEnvironmentDescriptionMap, deserializeEnvironmentVariableCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariableShared';
 import { ITerminalProfileResolverService, ITerminalProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
@@ -17,14 +17,16 @@ import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 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 { TerminalQuickFixType } from '@codingame/monaco-vscode-api/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-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-api/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';
+import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
-let MainThreadTerminalService = class MainThreadTerminalService {
+let MainThreadTerminalService = class MainThreadTerminalService extends Disposable {
     constructor(_extHostContext, _terminalService, _terminalLinkProviderService, _terminalQuickFixService, _instantiationService, _environmentVariableService, _logService, _terminalProfileResolverService, remoteAgentService, _terminalGroupService, _terminalEditorService, _terminalProfileService, _terminalCompletionService, _environmentService) {
+        super();
         this._terminalService = _terminalService;
         this._terminalLinkProviderService = _terminalLinkProviderService;
         this._terminalQuickFixService = _terminalQuickFixService;
@@ -37,31 +39,30 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         this._terminalProfileService = _terminalProfileService;
         this._terminalCompletionService = _terminalCompletionService;
         this._environmentService = _environmentService;
-        this._store = ( new DisposableStore());
         this._extHostTerminals = ( new Map());
         this._terminalProcessProxies = ( new Map());
         this._profileProviders = ( new Map());
         this._completionProviders = ( new Map());
         this._quickFixProviders = ( new Map());
-        this._dataEventTracker = ( new MutableDisposable());
-        this._sendCommandEventListener = ( new MutableDisposable());
-        this._linkProvider = this._store.add(( new MutableDisposable()));
+        this._dataEventTracker = this._register(( new MutableDisposable()));
+        this._sendCommandEventListener = this._register(( new MutableDisposable()));
+        this._linkProvider = this._register(( new MutableDisposable()));
         this._os = OS;
         this._proxy = ( _extHostContext.getProxy(ExtHostContext.ExtHostTerminalService));
-        this._store.add(_terminalService.onDidCreateInstance((instance) => {
+        this._register(_terminalService.onDidCreateInstance((instance) => {
             this._onTerminalOpened(instance);
             this._onInstanceDimensionsChanged(instance);
         }));
-        this._store.add(_terminalService.onDidDisposeInstance(instance => this._onTerminalDisposed(instance)));
-        this._store.add(_terminalService.onAnyInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
-        this._store.add(_terminalService.onDidChangeInstanceDimensions(instance => this._onInstanceDimensionsChanged(instance)));
-        this._store.add(_terminalService.onAnyInstanceMaximumDimensionsChange(instance => this._onInstanceMaximumDimensionsChanged(instance)));
-        this._store.add(_terminalService.onDidRequestStartExtensionTerminal(e => this._onRequestStartExtensionTerminal(e)));
-        this._store.add(_terminalService.onDidChangeActiveInstance(instance => this._onActiveTerminalChanged(instance ? instance.instanceId : null)));
-        this._store.add(_terminalService.onAnyInstanceTitleChange(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
-        this._store.add(_terminalService.onAnyInstanceDataInput(instance => this._proxy.$acceptTerminalInteraction(instance.instanceId)));
-        this._store.add(_terminalService.onAnyInstanceSelectionChange(instance => this._proxy.$acceptTerminalSelection(instance.instanceId, instance.selection)));
-        this._store.add(_terminalService.onAnyInstanceShellTypeChanged(instance => this._onShellTypeChanged(instance.instanceId)));
+        this._register(_terminalService.onDidDisposeInstance(instance => this._onTerminalDisposed(instance)));
+        this._register(_terminalService.onAnyInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
+        this._register(_terminalService.onDidChangeInstanceDimensions(instance => this._onInstanceDimensionsChanged(instance)));
+        this._register(_terminalService.onAnyInstanceMaximumDimensionsChange(instance => this._onInstanceMaximumDimensionsChanged(instance)));
+        this._register(_terminalService.onDidRequestStartExtensionTerminal(e => this._onRequestStartExtensionTerminal(e)));
+        this._register(_terminalService.onDidChangeActiveInstance(instance => this._onActiveTerminalChanged(instance ? instance.instanceId : null)));
+        this._register(_terminalService.onAnyInstanceTitleChange(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
+        this._register(_terminalService.onAnyInstanceDataInput(instance => this._proxy.$acceptTerminalInteraction(instance.instanceId)));
+        this._register(_terminalService.onAnyInstanceSelectionChange(instance => this._proxy.$acceptTerminalSelection(instance.instanceId, instance.selection)));
+        this._register(_terminalService.onAnyInstanceShellTypeChanged(instance => this._onShellTypeChanged(instance.instanceId)));
         for (const instance of this._terminalService.instances) {
             this._onTerminalOpened(instance);
             instance.processReady.then(() => this._onTerminalProcessIdReady(instance));
@@ -80,20 +81,26 @@ let MainThreadTerminalService = class MainThreadTerminalService {
             }));
             this._proxy.$initEnvironmentVariableCollections(serializedCollections);
         }
+        this._store.add(toDisposable(() => {
+            for (const e of ( this._terminalProcessProxies.values())) {
+                e.proxy.dispose();
+                e.store.dispose();
+            }
+            this._terminalProcessProxies.clear();
+        }));
         remoteAgentService.getEnvironment().then(async (env) => {
             this._os = env?.os || OS;
             this._updateDefaultProfile();
         });
-        this._store.add(this._terminalProfileService.onDidChangeAvailableProfiles(() => this._updateDefaultProfile()));
-    }
-    dispose() {
-        this._store.dispose();
-        for (const provider of ( this._profileProviders.values())) {
-            provider.dispose();
-        }
-        for (const provider of ( this._quickFixProviders.values())) {
-            provider.dispose();
-        }
+        this._register(this._terminalProfileService.onDidChangeAvailableProfiles(() => this._updateDefaultProfile()));
+        this._register(toDisposable(() => {
+            for (const provider of ( this._profileProviders.values())) {
+                provider.dispose();
+            }
+            for (const provider of ( this._quickFixProviders.values())) {
+                provider.dispose();
+            }
+        }));
     }
     async _updateDefaultProfile() {
         const remoteAuthority = this._environmentService.remoteAuthority;
@@ -141,12 +148,12 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         });
         this._extHostTerminals.set(extHostTerminalId, terminal);
         const terminalInstance = await terminal;
-        this._store.add(terminalInstance.onDisposed(() => {
+        this._register(terminalInstance.onDisposed(() => {
             this._extHostTerminals.delete(extHostTerminalId);
         }));
     }
     async _deserializeParentTerminal(location) {
-        if (typeof location === 'object' && 'parentTerminal' in location) {
+        if (typeof location === 'object' && hasKey(location, { parentTerminal: true })) {
             const parentTerminal = await this._extHostTerminals.get(( location.parentTerminal.toString()));
             return parentTerminal ? { parentTerminal } : undefined;
         }
@@ -179,7 +186,7 @@ let MainThreadTerminalService = class MainThreadTerminalService {
         await instance?.sendText(text, shouldExecute);
     }
     $sendProcessExit(terminalId, exitCode) {
-        this._terminalProcessProxies.get(terminalId)?.emitExit(exitCode);
+        this._terminalProcessProxies.get(terminalId)?.proxy.emitExit(exitCode);
     }
     $startSendingDataEvents() {
         if (!this._dataEventTracker.value) {
@@ -327,6 +334,12 @@ let MainThreadTerminalService = class MainThreadTerminalService {
     }
     _onTerminalDisposed(terminalInstance) {
         this._proxy.$acceptTerminalClosed(terminalInstance.instanceId, terminalInstance.exitCode, terminalInstance.exitReason ?? TerminalExitReason.Unknown);
+        const proxy = this._terminalProcessProxies.get(terminalInstance.instanceId);
+        if (proxy) {
+            proxy.proxy.dispose();
+            proxy.store.dispose();
+            this._terminalProcessProxies.delete(terminalInstance.instanceId);
+        }
     }
     _onTerminalOpened(terminalInstance) {
         const extHostTerminalId = terminalInstance.shellLaunchConfig.extHostTerminalId;
@@ -355,29 +368,30 @@ let MainThreadTerminalService = class MainThreadTerminalService {
     }
     _onRequestStartExtensionTerminal(request) {
         const proxy = request.proxy;
-        this._terminalProcessProxies.set(proxy.instanceId, proxy);
+        const store = ( new DisposableStore());
+        this._terminalProcessProxies.set(proxy.instanceId, { proxy, store });
         const initialDimensions = request.cols && request.rows ? {
             columns: request.cols,
             rows: request.rows
         } : undefined;
         this._proxy.$startExtensionTerminal(proxy.instanceId, initialDimensions).then(request.callback);
-        proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.instanceId, data));
-        proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.instanceId, immediate));
-        proxy.onRequestCwd(() => this._proxy.$acceptProcessRequestCwd(proxy.instanceId));
-        proxy.onRequestInitialCwd(() => this._proxy.$acceptProcessRequestInitialCwd(proxy.instanceId));
+        store.add(proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.instanceId, data)));
+        store.add(proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.instanceId, immediate)));
+        store.add(proxy.onRequestCwd(() => this._proxy.$acceptProcessRequestCwd(proxy.instanceId)));
+        store.add(proxy.onRequestInitialCwd(() => this._proxy.$acceptProcessRequestInitialCwd(proxy.instanceId)));
     }
     $sendProcessData(terminalId, data) {
-        this._terminalProcessProxies.get(terminalId)?.emitData(data);
+        this._terminalProcessProxies.get(terminalId)?.proxy.emitData(data);
     }
     $sendProcessReady(terminalId, pid, cwd, windowsPty) {
-        this._terminalProcessProxies.get(terminalId)?.emitReady(pid, cwd, windowsPty);
+        this._terminalProcessProxies.get(terminalId)?.proxy.emitReady(pid, cwd, windowsPty);
     }
     $sendProcessProperty(terminalId, property) {
         if (property.type === ProcessPropertyType.Title) {
             const instance = this._terminalService.getInstanceFromId(terminalId);
             instance?.rename(property.value);
         }
-        this._terminalProcessProxies.get(terminalId)?.emitProcessProperty(property);
+        this._terminalProcessProxies.get(terminalId)?.proxy.emitProcessProperty(property);
     }
     $setEnvironmentVariableCollection(extensionIdentifier, persistent, collection, descriptionMap) {
         if (collection) {
@@ -450,11 +464,11 @@ function getOutputMatchForLines(lines, outputMatcher) {
 }
 function parseQuickFix(id, source, fix) {
     let type = TerminalQuickFixType.TerminalCommand;
-    if ('uri' in fix) {
+    if (hasKey(fix, { uri: true })) {
         fix.uri = URI.revive(fix.uri);
         type = TerminalQuickFixType.Opener;
     }
-    else if ('id' in fix) {
+    else if (hasKey(fix, { id: true })) {
         type = TerminalQuickFixType.VscodeCommand;
     }
     return { id, type, source, ...fix };

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-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-api/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';

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

@@ -7,10 +7,10 @@ import { WellDefinedPrefixTree } from '@codingame/monaco-vscode-api/vscode/vs/ba
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { TestCoverage } from '@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common/vscode/vs/workbench/contrib/testing/common/testCoverage';
+import { TestCoverage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testCoverage';
 import { TestId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testId';
 import { ITestProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
-import { LiveTestResult } from '@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common/vscode/vs/workbench/contrib/testing/common/testResult';
+import { LiveTestResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/testing/common/testResult';
 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';

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(
-            2521,
+            2535,
             "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(2522, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2536, "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.d.ts

@@ -5,7 +5,7 @@ import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { MainThreadUriOpenersShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IExternalOpenerProvider, IExternalUriOpener } from "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService";
+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";

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

@@ -10,7 +10,7 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { defaultExternalUriOpenerId } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
+import { defaultExternalUriOpenerId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 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';
@@ -52,7 +52,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 }
                 catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action('default', ( localize(2523, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action('default', ( localize(2537, "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(2524, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
+                            message: ( localize(2538, '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-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInput } from "@codingame/monaco-vscode-api/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";

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

@@ -8,10 +8,10 @@ import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 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 { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
-import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
-import { WebviewInput } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupsOrder, GroupLocation, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ACTIVE_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';

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

@@ -2,7 +2,7 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+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 * as extHostProtocol from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadWebviews extends Disposable implements extHostProtocol.MainThreadWebviewsShape {

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

@@ -104,7 +104,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(2525, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+			<body>${( localize(2539, "An error occurred while loading view: {0}", escape(viewType)))}</body>
 		</html>`;
     }
 };

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

@@ -79,11 +79,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2526, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2540, "Extension '{0}' added 1 folder to the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2527,
+                    2541,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -92,11 +92,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2528, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2542, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    2529,
+                    2543,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -104,7 +104,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(2530, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2544, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -49,7 +49,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                6284,
+                6409,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.js

@@ -3,8 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
-import { updateContributedOpeners } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
+import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
+import { updateContributedOpeners } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 var ContributedExternalUriOpenersStore_1;

package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js

@@ -140,11 +140,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
     }
     _showBisectPrompt() {
         const goodPrompt = {
-            label: ( localize(13695, "I can't reproduce")),
+            label: ( localize(13837, "I can't reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', false)
         };
         const badPrompt = {
-            label: ( localize(13696, "I can reproduce")),
+            label: ( localize(13838, "I can reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', true)
         };
         const stop = {
@@ -153,11 +153,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
         };
         const message = this._extensionBisectService.disabledCount === 1
             ? ( localize(
-            13697,
+            13839,
             "Extension Bisect is active and has disabled 1 extension. Check if you can still reproduce the problem and proceed by selecting from these options."
         ))
             : ( localize(
-            13698,
+            13840,
             "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
             this._extensionBisectService.disabledCount
         ));
@@ -175,7 +175,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.start',
-            title: ( localize2(13699, 'Start Extension Bisect')),
+            title: ( localize2(13841, 'Start Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ( ExtensionBisectUi.ctxIsBisectActive.negate()),
@@ -195,13 +195,13 @@ registerAction2(class extends Action2 {
         const extensionsBisect = accessor.get(IExtensionBisectService);
         const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => extensionEnablementService.isEnabled(ext));
         const res = await dialogService.confirm({
-            message: ( localize(13700, "Extension Bisect")),
+            message: ( localize(13842, "Extension Bisect")),
             detail: ( localize(
-                13701,
+                13843,
                 "Extension Bisect will use binary search to find an extension that causes a problem. During the process the window reloads repeatedly (~{0} times). Each time you must confirm if you are still seeing problems.",
                 2 + Math.log2(extensions.length) | 0
             )),
-            primaryButton: ( localize(13702, "&&Start Extension Bisect"))
+            primaryButton: ( localize(13844, "&&Start Extension Bisect"))
         });
         if (res.confirmed) {
             await extensionsBisect.start(extensions);
@@ -213,7 +213,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.next',
-            title: ( localize2(13703, 'Continue Extension Bisect')),
+            title: ( localize2(13845, 'Continue Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive
@@ -247,8 +247,8 @@ registerAction2(class extends Action2 {
             return;
         }
         if (done.bad) {
-            await dialogService.info(( localize(13704, "Extension Bisect")), ( localize(
-                13705,
+            await dialogService.info(( localize(13846, "Extension Bisect")), ( localize(
+                13847,
                 "Extension Bisect is done but no extension has been identified. This might be a problem with {0}.",
                 productService.nameShort
             )));
@@ -256,15 +256,15 @@ registerAction2(class extends Action2 {
         else {
             const res = await dialogService.confirm({
                 type: Severity.Info,
-                message: ( localize(13704, "Extension Bisect")),
-                primaryButton: ( localize(13706, "&&Report Issue & Continue")),
-                cancelButton: ( localize(13707, "Continue")),
+                message: ( localize(13846, "Extension Bisect")),
+                primaryButton: ( localize(13848, "&&Report Issue & Continue")),
+                cancelButton: ( localize(13849, "Continue")),
                 detail: ( localize(
-                    13708,
+                    13850,
                     "Extension Bisect is done and has identified {0} as the extension causing the problem.",
                     done.id
                 )),
-                checkbox: { label: ( localize(13709, "Keep this extension disabled")), checked: true }
+                checkbox: { label: ( localize(13851, "Keep this extension disabled")), checked: true }
             });
             if (res.checkboxChecked) {
                 await extensionEnablementService.disableExtension({ id: done.id }, undefined);
@@ -279,28 +279,28 @@ registerAction2(class extends Action2 {
     async _checkForBad(dialogService, bisectService) {
         const { result } = await dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(13710, "Extension Bisect")),
+            message: ( localize(13852, "Extension Bisect")),
             detail: ( localize(
-                13711,
+                13853,
                 "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
                 bisectService.disabledCount
             )),
             buttons: [
                 {
-                    label: ( localize(13712, "I ca&&n't reproduce")),
+                    label: ( localize(13854, "I ca&&n't reproduce")),
                     run: () => false
                 },
                 {
-                    label: ( localize(13713, "I can &&reproduce")),
+                    label: ( localize(13855, "I can &&reproduce")),
                     run: () => true
                 },
                 {
-                    label: ( localize(13714, "&&Stop Bisect")),
+                    label: ( localize(13856, "&&Stop Bisect")),
                     run: () => undefined
                 }
             ],
             cancelButton: {
-                label: ( localize(13715, "&&Cancel Bisect")),
+                label: ( localize(13857, "&&Cancel Bisect")),
                 run: () => null
             }
         });
@@ -311,7 +311,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.stop',
-            title: ( localize2(13716, 'Stop Extension Bisect')),
+            title: ( localize2(13858, 'Stop Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive

package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.d.ts

@@ -1,6 +1,6 @@
 import { ExtensionType, IExtension, IExtensionManifest } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IBuiltinExtensionsScannerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IScannedExtension, ScanOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement";
 import { IWebExtensionsScannerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";

package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ExtensionType, TargetPlatform, parseEnabledApiProposalNames } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IBuiltinExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IExtensionGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { isWeb, Language } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -50,12 +50,13 @@ function isGalleryExtensionInfo(obj) {
         && (galleryExtensionInfo.preRelease === undefined || typeof galleryExtensionInfo.preRelease === 'boolean')
         && (galleryExtensionInfo.migrateStorageFrom === undefined || typeof galleryExtensionInfo.migrateStorageFrom === 'string');
 }
-function isUriComponents(thing) {
-    if (!thing) {
+function isUriComponents(obj) {
+    if (!obj) {
         return false;
     }
-    return isString(thing.path) &&
-        isString(thing.scheme);
+    const thing = obj;
+    return typeof thing?.path === 'string' &&
+        typeof thing?.scheme === 'string';
 }
 let WebExtensionsScannerService = class WebExtensionsScannerService extends Disposable {
     constructor(environmentService, builtinExtensionsScannerService, fileService, logService, galleryService, extensionManifestPropertiesService, extensionResourceLoaderService, extensionStorageService, storageService, productService, userDataProfilesService, uriIdentityService, lifecycleService) {
@@ -605,7 +606,7 @@ let WebExtensionsScannerService = class WebExtensionsScannerService extends Disp
         }
         if (!this.extensionManifestPropertiesService.canExecuteOnWeb(manifest)) {
             throw ( new Error(( localize(
-                13731,
+                13873,
                 "Cannot add '{0}' because this extension is not a web extension.",
                 manifest.displayName || manifest.name
             ))));
@@ -889,7 +890,7 @@ if (isWeb) {
         constructor() {
             super({
                 id: 'workbench.extensions.action.openInstalledWebExtensionsResource',
-                title: ( localize2(13732, 'Open Installed Web Extensions Resource')),
+                title: ( localize2(13874, 'Open Installed Web Extensions Resource')),
                 category: Categories.Developer,
                 f1: true,
                 precondition: IsWebContext