@codingame/monaco-vscode-extensions-service-override 10.1.4 → 11.0.1

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

@@ -206,11 +206,11 @@ class MainThreadSCMProvider {
     get inputBoxTextModel() { return this._inputBoxTextModel; }
     get contextValue() { return this._providerId; }
     get acceptInputCommand() { return this.features.acceptInputCommand; }
-    get actionButton() { return this.features.actionButton ?? undefined; }
     get count() { return this._count; }
     get statusBarCommands() { return this._statusBarCommands; }
     get name() { return this._name ?? this._label; }
     get commitTemplate() { return this._commitTemplate; }
+    get actionButton() { return this._actionButton; }
     get historyProvider() { return this._historyProvider; }
     constructor(proxy, _handle, _providerId, _label, _rootUri, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
         this.proxy = proxy;
@@ -233,8 +233,7 @@ class MainThreadSCMProvider {
         this._count = observableValue(this, undefined);
         this._statusBarCommands = observableValue(this, undefined);
         this._commitTemplate = observableValue(this, '');
-        this._onDidChange = ( new Emitter());
-        this.onDidChange = this._onDidChange.event;
+        this._actionButton = observableValue(this, undefined);
         this.isSCM = true;
         this._historyProvider = observableValue(this, undefined);
         if (_rootUri) {
@@ -249,10 +248,12 @@ class MainThreadSCMProvider {
     }
     $updateSourceControl(features) {
         this.features = { ...this.features, ...features };
-        this._onDidChange.fire();
         if (typeof features.commitTemplate !== 'undefined') {
             this._commitTemplate.set(features.commitTemplate, undefined);
         }
+        if (typeof features.actionButton !== 'undefined') {
+            this._actionButton.set(features.actionButton, undefined);
+        }
         if (typeof features.count !== 'undefined') {
             this._count.set(features.count, undefined);
         }

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

@@ -16,7 +16,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( (new Promise((resolve, reject) => {
-            setTimeout(() => reject(( (new Error(( localize(4845, "Aborted onWillSaveTextDocument-event after 1750ms")))))), 1750);
+            setTimeout(() => reject(( (new Error(( localize(4876, "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/mainThreadTask.js

@@ -377,7 +377,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(4856, '{0}: {1}', source.label, task.name));
+        const label = ( localize(4887, '{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
@@ -499,9 +499,13 @@ let MainThreadTask = class MainThreadTask extends Disposable {
                             console.error(`Task System: can not convert task: ${JSON.stringify(dto.definition, undefined, 0)}. Task will be dropped`);
                         }
                     }
+                    const processedExtension = {
+                        ...value.extension,
+                        extensionLocation: URI.revive(value.extension.extensionLocation)
+                    };
                     return {
                         tasks,
-                        extension: value.extension
+                        extension: processedExtension
                     };
                 });
             },

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

@@ -74,7 +74,7 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
         const dataProvider = this._dataProviders.get(treeViewId);
         if (viewer && dataProvider) {
             const itemsToRefresh = dataProvider.dataProvider.getItemsToRefresh(itemsToRefreshByHandle);
-            return viewer.refresh(itemsToRefresh.length ? itemsToRefresh : undefined);
+            return viewer.refresh(itemsToRefresh.items.length ? itemsToRefresh.items : undefined, itemsToRefresh.checkboxes.length ? itemsToRefresh.checkboxes : undefined);
         }
         return Promise.resolve();
     }
@@ -249,19 +249,23 @@ class TreeViewDataProvider {
     }
     getItemsToRefresh(itemsToRefreshByHandle) {
         const itemsToRefresh = [];
+        const checkboxesToRefresh = [];
         if (itemsToRefreshByHandle) {
-            for (const treeItemHandle of ( Object.keys(itemsToRefreshByHandle))) {
-                const currentTreeItem = this.getItem(treeItemHandle);
+            for (const newTreeItemHandle of ( Object.keys(itemsToRefreshByHandle))) {
+                const currentTreeItem = this.getItem(newTreeItemHandle);
                 if (currentTreeItem) {
-                    const treeItem = itemsToRefreshByHandle[treeItemHandle];
-                    this.updateTreeItem(currentTreeItem, treeItem);
-                    if (treeItemHandle === treeItem.handle) {
+                    const newTreeItem = itemsToRefreshByHandle[newTreeItemHandle];
+                    if (currentTreeItem.checkbox?.isChecked !== newTreeItem.checkbox?.isChecked) {
+                        checkboxesToRefresh.push(currentTreeItem);
+                    }
+                    this.updateTreeItem(currentTreeItem, newTreeItem);
+                    if (newTreeItemHandle === newTreeItem.handle) {
                         itemsToRefresh.push(currentTreeItem);
                     }
                     else {
-                        this.itemsMap.delete(treeItemHandle);
+                        this.itemsMap.delete(newTreeItemHandle);
                         this.itemsMap.set(currentTreeItem.handle, currentTreeItem);
-                        const parent = treeItem.parentHandle ? this.itemsMap.get(treeItem.parentHandle) : null;
+                        const parent = newTreeItem.parentHandle ? this.itemsMap.get(newTreeItem.parentHandle) : null;
                         if (parent) {
                             itemsToRefresh.push(parent);
                         }
@@ -269,7 +273,7 @@ class TreeViewDataProvider {
                 }
             }
         }
-        return itemsToRefresh;
+        return { items: itemsToRefresh, checkboxes: checkboxesToRefresh };
     }
     getItem(treeItemHandle) {
         return this.itemsMap.get(treeItemHandle);

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

@@ -111,13 +111,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity$1.Info, ( localize(
-            4857,
+            4888,
             "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(4858, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(4889, "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

@@ -51,7 +51,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 }
                 catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( (new Action('default', ( localize(4847, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( (new Action('default', ( localize(4878, "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 {
                         this.notificationService.notify({
                             severity: Severity$1.Error,
                             message: ( localize(
-                                4848,
+                                4879,
                                 'Could not open uri with \'{0}\': {1}',
                                 id,
                                  (e.toString())

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

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

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

@@ -76,11 +76,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(4849, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(4880, "Extension '{0}' added 1 folder to the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    4850,
+                    4881,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -89,11 +89,11 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(4851, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(4882, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             }
             else {
                 message = ( localize(
-                    4852,
+                    4883,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -101,7 +101,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(4853, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(4884, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

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

@@ -46,7 +46,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
             }
         }));
         this._register(extensionService.onWillStop(e => {
-            e.veto(true, ( localize(11400, "A custom text editor for '{0}' is open.", this.resource.path)));
+            e.veto(true, ( localize(11520, "A custom text editor for '{0}' is open.", this.resource.path)));
         }));
     }
     get resource() {

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

@@ -138,11 +138,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
     }
     _showBisectPrompt() {
         const goodPrompt = {
-            label: ( localize(1154, "I can't reproduce")),
+            label: ( localize(1150, "I can't reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', false)
         };
         const badPrompt = {
-            label: ( localize(1155, "I can reproduce")),
+            label: ( localize(1151, "I can reproduce")),
             run: () => this._commandService.executeCommand('extension.bisect.next', true)
         };
         const stop = {
@@ -151,11 +151,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
         };
         const message = this._extensionBisectService.disabledCount === 1
             ? ( localize(
-            1156,
+            1152,
             "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(
-            1157,
+            1153,
             "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
         ));
@@ -173,7 +173,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.start',
-            title: ( localize2(1158, 'Start Extension Bisect')),
+            title: ( localize2(1154, 'Start Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ( (ExtensionBisectUi.ctxIsBisectActive.negate())),
@@ -193,13 +193,13 @@ registerAction2(class extends Action2 {
         const extensionsBisect = accessor.get(IExtensionBisectService);
         const extensions = (await extensionManagement.getInstalled(1 )).filter(ext => extensionEnablementService.isEnabled(ext));
         const res = await dialogService.confirm({
-            message: ( localize(1159, "Extension Bisect")),
+            message: ( localize(1155, "Extension Bisect")),
             detail: ( localize(
-                1160,
+                1156,
                 "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(1161, "&&Start Extension Bisect"))
+            primaryButton: ( localize(1157, "&&Start Extension Bisect"))
         });
         if (res.confirmed) {
             await extensionsBisect.start(extensions);
@@ -211,7 +211,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.next',
-            title: ( localize2(1162, 'Continue Extension Bisect')),
+            title: ( localize2(1158, 'Continue Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive
@@ -245,8 +245,8 @@ registerAction2(class extends Action2 {
             return;
         }
         if (done.bad) {
-            await dialogService.info(( localize(1163, "Extension Bisect")), ( localize(
-                1164,
+            await dialogService.info(( localize(1159, "Extension Bisect")), ( localize(
+                1160,
                 "Extension Bisect is done but no extension has been identified. This might be a problem with {0}.",
                 productService.nameShort
             )));
@@ -254,15 +254,15 @@ registerAction2(class extends Action2 {
         else {
             const res = await dialogService.confirm({
                 type: Severity$1.Info,
-                message: ( localize(1163, "Extension Bisect")),
-                primaryButton: ( localize(1165, "&&Report Issue & Continue")),
-                cancelButton: ( localize(1166, "Continue")),
+                message: ( localize(1159, "Extension Bisect")),
+                primaryButton: ( localize(1161, "&&Report Issue & Continue")),
+                cancelButton: ( localize(1162, "Continue")),
                 detail: ( localize(
-                    1167,
+                    1163,
                     "Extension Bisect is done and has identified {0} as the extension causing the problem.",
                     done.id
                 )),
-                checkbox: { label: ( localize(1168, "Keep this extension disabled")), checked: true }
+                checkbox: { label: ( localize(1164, "Keep this extension disabled")), checked: true }
             });
             if (res.checkboxChecked) {
                 await extensionEnablementService.disableExtension({ id: done.id }, undefined);
@@ -277,28 +277,28 @@ registerAction2(class extends Action2 {
     async _checkForBad(dialogService, bisectService) {
         const { result } = await dialogService.prompt({
             type: Severity$1.Info,
-            message: ( localize(1169, "Extension Bisect")),
+            message: ( localize(1165, "Extension Bisect")),
             detail: ( localize(
-                1170,
+                1166,
                 "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(1171, "I ca&&n't reproduce")),
+                    label: ( localize(1167, "I ca&&n't reproduce")),
                     run: () => false
                 },
                 {
-                    label: ( localize(1172, "I can &&reproduce")),
+                    label: ( localize(1168, "I can &&reproduce")),
                     run: () => true
                 },
                 {
-                    label: ( localize(1173, "&&Stop Bisect")),
+                    label: ( localize(1169, "&&Stop Bisect")),
                     run: () => undefined
                 }
             ],
             cancelButton: {
-                label: ( localize(1174, "&&Cancel Bisect")),
+                label: ( localize(1170, "&&Cancel Bisect")),
                 run: () => null
             }
         });
@@ -309,7 +309,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'extension.bisect.stop',
-            title: ( localize2(1175, 'Stop Extension Bisect')),
+            title: ( localize2(1171, 'Stop Extension Bisect')),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js

@@ -59,7 +59,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         }
         COI.addSearchParam(suffixSearchParams, true, true);
         const suffix = `?${( suffixSearchParams.toString())}`;
-        const iframeModulePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.${'esm.' }html`;
+        const iframeModulePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html`;
         if (isWeb) {
             const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
             const commit = this._productService.commit;
@@ -140,12 +140,10 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 return rejectBarrier(81 , err);
             }
             if (event.data.type === 'vscode.bootstrap.nls') {
-                const baseUrl = undefined ;
                 iframe.contentWindow.postMessage({
                     type: event.data.type,
                     data: {
-                        baseUrl,
-                        workerUrl: ( ( FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorker.esm.js')).toString(true)) ,
+                        workerUrl: ( ( FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js')).toString(true)),
                         fileRoot: globalThis._VSCODE_FILE_ROOT,
                         nls: {
                             messages: getNLSMessages(),

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -165,19 +165,24 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         this._register(this._lifecycleService.onWillShutdown(event => {
             if (this._remoteAgentService.getConnection()) {
                 event.join(async () => {
-                    await this._remoteAgentService.endConnection();
-                    await this._doStopExtensionHosts();
-                    this._remoteAgentService.getConnection()?.dispose();
+                    try {
+                        await this._remoteAgentService.endConnection();
+                        await this._doStopExtensionHosts();
+                        this._remoteAgentService.getConnection()?.dispose();
+                    }
+                    catch {
+                        this._logService.warn('Error while disconnecting remote agent');
+                    }
                 }, {
                     id: 'join.disconnectRemote',
-                    label: ( localize(1141, "Disconnect Remote Agent")),
+                    label: ( localize(1137, "Disconnect Remote Agent")),
                     order: WillShutdownJoinerOrder.Last
                 });
             }
             else {
                 event.join(this._doStopExtensionHosts(), {
                     id: 'join.stopExtensionHosts',
-                    label: ( localize(1142, "Stopping Extension Hosts")),
+                    label: ( localize(1138, "Stopping Extension Hosts")),
                 });
             }
         }));
@@ -248,7 +253,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity$1.Error,
                 message: ( localize(
-                    1143,
+                    1139,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( (result.removedDueToLooping.map(e => `'${e.identifier.value}'`))).join(', ')
                 ))
@@ -402,7 +407,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity$1.Error,
                 message: ( localize(
-                    1143,
+                    1139,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( (result.removedDueToLooping.map(e => `'${e.identifier.value}'`))).join(', ')
                 ))
@@ -417,7 +422,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const extensionHostManager = this.findTestExtensionHost(this._environmentService.extensionTestsLocationURI);
         if (!extensionHostManager) {
             const msg = ( localize(
-                1144,
+                1140,
                 "No extension host found that can launch the test runner at {0}.",
                  (this._environmentService.extensionTestsLocationURI.toString())
             ));
@@ -587,7 +592,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                             vetoReasons.add(reason);
                         }
                     }).catch(error => {
-                        vetoReasons.add(( localize(1145, "{0} (Error: {1})", reason, toErrorMessage(error))));
+                        vetoReasons.add(( localize(1141, "{0} (Error: {1})", reason, toErrorMessage(error))));
                     });
                 }
             }
@@ -600,10 +605,10 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             if (!auto) {
                 const vetoReasonsArray = Array.from(vetoReasons);
                 this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
-                await this._dialogService.warn(( localize(1146, "The following operation was blocked: {0}", reason)), vetoReasonsArray.length === 1 ?
-                    ( localize(1147, "The reason for blocking the operation: {0}", vetoReasonsArray[0])) :
+                await this._dialogService.warn(( localize(1142, "The following operation was blocked: {0}", reason)), vetoReasonsArray.length === 1 ?
+                    ( localize(1143, "The reason for blocking the operation: {0}", vetoReasonsArray[0])) :
                     ( localize(
-                        1148,
+                        1144,
                         "The reasons for blocking the operation:\n- {0}",
                         vetoReasonsArray.join('\n -')
                     )));
@@ -701,15 +706,15 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._remoteCrashTracker.registerCrash();
             if (this._remoteCrashTracker.shouldAutomaticallyRestart()) {
                 this._logService.info(`Automatically restarting the remote extension host.`);
-                this._notificationService.status(( localize(1149, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
+                this._notificationService.status(( localize(1145, "The remote extension host terminated unexpectedly. Restarting...")), { hideAfter: 5000 });
                 this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys()))));
             }
             else {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    1150,
+                    1146,
                     "Remote Extension host terminated unexpectedly 3 times within the last 5 minutes."
                 )), [{
-                        label: ( localize(1151, "Restart Remote Extension Host")),
+                        label: ( localize(1147, "Restart Remote Extension Host")),
                         run: () => {
                             this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys()))));
                         }
@@ -1194,7 +1199,7 @@ class ActivationFeatureMarkdowneRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'activationEvents',
-    label: ( localize(1152, "Activation Events")),
+    label: ( localize(1148, "Activation Events")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -481,7 +481,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
     constructor() {
         super({
             id: 'editor.action.measureExtHostLatency',
-            title: ( localize2(4805, "Measure Extension Host Latency")),
+            title: ( localize2(4836, "Measure Extension Host Latency")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js

@@ -107,7 +107,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'enabledApiProposals',
-    label: ( localize(1153, "API Proposals")),
+    label: ( localize(1149, "API Proposals")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js

@@ -8,7 +8,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(systemExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                4806,
+                4837,
                 "Overwriting extension {0} with {1}.",
                 extension.extensionLocation.fsPath,
                 systemExtension.extensionLocation.fsPath
@@ -28,7 +28,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
             }
             else {
                 logService.warn(( localize(
-                    4806,
+                    4837,
                     "Overwriting extension {0} with {1}.",
                     extension.extensionLocation.fsPath,
                     userExtension.extensionLocation.fsPath
@@ -45,7 +45,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
         const extension = result.get(workspaceExtension.identifier);
         if (extension) {
             logService.warn(( localize(
-                4807,
+                4838,
                 "Overwriting {0} with Workspace Extension {1}.",
                 extension.extensionLocation.fsPath,
                 workspaceExtension.extensionLocation.fsPath
@@ -55,7 +55,7 @@ function dedupExtensions(system, user, workspace, development, logService) {
     });
     development.forEach(developedExtension => {
         logService.info(( localize(
-            4808,
+            4839,
             "Loading development extension at {0}",
             developedExtension.extensionLocation.fsPath
         )));