@codingame/monaco-vscode-api 1.83.2 → 1.83.3

package/monaco-treemending.js

@@ -881,8 +881,14 @@ async function run() {
                     return;
                 }
                 try {
-                    await fs.mkdir(path.dirname(file), { recursive: true });
-                    await fs.writeFile(file, content);
+                    if (index.newHeader != null && Date.parse(index.newHeader) === 0) {
+                        // timestamp 0 means the field was removed
+                        await fs.unlink(file);
+                    }
+                    else {
+                        await fs.mkdir(path.dirname(file), { recursive: true });
+                        await fs.writeFile(file, content);
+                    }
                     callback(null);
                 }
                 catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.83.2",
+  "version": "1.83.3",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -47,6 +47,10 @@
       "types": "./monaco.d.ts",
       "default": "./monaco.js"
     },
+    "./l10n": {
+      "types": "./l10n.d.ts",
+      "default": "./l10n.js"
+    },
     "./vscode/*": {
       "default": "./vscode/src/*.js"
     }
@@ -71,6 +75,9 @@
       "lifecycle": [
         "./lifecycle.d.ts"
       ],
+      "l10n": [
+        "./l10n.d.ts"
+      ],
       "vscode/*": [
         "./vscode/src/*.d.ts"
       ]

package/service-override/extensions.js

@@ -47,10 +47,10 @@ import getServiceOverride$1 from './output.js';
 import { changeUrlDomain } from './tools/url.js';
 import { registerAssets } from '../assets.js';
 import { unsupported } from '../tools.js';
+import '../vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js';
 import '../vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js';
 import '../vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js';
-import '../vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js';
-import '../vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js';
+import '../vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js';
 import '../vscode/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js';
 import '../vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';

package/service-override/layout.js

