@codingame/monaco-vscode-api 7.1.0 → 8.0.0

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

@@ -1,5 +1,4 @@
-import { localizeWithPath } from '../../nls.js';
-const _moduleId = "vs/base/common/date";
+import { localize } from '../../nls.js';
 const minute = 60;
 const hour = minute * 60;
 const day = hour * 24;
@@ -12,15 +11,14 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
     }
     const seconds = Math.round((( (new Date())).getTime() - date) / 1000);
     if (seconds < -30) {
-        return ( localizeWithPath(
-            _moduleId,
-            0,
+        return ( localize(
+            784,
             'in {0}',
             fromNow(( (new Date())).getTime() + seconds * 1000, false)
         ));
     }
     if (!disallowNow && seconds < 30) {
-        return ( localizeWithPath(_moduleId, 1, 'now'));
+        return ( localize(785, 'now'));
     }
     let value;
     if (seconds < minute) {
@@ -28,25 +26,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 2, '{0} second ago', value))
-                    : ( localizeWithPath(_moduleId, 3, '{0} sec ago', value));
+                    ? ( localize(786, '{0} second ago', value))
+                    : ( localize(787, '{0} sec ago', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 4, '{0} seconds ago', value))
-                    : ( localizeWithPath(_moduleId, 5, '{0} secs ago', value));
+                    ? ( localize(788, '{0} seconds ago', value))
+                    : ( localize(789, '{0} secs ago', value));
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 6, '{0} second', value))
-                    : ( localizeWithPath(_moduleId, 7, '{0} sec', value));
+                    ? ( localize(790, '{0} second', value))
+                    : ( localize(791, '{0} sec', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 8, '{0} seconds', value))
-                    : ( localizeWithPath(_moduleId, 9, '{0} secs', value));
+                    ? ( localize(792, '{0} seconds', value))
+                    : ( localize(793, '{0} secs', value));
             }
         }
     }
@@ -55,25 +53,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 10, '{0} minute ago', value))
-                    : ( localizeWithPath(_moduleId, 11, '{0} min ago', value));
+                    ? ( localize(794, '{0} minute ago', value))
+                    : ( localize(795, '{0} min ago', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 12, '{0} minutes ago', value))
-                    : ( localizeWithPath(_moduleId, 13, '{0} mins ago', value));
+                    ? ( localize(796, '{0} minutes ago', value))
+                    : ( localize(797, '{0} mins ago', value));
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 14, '{0} minute', value))
-                    : ( localizeWithPath(_moduleId, 15, '{0} min', value));
+                    ? ( localize(798, '{0} minute', value))
+                    : ( localize(799, '{0} min', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 16, '{0} minutes', value))
-                    : ( localizeWithPath(_moduleId, 17, '{0} mins', value));
+                    ? ( localize(800, '{0} minutes', value))
+                    : ( localize(801, '{0} mins', value));
             }
         }
     }
@@ -82,25 +80,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 18, '{0} hour ago', value))
-                    : ( localizeWithPath(_moduleId, 19, '{0} hr ago', value));
+                    ? ( localize(802, '{0} hour ago', value))
+                    : ( localize(803, '{0} hr ago', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 20, '{0} hours ago', value))
-                    : ( localizeWithPath(_moduleId, 21, '{0} hrs ago', value));
+                    ? ( localize(804, '{0} hours ago', value))
+                    : ( localize(805, '{0} hrs ago', value));
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 22, '{0} hour', value))
-                    : ( localizeWithPath(_moduleId, 23, '{0} hr', value));
+                    ? ( localize(806, '{0} hour', value))
+                    : ( localize(807, '{0} hr', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 24, '{0} hours', value))
-                    : ( localizeWithPath(_moduleId, 25, '{0} hrs', value));
+                    ? ( localize(808, '{0} hours', value))
+                    : ( localize(809, '{0} hrs', value));
             }
         }
     }
