@codingame/monaco-vscode-extensions-service-override 7.1.0 → 8.0.0

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

@@ -5,7 +5,7 @@ import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -20,7 +20,6 @@ import { ActivationKind } from 'vscode/vscode/vs/workbench/services/extensions/c
 import { RPCProtocol, RequestInitiator } from 'vscode/vscode/vs/workbench/services/extensions/common/rpcProtocol';
 
 var ExtensionHostManager_1;
-const _moduleId = "vs/workbench/services/extensions/common/extensionHostManager";
 let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager extends Disposable {
     get pid() {
         return this._extensionHost.pid;
@@ -484,7 +483,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
     constructor() {
         super({
             id: 'editor.action.measureExtHostLatency',
-            title: ( localize2WithPath(_moduleId, 0, "Measure Extension Host Latency")),
+            title: ( localize2(5151, "Measure Extension Host Latency")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { allApiProposals } from 'vscode/vscode/vs/platform/extensions/common/extensionsApiProposals';
@@ -12,7 +12,6 @@ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/service
 import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 
-const _moduleId = "vs/workbench/services/extensions/common/extensionsProposedApi";
 let ExtensionsProposedApi = class ExtensionsProposedApi {
     constructor(_logService, _environmentService, productService) {
         this._logService = _logService;
@@ -90,10 +89,10 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
         this.type = 'markdown';
     }
     shouldRender(manifest) {
-        return !!manifest.enabledApiProposals?.length;
+        return !!manifest.originalEnabledApiProposals?.length || !!manifest.enabledApiProposals?.length;
     }
     render(manifest) {
-        const enabledApiProposals = manifest.enabledApiProposals || [];
+        const enabledApiProposals = manifest.originalEnabledApiProposals ?? manifest.enabledApiProposals ?? [];
         const data = ( (new MarkdownString()));
         if (enabledApiProposals.length) {
             for (const proposal of enabledApiProposals) {
@@ -108,7 +107,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'enabledApiProposals',
-    label: ( localizeWithPath(_moduleId, 0, "API Proposals")),
+    label: ( localize(1577, "API Proposals")),
     access: {
         canToggle: false
     },

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

@@ -1,16 +1,14 @@
 import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
 
-const _moduleId = "vs/workbench/services/extensions/common/extensionsUtil";
 function dedupExtensions(system, user, workspace, development, logService) {
     const result = ( (new ExtensionIdentifierMap()));
     system.forEach((systemExtension) => {
         const extension = result.get(systemExtension.identifier);
         if (extension) {
-            logService.warn(( localizeWithPath(
-                _moduleId,
-                0,
+            logService.warn(( localize(
+                5152,
                 "Overwriting extension {0} with {1}.",
                 extension.extensionLocation.fsPath,
                 systemExtension.extensionLocation.fsPath
@@ -29,9 +27,8 @@ function dedupExtensions(system, user, workspace, development, logService) {
                 userExtension.isBuiltin = true;
             }
             else {
-                logService.warn(( localizeWithPath(
-                    _moduleId,
-                    0,
+                logService.warn(( localize(
+                    5152,
                     "Overwriting extension {0} with {1}.",
                     extension.extensionLocation.fsPath,
                     userExtension.extensionLocation.fsPath
@@ -47,9 +44,8 @@ function dedupExtensions(system, user, workspace, development, logService) {
     workspace.forEach(workspaceExtension => {
         const extension = result.get(workspaceExtension.identifier);
         if (extension) {
-            logService.warn(( localizeWithPath(
-                _moduleId,
-                1,
+            logService.warn(( localize(
+                5153,
                 "Overwriting {0} with Workspace Extension {1}.",
                 extension.extensionLocation.fsPath,
                 workspaceExtension.extensionLocation.fsPath
@@ -58,9 +54,8 @@ function dedupExtensions(system, user, workspace, development, logService) {
         result.set(workspaceExtension.identifier, workspaceExtension);
     });
     development.forEach(developedExtension => {
-        logService.info(( localizeWithPath(
-            _moduleId,
-            2,
+        logService.info(( localize(
+            5154,
             "Loading development extension at {0}",
             developedExtension.extensionLocation.fsPath
         )));