@@ -171,11 +171,11 @@ class LayoutService {
                 let panelToOpen = this.paneCompositeService.getLastActivePaneCompositeId(location);
                 if (panelToOpen == null || !this.hasViews(panelToOpen)) {
                     panelToOpen = this.viewDescriptorService
-                        .getViewContainersByLocation(1 )
+                        .getViewContainersByLocation(location)
                         .find(viewContainer => this.hasViews(viewContainer.id))?.id;
                 }
                 if (panelToOpen != null) {
-                    void this.paneCompositeService.openPaneComposite(panelToOpen, 1 , true);
+                    void this.paneCompositeService.openPaneComposite(panelToOpen, location, true);
                 }
             }
             if (this.paneCompositeService.getPartByLocation != null) {

package/tools/l10n.js

@@ -0,0 +1,177 @@
+import { __decorate, __param } from '../external/tslib/tslib.es6.js';
+import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
+import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { localizeManifest } from '../vscode/src/vs/platform/extensionManagement/common/extensionNls.js';
+import { getParseErrorMessage } from '../vscode/src/vs/base/common/jsonErrorMessages.js';
+import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
+import { getBuiltInExtensionTranslationsUris } from '../l10n.js';
+let ExtensionManifestTranslator = class ExtensionManifestTranslator {
+    constructor(fileService, logService) {
+        this.fileService = fileService;
+        this.logService = logService;
+    }
+    async resolveOriginalMessageBundle(originalMessageBundle, errors) {
+        if (originalMessageBundle != null) {
+            try {
+                const originalBundleContent = ( (await this.fileService.readFile(originalMessageBundle)).value.toString());
+                return parse(originalBundleContent, errors);
+            }
+            catch (error) {
+            }
+        }
+        return undefined;
+    }
+    findMessageBundles(extensionLocation, nlsConfiguration) {
+        return new Promise((resolve) => {
+            const loop = (locale) => {
+                const toCheck = joinPath(extensionLocation, `package.nls.${locale}.json`);
+                void this.fileService.exists(toCheck).then(exists => {
+                    if (exists) {
+                        resolve({ localized: toCheck, original: joinPath(extensionLocation, 'package.nls.json') });
+                    }
+                    const index = locale.lastIndexOf('-');
+                    if (index === -1) {
+                        resolve({ localized: joinPath(extensionLocation, 'package.nls.json'), original: null });
+                    }
+                    else {
+                        locale = locale.substring(0, index);
+                        loop(locale);
+                    }
+                });
+            };
+            if (nlsConfiguration.devMode || nlsConfiguration.pseudo || nlsConfiguration.language == null) {
+                return resolve({ localized: joinPath(extensionLocation, 'package.nls.json'), original: null });
+            }
+            loop(nlsConfiguration.language);
+        });
+    }
+    formatMessage(extensionLocation, message) {
+        return `[${extensionLocation.path}]: ${message}`;
+    }
+    async translateManifest(extensionLocation, extensionManifest) {
+        const nlsConfiguration = {
+            devMode: false,
+            language: platform.language,
+            pseudo: platform.language === 'pseudo',
+            translations: getBuiltInExtensionTranslationsUris(platform.language) ?? {}
+        };
+        const localizedMessages = await this.getLocalizedMessages(extensionLocation, extensionManifest, nlsConfiguration);
+        if (localizedMessages != null) {
+            try {
+                const errors = [];
+                const defaults = await this.resolveOriginalMessageBundle(localizedMessages.default, errors);
+                if (errors.length > 0) {
+                    errors.forEach((error) => {
+                        this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                            'jsonsParseReportErrors',
+                            'Failed to parse {0}: {1}.',
+                            localizedMessages.default?.path,
+                            getParseErrorMessage(error.error)
+                        ))));
+                    });
+                    return extensionManifest;
+                }
+                else if (getNodeType(localizedMessages) !== 'object') {
+                    this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                        'jsonInvalidFormat',
+                        'Invalid format {0}: JSON object expected.',
+                        localizedMessages.default?.path
+                    ))));
+                    return extensionManifest;
+                }
+                const localized = localizedMessages.values ?? Object.create(null);
+                return localizeManifest(this.logService, extensionManifest, localized, defaults);
+            }
+            catch (error) {
+            }
+        }
+        return extensionManifest;
+    }
+    async getLocalizedMessages(extensionLocation, extensionManifest, nlsConfiguration) {
+        const defaultPackageNLS = joinPath(extensionLocation, 'package.nls.json');
+        const reportErrors = (localized, errors) => {
+            errors.forEach((error) => {
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                    'jsonsParseReportErrors',
+                    'Failed to parse {0}: {1}.',
+                    localized?.path,
+                    getParseErrorMessage(error.error)
+                ))));
+            });
+        };
+        const reportInvalidFormat = (localized) => {
+            this.logService.error(this.formatMessage(extensionLocation, ( localize(
+                'jsonInvalidFormat',
+                'Invalid format {0}: JSON object expected.',
+                localized?.path
+            ))));
+        };
+        const translationId = `${extensionManifest.publisher}.${extensionManifest.name}`;
+        const translationUri = nlsConfiguration.translations[translationId];
+        if (translationUri != null) {
+            try {
+                const translationResource = ( URI.parse(translationUri));
+                const content = ( (await this.fileService.readFile(translationResource)).value.toString());
+                const errors = [];
+                const translationBundle = parse(content, errors);
+                if (errors.length > 0) {
+                    reportErrors(translationResource, errors);
+                    return { values: undefined, default: defaultPackageNLS };
+                }
+                else if (getNodeType(translationBundle) !== 'object') {
+                    reportInvalidFormat(translationResource);
+                    return { values: undefined, default: defaultPackageNLS };
+                }
+                else {
+                    const values = translationBundle.contents?.package;
+                    return { values, default: defaultPackageNLS };
+                }
+            }
+            catch (error) {
+                return { values: undefined, default: defaultPackageNLS };
+            }
+        }
+        else {
+            const exists = await this.fileService.exists(defaultPackageNLS);
+            if (!exists) {
+                return undefined;
+            }
+            let messageBundle;
+            try {
+                messageBundle = await this.findMessageBundles(extensionLocation, nlsConfiguration);
+            }
+            catch (error) {
+                return undefined;
+            }
+            if (messageBundle.localized == null) {
+                return { values: undefined, default: messageBundle.original };
+            }
+            try {
+                const messageBundleContent = ( (await this.fileService.readFile(messageBundle.localized)).value.toString());
+                const errors = [];
+                const messages = parse(messageBundleContent, errors);
+                if (errors.length > 0) {
+                    reportErrors(messageBundle.localized, errors);
+                    return { values: undefined, default: messageBundle.original };
+                }
+                else if (getNodeType(messages) !== 'object') {
+                    reportInvalidFormat(messageBundle.localized);
+                    return { values: undefined, default: messageBundle.original };
+                }
+                return { values: messages, default: messageBundle.original };
+            }
+            catch (error) {
+                return { values: undefined, default: messageBundle.original };
+            }
+        }
+    }
+};
+ExtensionManifestTranslator = __decorate([
+    ( __param(0, IFileService)),
+    ( __param(1, ILogService))
+], ExtensionManifestTranslator);
+export { ExtensionManifestTranslator };

package/tools.js