@@ -108,13 +106,13 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         value = Math.floor(seconds / day);
         if (appendAgoLabel) {
             return value === 1
-                ? ( localizeWithPath(_moduleId, 26, '{0} day ago', value))
-                : ( localizeWithPath(_moduleId, 27, '{0} days ago', value));
+                ? ( localize(810, '{0} day ago', value))
+                : ( localize(811, '{0} days ago', value));
         }
         else {
             return value === 1
-                ? ( localizeWithPath(_moduleId, 28, '{0} day', value))
-                : ( localizeWithPath(_moduleId, 29, '{0} days', value));
+                ? ( localize(812, '{0} day', value))
+                : ( localize(813, '{0} days', value));
         }
     }
     if (seconds < month) {
@@ -122,25 +120,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 30, '{0} week ago', value))
-                    : ( localizeWithPath(_moduleId, 31, '{0} wk ago', value));
+                    ? ( localize(814, '{0} week ago', value))
+                    : ( localize(815, '{0} wk ago', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 32, '{0} weeks ago', value))
-                    : ( localizeWithPath(_moduleId, 33, '{0} wks ago', value));
+                    ? ( localize(816, '{0} weeks ago', value))
+                    : ( localize(817, '{0} wks ago', value));
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 34, '{0} week', value))
-                    : ( localizeWithPath(_moduleId, 35, '{0} wk', value));
+                    ? ( localize(818, '{0} week', value))
+                    : ( localize(819, '{0} wk', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 36, '{0} weeks', value))
-                    : ( localizeWithPath(_moduleId, 37, '{0} wks', value));
+                    ? ( localize(820, '{0} weeks', value))
+                    : ( localize(821, '{0} wks', value));
             }
         }
     }
@@ -149,25 +147,25 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         if (appendAgoLabel) {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 38, '{0} month ago', value))
-                    : ( localizeWithPath(_moduleId, 39, '{0} mo ago', value));
+                    ? ( localize(822, '{0} month ago', value))
+                    : ( localize(823, '{0} mo ago', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 40, '{0} months ago', value))
-                    : ( localizeWithPath(_moduleId, 41, '{0} mos ago', value));
+                    ? ( localize(824, '{0} months ago', value))
+                    : ( localize(825, '{0} mos ago', value));
             }
         }
         else {
             if (value === 1) {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 42, '{0} month', value))
-                    : ( localizeWithPath(_moduleId, 43, '{0} mo', value));
+                    ? ( localize(826, '{0} month', value))
+                    : ( localize(827, '{0} mo', value));
             }
             else {
                 return useFullTimeWords
-                    ? ( localizeWithPath(_moduleId, 44, '{0} months', value))
-                    : ( localizeWithPath(_moduleId, 45, '{0} mos', value));
+                    ? ( localize(828, '{0} months', value))
+                    : ( localize(829, '{0} mos', value));
             }
         }
     }
@@ -175,43 +173,43 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
     if (appendAgoLabel) {
         if (value === 1) {
             return useFullTimeWords
-                ? ( localizeWithPath(_moduleId, 46, '{0} year ago', value))
-                : ( localizeWithPath(_moduleId, 47, '{0} yr ago', value));
+                ? ( localize(830, '{0} year ago', value))
+                : ( localize(831, '{0} yr ago', value));
         }
         else {
             return useFullTimeWords
-                ? ( localizeWithPath(_moduleId, 48, '{0} years ago', value))
-                : ( localizeWithPath(_moduleId, 49, '{0} yrs ago', value));
+                ? ( localize(832, '{0} years ago', value))
+                : ( localize(833, '{0} yrs ago', value));
         }
     }
     else {
         if (value === 1) {
             return useFullTimeWords
-                ? ( localizeWithPath(_moduleId, 50, '{0} year', value))
-                : ( localizeWithPath(_moduleId, 51, '{0} yr', value));
+                ? ( localize(834, '{0} year', value))
+                : ( localize(835, '{0} yr', value));
         }
         else {
             return useFullTimeWords
-                ? ( localizeWithPath(_moduleId, 52, '{0} years', value))
-                : ( localizeWithPath(_moduleId, 53, '{0} yrs', value));
+                ? ( localize(836, '{0} years', value))
+                : ( localize(837, '{0} yrs', value));
         }
     }
 }
 function getDurationString(ms, useFullTimeWords) {
     const seconds = Math.abs(ms / 1000);
     if (seconds < 1) {
-        return ( localizeWithPath(_moduleId, 55, '{0}ms', ms));
+        return ( localize(839, '{0}ms', ms));
     }
     if (seconds < minute) {
-        return ( localizeWithPath(_moduleId, 57, '{0}s', Math.round(ms) / 1000));
+        return ( localize(841, '{0}s', Math.round(ms) / 1000));
     }
     if (seconds < hour) {
-        return ( localizeWithPath(_moduleId, 59, '{0} mins', Math.round(ms / (1000 * minute))));
+        return ( localize(843, '{0} mins', Math.round(ms / (1000 * minute))));
     }
     if (seconds < day) {
-        return ( localizeWithPath(_moduleId, 61, '{0} hrs', Math.round(ms / (1000 * hour))));
+        return ( localize(845, '{0} hrs', Math.round(ms / (1000 * hour))));
     }
-    return ( localizeWithPath(_moduleId, 62, '{0} days', Math.round(ms / (1000 * day))));
+    return ( localize(846, '{0} days', Math.round(ms / (1000 * day))));
 }
 function toLocalISOString(date) {
     return date.getFullYear() +

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

@@ -1,12 +1,10 @@
 import { coalesce } from './arrays.js';
 import { isString } from './types.js';
-import { localizeWithPath } from '../../nls.js';
-const _moduleId = "vs/base/common/errorMessage";
+import { localize } from '../../nls.js';
 function exceptionToErrorMessage(exception, verbose) {
     if (verbose && (exception.stack || exception.stacktrace)) {
-        return ( localizeWithPath(
-            _moduleId,
-            0,
+        return ( localize(
+            686,
             "{0}: {1}",
             detectSystemErrorMessage(exception),
             stackToString(exception.stack) || stackToString(exception.stacktrace)
@@ -25,27 +23,19 @@ function detectSystemErrorMessage(exception) {
         return `${exception.message}. Please update the 'security.allowedUNCHosts' setting if you want to allow this host.`;
     }
     if (typeof exception.code === 'string' && typeof exception.errno === 'number' && typeof exception.syscall === 'string') {
-        return ( localizeWithPath(_moduleId, 1, "A system error occurred ({0})", exception.message));
+        return ( localize(687, "A system error occurred ({0})", exception.message));
     }
-    return exception.message || ( localizeWithPath(
-        _moduleId,
-        2,
-        "An unknown error occurred. Please consult the log for more details."
-    ));
+    return exception.message || ( localize(688, "An unknown error occurred. Please consult the log for more details."));
 }
 function toErrorMessage(error = null, verbose = false) {
     if (!error) {
-        return ( localizeWithPath(
-            _moduleId,
-            2,
-            "An unknown error occurred. Please consult the log for more details."
-        ));
+        return ( localize(688, "An unknown error occurred. Please consult the log for more details."));
     }
     if (Array.isArray(error)) {
         const errors = coalesce(error);
         const msg = toErrorMessage(errors[0], verbose);
         if (errors.length > 1) {
-            return ( localizeWithPath(_moduleId, 3, "{0} ({1} errors in total)", msg, errors.length));
+            return ( localize(689, "{0} ({1} errors in total)", msg, errors.length));
         }
         return msg;
     }
@@ -67,11 +57,7 @@ function toErrorMessage(error = null, verbose = false) {
     if (error.message) {
         return error.message;
     }
-    return ( localizeWithPath(
-        _moduleId,
-        2,
-        "An unknown error occurred. Please consult the log for more details."
-    ));
+    return ( localize(689, "An unknown error occurred. Please consult the log for more details."));
 }
 function isErrorWithActions(obj) {
     const candidate = obj;

package/vscode/src/vs/base/common/event.d.ts

@@ -227,6 +227,22 @@ declare namespace Event {
      * resolved with the result of the promise or `undefined`.
      */
     function fromPromise<T>(promise: Promise<T>): Event<T | undefined>;
+    /**
+     * A convenience function for forwarding an event to another emitter which
+     * improves readability.
+     *
+     * This is similar to {@link Relay} but allows instantiating and forwarding
+     * on a single line and also allows for multiple source events.
+     * @param from The event to forward.
+     * @param to The emitter to forward the event to.
+     * @example
+     * Event.forward(event, emitter);
+     * // equivalent to
+     * event(e => emitter.fire(e));
+     * // equivalent to
+     * event(emitter.fire, emitter);
+     */
+    function forward<T>(from: Event<T>, to: Emitter<T>): IDisposable;
     /**
      * Adds a listener to an event and calls the listener immediately with undefined as the event object.
      *

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

@@ -314,6 +314,10 @@ var Event;
         return result.event;
     }
     Event.fromPromise = fromPromise;
+    function forward(from, to) {
+        return from(e => to.fire(e));
+    }
+    Event.forward = forward;
     function runAndSubscribe(event, handler, initial) {
         handler(initial);
         return event(e => handler(e));

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

@@ -22,12 +22,24 @@ function registerGlobalHotReloadHandler() {
     if (!g.$hotReload_applyNewExports) {
         g.$hotReload_applyNewExports = args => {
             const args2 = { config: { mode: undefined }, ...args };
+            const results = [];
             for (const h of hotReloadHandlers) {
                 const result = h(args2);
                 if (result) {
-                    return result;
+                    results.push(result);
                 }
             }
+            if (results.length > 0) {
+                return newExports => {
+                    let result = false;
+                    for (const r of results) {
+                        if (r(newExports)) {
+                            result = true;
+                        }
+                    }
+                    return result;
+                };
+            }
             return undefined;
         };
     }

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

@@ -0,0 +1,25 @@
+import { isHotReloadEnabled, registerHotReloadHandler } from './hotReload.js';
+import './arrays.js';
+import './observableInternal/derived.js';
+import './observableInternal/autorun.js';
+import { observableSignalFromEvent } from './observableInternal/utils.js';
+import './cancellation.js';
+function readHotReloadableExport(value, reader) {
+    observeHotReloadableExports([value], reader);
+    return value;
+}
+function observeHotReloadableExports(values, reader) {
+    if (isHotReloadEnabled()) {
+        const o = observableSignalFromEvent('reload', event => registerHotReloadHandler(({ oldExports }) => {
+            if (!( [...( Object.values(oldExports))].some(v => values.includes(v)))) {
+                return undefined;
+            }
+            return (_newExports) => {
+                event(undefined);
+                return true;
+            };
+        }));
+        o.read(reader);
+    }
+}
+export { observeHotReloadableExports, readHotReloadableExport };

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

@@ -1,17 +1,16 @@
-import { localizeWithPath } from '../../nls.js';
+import { localize } from '../../nls.js';
 import { ParseErrorCode } from './json.js';
-const _moduleId = "vs/base/common/jsonErrorMessages";
 function getParseErrorMessage(errorCode) {
     switch (errorCode) {
-        case ParseErrorCode.InvalidSymbol: return ( localizeWithPath(_moduleId, 0, 'Invalid symbol'));
-        case ParseErrorCode.InvalidNumberFormat: return ( localizeWithPath(_moduleId, 1, 'Invalid number format'));
-        case ParseErrorCode.PropertyNameExpected: return ( localizeWithPath(_moduleId, 2, 'Property name expected'));
-        case ParseErrorCode.ValueExpected: return ( localizeWithPath(_moduleId, 3, 'Value expected'));
-        case ParseErrorCode.ColonExpected: return ( localizeWithPath(_moduleId, 4, 'Colon expected'));
-        case ParseErrorCode.CommaExpected: return ( localizeWithPath(_moduleId, 5, 'Comma expected'));
-        case ParseErrorCode.CloseBraceExpected: return ( localizeWithPath(_moduleId, 6, 'Closing brace expected'));
-        case ParseErrorCode.CloseBracketExpected: return ( localizeWithPath(_moduleId, 7, 'Closing bracket expected'));
-        case ParseErrorCode.EndOfFileExpected: return ( localizeWithPath(_moduleId, 8, 'End of file expected'));
+        case ParseErrorCode.InvalidSymbol: return ( localize(1250, 'Invalid symbol'));
+        case ParseErrorCode.InvalidNumberFormat: return ( localize(1251, 'Invalid number format'));
+        case ParseErrorCode.PropertyNameExpected: return ( localize(1252, 'Property name expected'));
+        case ParseErrorCode.ValueExpected: return ( localize(1253, 'Value expected'));
+        case ParseErrorCode.ColonExpected: return ( localize(1254, 'Colon expected'));
+        case ParseErrorCode.CommaExpected: return ( localize(1255, 'Comma expected'));
+        case ParseErrorCode.CloseBraceExpected: return ( localize(1256, 'Closing brace expected'));
+        case ParseErrorCode.CloseBracketExpected: return ( localize(1257, 'Closing bracket expected'));
+        case ParseErrorCode.EndOfFileExpected: return ( localize(1258, 'End of file expected'));
         default:
             return '';
     }

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

@@ -0,0 +1,122 @@
+function getCompressedContent(schema) {
+    let hasDups = false;
+    const equalsByString = ( new Map());
+    const nodeToEquals = ( new Map());
+    const visitSchemas = (next) => {
+        if (schema === next) {
+            return true;
+        }
+        const val = JSON.stringify(next);
+        if (val.length < 30) {
+            return true;
+        }
+        const eq = equalsByString.get(val);
+        if (!eq) {
+            const newEq = { schemas: [next] };
+            equalsByString.set(val, newEq);
+            nodeToEquals.set(next, newEq);
+            return true;
+        }
+        eq.schemas.push(next);
+        nodeToEquals.set(next, eq);
+        hasDups = true;
+        return false;
+    };
+    traverseNodes(schema, visitSchemas);
+    equalsByString.clear();
+    if (!hasDups) {
+        return JSON.stringify(schema);
+    }
+    let defNodeName = '$defs';
+    while (schema.hasOwnProperty(defNodeName)) {
+        defNodeName += '_';
+    }
+    const definitions = [];
+    function stringify(root) {
+        return JSON.stringify(root, (_key, value) => {
+            if (value !== root) {
+                const eq = nodeToEquals.get(value);
+                if (eq && eq.schemas.length > 1) {
+                    if (!eq.id) {
+                        eq.id = `_${definitions.length}`;
+                        definitions.push(eq.schemas[0]);
+                    }
+                    return { $ref: `#/${defNodeName}/${eq.id}` };
+                }
+            }
+            return value;
+        });
+    }
+    const str = stringify(schema);
+    const defStrings = [];
+    for (let i = 0; i < definitions.length; i++) {
+        defStrings.push(`"_${i}":${stringify(definitions[i])}`);
+    }
+    if (defStrings.length) {
+        return `${str.substring(0, str.length - 1)},"${defNodeName}":{${defStrings.join(',')}}}`;
+    }
+    return str;
+}
+function isObject(thing) {
+    return typeof thing === 'object' && thing !== null;
+}
+function traverseNodes(root, visit) {
+    if (!root || typeof root !== 'object') {
+        return;
+    }
+    const collectEntries = (...entries) => {
+        for (const entry of entries) {
+            if (isObject(entry)) {
+                toWalk.push(entry);
+            }
+        }
+    };
+    const collectMapEntries = (...maps) => {
+        for (const map of maps) {
+            if (isObject(map)) {
+                for (const key in map) {
+                    const entry = map[key];
+                    if (isObject(entry)) {
+                        toWalk.push(entry);
+                    }
+                }
+            }
+        }
+    };
+    const collectArrayEntries = (...arrays) => {
+        for (const array of arrays) {
+            if (Array.isArray(array)) {
+                for (const entry of array) {
+                    if (isObject(entry)) {
+                        toWalk.push(entry);
+                    }
+                }
+            }
+        }
+    };
+    const collectEntryOrArrayEntries = (items) => {
+        if (Array.isArray(items)) {
+            for (const entry of items) {
+                if (isObject(entry)) {
+                    toWalk.push(entry);
+                }
+            }
+        }
+        else if (isObject(items)) {
+            toWalk.push(items);
+        }
+    };
+    const toWalk = [root];
+    let next = toWalk.pop();
+    while (next) {
+        const visitChildern = visit(next);
+        if (visitChildern) {
+            collectEntries(next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else, next.unevaluatedItems, next.unevaluatedProperties);
+            collectMapEntries(next.definitions, next.$defs, next.properties, next.patternProperties, next.dependencies, next.dependentSchemas);
+            collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.prefixItems);
+            collectEntryOrArrayEntries(next.items);
+        }
+        next = toWalk.pop();
+    }
+}
+export { getCompressedContent };

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

@@ -1,6 +1,5 @@
 import { OperatingSystem } from './platform.js';
-import { localizeWithPath } from '../../nls.js';
-const _moduleId = "vs/base/common/keybindingLabels";
+import { localize } from '../../nls.js';
 class ModifierLabelProvider {
     constructor(mac, windows, linux = windows) {
         this.modifierLabels = [null];
@@ -31,35 +30,35 @@ const UILabelProvider = ( (new ModifierLabelProvider({
     metaKey: '⌘',
     separator: '',
 }, {
-    ctrlKey: ( localizeWithPath(_moduleId, 0, "Ctrl")),
-    shiftKey: ( localizeWithPath(_moduleId, 1, "Shift")),
-    altKey: ( localizeWithPath(_moduleId, 2, "Alt")),
-    metaKey: ( localizeWithPath(_moduleId, 3, "Windows")),
+    ctrlKey: ( localize(8492, "Ctrl")),
+    shiftKey: ( localize(8493, "Shift")),
+    altKey: ( localize(8494, "Alt")),
+    metaKey: ( localize(8495, "Windows")),
     separator: '+',
 }, {
-    ctrlKey: ( localizeWithPath(_moduleId, 0, "Ctrl")),
-    shiftKey: ( localizeWithPath(_moduleId, 1, "Shift")),
-    altKey: ( localizeWithPath(_moduleId, 2, "Alt")),
-    metaKey: ( localizeWithPath(_moduleId, 4, "Super")),
+    ctrlKey: ( localize(8495, "Ctrl")),
+    shiftKey: ( localize(8495, "Shift")),
+    altKey: ( localize(8495, "Alt")),
+    metaKey: ( localize(8496, "Super")),
     separator: '+',
 })));
 const AriaLabelProvider = ( (new ModifierLabelProvider({
-    ctrlKey: ( localizeWithPath(_moduleId, 5, "Control")),
-    shiftKey: ( localizeWithPath(_moduleId, 6, "Shift")),
-    altKey: ( localizeWithPath(_moduleId, 7, "Option")),
-    metaKey: ( localizeWithPath(_moduleId, 8, "Command")),
+    ctrlKey: ( localize(8497, "Control")),
+    shiftKey: ( localize(8498, "Shift")),
+    altKey: ( localize(8499, "Option")),
+    metaKey: ( localize(8500, "Command")),
     separator: '+',
 }, {
-    ctrlKey: ( localizeWithPath(_moduleId, 5, "Control")),
-    shiftKey: ( localizeWithPath(_moduleId, 6, "Shift")),
-    altKey: ( localizeWithPath(_moduleId, 9, "Alt")),
-    metaKey: ( localizeWithPath(_moduleId, 10, "Windows")),
+    ctrlKey: ( localize(8500, "Control")),
+    shiftKey: ( localize(8500, "Shift")),
+    altKey: ( localize(8501, "Alt")),
+    metaKey: ( localize(8502, "Windows")),
     separator: '+',
 }, {
-    ctrlKey: ( localizeWithPath(_moduleId, 5, "Control")),
-    shiftKey: ( localizeWithPath(_moduleId, 6, "Shift")),
-    altKey: ( localizeWithPath(_moduleId, 9, "Alt")),
-    metaKey: ( localizeWithPath(_moduleId, 11, "Super")),
+    ctrlKey: ( localize(8502, "Control")),
+    shiftKey: ( localize(8502, "Shift")),
+    altKey: ( localize(8502, "Alt")),
+    metaKey: ( localize(8503, "Super")),
     separator: '+',
 })));
 const ElectronAcceleratorLabelProvider = ( (new ModifierLabelProvider({

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

@@ -1,7 +1,7 @@
 import { firstOrDefault } from './arrays.js';
 import { hasDriveLetter, toSlashes } from './extpath.js';
-import { posix, sep, win32 } from './path.js';
-import { isWindows, OperatingSystem, OS, isMacintosh } from './platform.js';
+import { sep, posix, win32 } from './path.js';
+import { isWindows, isMacintosh, OperatingSystem, OS } from './platform.js';
 import { extUri, extUriIgnorePathCase } from './resources.js';
 import { rtrim, startsWithIgnoreCase } from './strings.js';
 function getPathLabel(resource, formatting) {