@@ -17,4 +17,25 @@ function memoizedConstructor(ctor) {
         })
     });
 }
-export { memoized, memoizedConstructor, unsupported };
+async function sleep(duration) {
+    await new Promise(resolve => setTimeout(resolve, duration));
+}
+function throttle(fct, merge, delay) {
+    let lastPromise = Promise.resolve();
+    let toConsume = null;
+    return async (param) => {
+        if (toConsume == null) {
+            toConsume = param;
+            lastPromise = lastPromise.then(async () => sleep(delay)).then(async () => {
+                const _toConsume = toConsume;
+                toConsume = null;
+                await fct(_toConsume);
+            });
+        }
+        else {
+            toConsume = merge(toConsume, param);
+        }
+        await lastPromise;
+    };
+}
+export { memoized, memoizedConstructor, sleep, throttle, unsupported };

package/vscode/src/vs/base/browser/ui/menu/menubar.js

@@ -216,7 +216,7 @@ class MenuBar extends Disposable {
         });
     }
     createOverflowMenu() {
-        const label = this.isCompact ? ( nls.localize('mAppMenu', 'Application Menu')) : ( nls.localize('mMore', 'More'));
+        const label = this.isCompact ? nls.localizeWithPath('vs/base/browser/ui/menu/menubar', 'mAppMenu', 'Application Menu') : nls.localizeWithPath('vs/base/browser/ui/menu/menubar', 'mMore', 'More');
         const buttonElement = $('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': this.isCompact ? 0 : -1, 'aria-label': label, 'aria-haspopup': true });
         const titleElement = $('div.menubar-menu-title.toolbar-toggle-more' + ThemeIcon.asCSSSelector(Codicon.menuBarMore), { 'role': 'none', 'aria-hidden': true });
         buttonElement.appendChild(titleElement);

package/vscode/src/vs/base/browser/ui/splitview/paneview.js

@@ -8,7 +8,7 @@ import { Color, RGBA } from 'monaco-editor/esm/vs/base/common/color.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import './paneview.css.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { SplitView, Sizing } from 'monaco-editor/esm/vs/base/browser/ui/splitview/splitview.js';
 class Pane extends Disposable {
     static { this.HEADER_SIZE = 22; }
@@ -77,7 +77,7 @@ class Pane extends Disposable {
         this.orthogonalSize = 0;
         this._expanded = typeof options.expanded === 'undefined' ? true : !!options.expanded;
         this._orientation = typeof options.orientation === 'undefined' ? 0  : options.orientation;
-        this._ariaHeaderLabel = ( localize('viewSection', "{0} Section", options.title));
+        this._ariaHeaderLabel = localizeWithPath('vs/base/browser/ui/splitview/paneview', 'viewSection', "{0} Section", options.title);
         this._minimumBodySize = typeof options.minimumBodySize === 'number' ? options.minimumBodySize : this._orientation === 1  ? 200 : 120;
         this._maximumBodySize = typeof options.maximumBodySize === 'number' ? options.maximumBodySize : Number.POSITIVE_INFINITY;
         this.element = $('.pane');

package/vscode/src/vs/base/common/date.js

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 const minute = 60;
 const hour = minute * 60;
 const day = hour * 24;
@@ -11,10 +11,10 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
     }
     const seconds = Math.round((( new Date()).getTime() - date) / 1000);
     if (seconds < -30) {
-        return ( localize('date.fromNow.in', 'in {0}', fromNow(( new Date()).getTime() + seconds * 1000, false)));
+        return localizeWithPath('vs/base/common/date', 'date.fromNow.in', 'in {0}', fromNow(( new Date()).getTime() + seconds * 1000, false));
     }
     if (!disallowNow && seconds < 30) {
-        return ( localize('date.fromNow.now', 'now'));
+        return localizeWithPath('vs/base/common/date', 'date.fromNow.now', 'now');
     }
     let value;
     if (seconds < minute) {
@@ -22,25 +22,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.seconds.singular.ago.fullWord', '{0} second ago', value))
-                    : ( localize('date.fromNow.seconds.singular.ago', '{0} sec ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.singular.ago.fullWord', '{0} second ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.singular.ago', '{0} sec ago', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.seconds.plural.ago.fullWord', '{0} seconds ago', value))
-                    : ( localize('date.fromNow.seconds.plural.ago', '{0} secs ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.plural.ago.fullWord', '{0} seconds ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.plural.ago', '{0} secs ago', value);
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.seconds.singular.fullWord', '{0} second', value))
-                    : ( localize('date.fromNow.seconds.singular', '{0} sec', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.singular.fullWord', '{0} second', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.singular', '{0} sec', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.seconds.plural.fullWord', '{0} seconds', value))
-                    : ( localize('date.fromNow.seconds.plural', '{0} secs', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.plural.fullWord', '{0} seconds', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.seconds.plural', '{0} secs', value);
             }
         }
     }
@@ -49,25 +49,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.minutes.singular.ago.fullWord', '{0} minute ago', value))
-                    : ( localize('date.fromNow.minutes.singular.ago', '{0} min ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.singular.ago.fullWord', '{0} minute ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.singular.ago', '{0} min ago', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.minutes.plural.ago.fullWord', '{0} minutes ago', value))
-                    : ( localize('date.fromNow.minutes.plural.ago', '{0} mins ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.plural.ago.fullWord', '{0} minutes ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.plural.ago', '{0} mins ago', value);
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.minutes.singular.fullWord', '{0} minute', value))
-                    : ( localize('date.fromNow.minutes.singular', '{0} min', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.singular.fullWord', '{0} minute', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.singular', '{0} min', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.minutes.plural.fullWord', '{0} minutes', value))
-                    : ( localize('date.fromNow.minutes.plural', '{0} mins', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.plural.fullWord', '{0} minutes', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.minutes.plural', '{0} mins', value);
             }
         }
     }
@@ -76,25 +76,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.hours.singular.ago.fullWord', '{0} hour ago', value))
-                    : ( localize('date.fromNow.hours.singular.ago', '{0} hr ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.hours.singular.ago.fullWord', '{0} hour ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.hours.singular.ago', '{0} hr ago', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.hours.plural.ago.fullWord', '{0} hours ago', value))
-                    : ( localize('date.fromNow.hours.plural.ago', '{0} hrs ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.hours.plural.ago.fullWord', '{0} hours ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.hours.plural.ago', '{0} hrs ago', value);
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.hours.singular.fullWord', '{0} hour', value))
-                    : ( localize('date.fromNow.hours.singular', '{0} hr', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.hours.singular.fullWord', '{0} hour', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.hours.singular', '{0} hr', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.hours.plural.fullWord', '{0} hours', value))
-                    : ( localize('date.fromNow.hours.plural', '{0} hrs', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.hours.plural.fullWord', '{0} hours', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.hours.plural', '{0} hrs', value);
             }
         }
     }
@@ -102,13 +102,13 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         value = Math.floor(seconds / day);
         if (appendAgoLabel) {
             return value === 1
-                ? ( localize('date.fromNow.days.singular.ago', '{0} day ago', value))
-                : ( localize('date.fromNow.days.plural.ago', '{0} days ago', value));
+                ? localizeWithPath('vs/base/common/date', 'date.fromNow.days.singular.ago', '{0} day ago', value)
+                : localizeWithPath('vs/base/common/date', 'date.fromNow.days.plural.ago', '{0} days ago', value);
         }
         else {
             return value === 1
-                ? ( localize('date.fromNow.days.singular', '{0} day', value))
-                : ( localize('date.fromNow.days.plural', '{0} days', value));
+                ? localizeWithPath('vs/base/common/date', 'date.fromNow.days.singular', '{0} day', value)
+                : localizeWithPath('vs/base/common/date', 'date.fromNow.days.plural', '{0} days', value);
         }
     }
     if (seconds < month) {
@@ -116,25 +116,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.weeks.singular.ago.fullWord', '{0} week ago', value))
-                    : ( localize('date.fromNow.weeks.singular.ago', '{0} wk ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.singular.ago.fullWord', '{0} week ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.singular.ago', '{0} wk ago', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.weeks.plural.ago.fullWord', '{0} weeks ago', value))
-                    : ( localize('date.fromNow.weeks.plural.ago', '{0} wks ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.plural.ago.fullWord', '{0} weeks ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.plural.ago', '{0} wks ago', value);
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.weeks.singular.fullWord', '{0} week', value))
-                    : ( localize('date.fromNow.weeks.singular', '{0} wk', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.singular.fullWord', '{0} week', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.singular', '{0} wk', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.weeks.plural.fullWord', '{0} weeks', value))
-                    : ( localize('date.fromNow.weeks.plural', '{0} wks', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.plural.fullWord', '{0} weeks', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.weeks.plural', '{0} wks', value);
             }
         }
     }
@@ -143,25 +143,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.months.singular.ago.fullWord', '{0} month ago', value))
-                    : ( localize('date.fromNow.months.singular.ago', '{0} mo ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.months.singular.ago.fullWord', '{0} month ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.months.singular.ago', '{0} mo ago', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.months.plural.ago.fullWord', '{0} months ago', value))
-                    : ( localize('date.fromNow.months.plural.ago', '{0} mos ago', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.months.plural.ago.fullWord', '{0} months ago', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.months.plural.ago', '{0} mos ago', value);
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.months.singular.fullWord', '{0} month', value))
-                    : ( localize('date.fromNow.months.singular', '{0} mo', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.months.singular.fullWord', '{0} month', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.months.singular', '{0} mo', value);
             }
             else {
                 return useFullTimeWords
-                    ? ( localize('date.fromNow.months.plural.fullWord', '{0} months', value))
-                    : ( localize('date.fromNow.months.plural', '{0} mos', value));
+                    ? localizeWithPath('vs/base/common/date', 'date.fromNow.months.plural.fullWord', '{0} months', value)
+                    : localizeWithPath('vs/base/common/date', 'date.fromNow.months.plural', '{0} mos', value);
             }
         }
     }
@@ -169,25 +169,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
     if (appendAgoLabel) {
         if (value === 1) {
             return useFullTimeWords
-                ? ( localize('date.fromNow.years.singular.ago.fullWord', '{0} year ago', value))
-                : ( localize('date.fromNow.years.singular.ago', '{0} yr ago', value));
+                ? localizeWithPath('vs/base/common/date', 'date.fromNow.years.singular.ago.fullWord', '{0} year ago', value)
+                : localizeWithPath('vs/base/common/date', 'date.fromNow.years.singular.ago', '{0} yr ago', value);
         }
         else {
             return useFullTimeWords
-                ? ( localize('date.fromNow.years.plural.ago.fullWord', '{0} years ago', value))
-                : ( localize('date.fromNow.years.plural.ago', '{0} yrs ago', value));
+                ? localizeWithPath('vs/base/common/date', 'date.fromNow.years.plural.ago.fullWord', '{0} years ago', value)
+                : localizeWithPath('vs/base/common/date', 'date.fromNow.years.plural.ago', '{0} yrs ago', value);
         }
     }
     else {
         if (value === 1) {
             return useFullTimeWords
-                ? ( localize('date.fromNow.years.singular.fullWord', '{0} year', value))
-                : ( localize('date.fromNow.years.singular', '{0} yr', value));
+                ? localizeWithPath('vs/base/common/date', 'date.fromNow.years.singular.fullWord', '{0} year', value)
+                : localizeWithPath('vs/base/common/date', 'date.fromNow.years.singular', '{0} yr', value);
         }
         else {
             return useFullTimeWords
-                ? ( localize('date.fromNow.years.plural.fullWord', '{0} years', value))
-                : ( localize('date.fromNow.years.plural', '{0} yrs', value));
+                ? localizeWithPath('vs/base/common/date', 'date.fromNow.years.plural.fullWord', '{0} years', value)
+                : localizeWithPath('vs/base/common/date', 'date.fromNow.years.plural', '{0} yrs', value);
         }
     }
 }

package/vscode/src/vs/base/common/jsonErrorMessages.js

@@ -1,15 +1,15 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 function getParseErrorMessage(errorCode) {
     switch (errorCode) {
-        case 1 : return ( localize('error.invalidSymbol', 'Invalid symbol'));
-        case 2 : return ( localize('error.invalidNumberFormat', 'Invalid number format'));
-        case 3 : return ( localize('error.propertyNameExpected', 'Property name expected'));
-        case 4 : return ( localize('error.valueExpected', 'Value expected'));
-        case 5 : return ( localize('error.colonExpected', 'Colon expected'));
-        case 6 : return ( localize('error.commaExpected', 'Comma expected'));
-        case 7 : return ( localize('error.closeBraceExpected', 'Closing brace expected'));
-        case 8 : return ( localize('error.closeBracketExpected', 'Closing bracket expected'));
-        case 9 : return ( localize('error.endOfFileExpected', 'End of file expected'));
+        case 1 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.invalidSymbol', 'Invalid symbol');
+        case 2 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.invalidNumberFormat', 'Invalid number format');
+        case 3 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.propertyNameExpected', 'Property name expected');
+        case 4 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.valueExpected', 'Value expected');
+        case 5 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.colonExpected', 'Colon expected');
+        case 6 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.commaExpected', 'Comma expected');
+        case 7 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.closeBraceExpected', 'Closing brace expected');
+        case 8 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.closeBracketExpected', 'Closing bracket expected');
+        case 9 : return localizeWithPath('vs/base/common/jsonErrorMessages', 'error.endOfFileExpected', 'End of file expected');
         default:
             return '';
     }