@codingame/monaco-vscode-api 7.1.0 → 7.1.1

package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { addStandardDisposableListener, asCSSUrl, append, EventType, prepend, addDisposableListener, isHTMLAnchorElement, isAncestor, $ as $$1 } from '../../../base/browser/dom.js';
-import { Emitter, Event } from '../../../base/common/event.js';
-import { localizeWithPath } from '../../../nls.js';
+import { Emitter, Event, EventBufferer } from '../../../base/common/event.js';
+import { localize } from '../../../nls.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { WorkbenchObjectTree } from '../../list/browser/listService.js';
 import { IThemeService } from '../../theme/common/themeService.service.js';
@@ -26,8 +26,14 @@ import { ThrottledDelayer } from '../../../base/common/async.js';
 import { isCancellationError } from '../../../base/common/errors.js';
 import { QuickPickFocus } from '../common/quickInput.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
+import { observableValue } from '../../../base/common/observableInternal/base.js';
+import '../../../base/common/observableInternal/derived.js';
+import '../../../base/common/observableInternal/autorun.js';
+import '../../../base/common/observableInternal/utils.js';
+import '../../../base/common/cancellation.js';
+import { equals } from '../../../base/common/arrays.js';
+import { observableValueOpts } from '../../../base/common/observableInternal/api.js';
 var QuickPickItemElementRenderer_1;
-const _moduleId = "vs/platform/quickinput/browser/quickInputTree";
 const $ = $$1;
 class BaseQuickPickItemElement {
     constructor(index, hasCheckbox, mainItem) {
@@ -179,7 +185,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Quick Input"));
+        return ( localize(9853, "Quick Input"));
     }
     getAriaLabel(element) {
         return element.separator?.label
@@ -490,24 +496,25 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this.onKeyDown = this._onKeyDown.event;
         this._onLeave = ( (new Emitter()));
         this.onLeave = this._onLeave.event;
-        this._onChangedAllVisibleChecked = ( (new Emitter()));
-        this.onChangedAllVisibleChecked = this._onChangedAllVisibleChecked.event;
-        this._onChangedCheckedCount = ( (new Emitter()));
-        this.onChangedCheckedCount = this._onChangedCheckedCount.event;
-        this._onChangedVisibleCount = ( (new Emitter()));
-        this.onChangedVisibleCount = this._onChangedVisibleCount.event;
-        this._onChangedCheckedElements = ( (new Emitter()));
-        this.onChangedCheckedElements = this._onChangedCheckedElements.event;
+        this._visibleCountObservable = observableValue('VisibleCount', 0);
+        this.onChangedVisibleCount = Event.fromObservable(this._visibleCountObservable, this._store);
+        this._allVisibleCheckedObservable = observableValue('AllVisibleChecked', false);
+        this.onChangedAllVisibleChecked = Event.fromObservable(this._allVisibleCheckedObservable, this._store);
+        this._checkedCountObservable = observableValue('CheckedCount', 0);
+        this.onChangedCheckedCount = Event.fromObservable(this._checkedCountObservable, this._store);
+        this._checkedElementsObservable = observableValueOpts({ equalsFn: equals }, ( (new Array())));
+        this.onChangedCheckedElements = Event.fromObservable(this._checkedElementsObservable, this._store);
         this._onButtonTriggered = ( (new Emitter()));
         this.onButtonTriggered = this._onButtonTriggered.event;
         this._onSeparatorButtonTriggered = ( (new Emitter()));
         this.onSeparatorButtonTriggered = this._onSeparatorButtonTriggered.event;
         this._elementChecked = ( (new Emitter()));
+        this._elementCheckedEventBufferer = ( (new EventBufferer()));
+        this._hasCheckboxes = false;
         this._inputElements = ( (new Array()));
         this._elementTree = ( (new Array()));
         this._itemElements = ( (new Array()));
         this._elementDisposable = this._register(( (new DisposableStore())));
-        this._shouldFireCheckedEvents = true;
         this._matchOnDescription = false;
         this._matchOnDetail = false;
         this._matchOnLabel = true;
@@ -537,7 +544,8 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         return (
              (Event.map(
                 this._tree.onDidChangeFocus,
-                e => ( (e.elements.filter((e) => e instanceof QuickPickItemElement).map(e => e.item)))
+                e => ( (e.elements.filter((e) => e instanceof QuickPickItemElement).map(e => e.item))),
+                this._store
             ))
         );
     }
@@ -546,9 +554,15 @@ let QuickInputTree = class QuickInputTree extends Disposable {
              (Event.map(this._tree.onDidChangeSelection, e => ({
                 items: ( (e.elements.filter((e) => e instanceof QuickPickItemElement).map(e => e.item))),
                 event: e.browserEvent
-            })))
+            }), this._store))
         );
     }
+    get displayed() {
+        return this._container.style.display !== 'none';
+    }
+    set displayed(value) {
+        this._container.style.display = value ? '' : 'none';
+    }
     get scrollTop() {
         return this._tree.scrollTop;
     }
@@ -610,6 +624,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this._registerOnKeyDown();
         this._registerOnContainerClick();
         this._registerOnMouseMiddleClick();
+        this._registerOnTreeModelChanged();
         this._registerOnElementChecked();
         this._registerOnContextMenu();
         this._registerHoverListeners();
@@ -641,8 +656,17 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             }
         }));
     }
+    _registerOnTreeModelChanged() {
+        this._register(this._tree.onDidChangeModel(() => {
+            const visibleCount = this._itemElements.filter(e => !e.hidden).length;
+            this._visibleCountObservable.set(visibleCount, undefined);
+            if (this._hasCheckboxes) {
+                this._updateCheckedObservables();
+            }
+        }));
+    }
     _registerOnElementChecked() {
-        this._register(this._elementChecked.event(_ => this._fireCheckedEvents()));
+        this._register(this._elementCheckedEventBufferer.wrapEvent(this._elementChecked.event, (_, e) => e)(_ => this._updateCheckedObservables()));
     }
     _registerOnContextMenu() {
         this._register(this._tree.onContextMenu(e => {
@@ -746,33 +770,19 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             }
         }));
     }
-    getAllVisibleChecked() {
-        return this._allVisibleChecked(this._itemElements, false);
-    }
-    getCheckedCount() {
-        return this._itemElements.filter(element => element.checked).length;
-    }
-    getVisibleCount() {
-        return this._itemElements.filter(e => !e.hidden).length;
-    }
     setAllVisibleChecked(checked) {
-        try {
-            this._shouldFireCheckedEvents = false;
+        this._elementCheckedEventBufferer.bufferEvents(() => {
             this._itemElements.forEach(element => {
                 if (!element.hidden && !element.checkboxDisabled) {
                     element.checked = checked;
                 }
             });
-        }
-        finally {
-            this._shouldFireCheckedEvents = true;
-            this._fireCheckedEvents();
-        }
+        });
     }
     setElements(inputElements) {
         this._elementDisposable.clear();
         this._inputElements = inputElements;
-        const hasCheckbox = this.parent.classList.contains('show-checkboxes');
+        this._hasCheckboxes = this.parent.classList.contains('show-checkboxes');
         let currentSeparatorElement;
         this._itemElements = ( (new Array()));
         this._elementTree = inputElements.reduce((result, item, index) => {
@@ -781,7 +791,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 if (!item.buttons) {
                     return result;
                 }
-                currentSeparatorElement = ( (new QuickPickSeparatorElement(index, (event) => this.fireSeparatorButtonTriggered(event), item)));
+                currentSeparatorElement = ( (new QuickPickSeparatorElement(index, e => this._onSeparatorButtonTriggered.fire(e), item)));
                 element = currentSeparatorElement;
             }
             else {
@@ -793,8 +803,8 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 }
                 const qpi = ( (new QuickPickItemElement(
                     index,
-                    hasCheckbox,
-                    (event) => this.fireButtonTriggered(event),
+                    this._hasCheckboxes,
+                    e => this._onButtonTriggered.fire(e),
                     this._elementChecked,
                     item,
                     separator
@@ -809,33 +819,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             result.push(element);
             return result;
         }, ( (new Array())));
-        const elements = ( (new Array()));
-        let visibleCount = 0;
-        for (const element of this._elementTree) {
-            if (element instanceof QuickPickSeparatorElement) {
-                elements.push({
-                    element,
-                    collapsible: false,
-                    collapsed: false,
-                    children: ( (element.children.map(e => ({
-                        element: e,
-                        collapsible: false,
-                        collapsed: false,
-                    })))),
-                });
-                visibleCount += element.children.length + 1;
-            }
-            else {
-                elements.push({
-                    element,
-                    collapsible: false,
-                    collapsed: false,
-                });
-                visibleCount++;
-            }
-        }
-        this._tree.setChildren(null, elements);
-        this._onChangedVisibleCount.fire(visibleCount);
+        this._setElementsToTree(this._elementTree);
         if (this.accessibilityService.isScreenReaderOptimized()) {
             setTimeout(() => {
                 const focusedElement = this._tree.getHTMLElement().querySelector(`.monaco-list-row.focused`);
@@ -848,18 +832,10 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             }, 0);
         }
     }
-    getElementsCount() {
-        return this._inputElements.length;
-    }
-    getFocusedElements() {
-        return ( (this._tree.getFocus()
-            .filter((e) => !!e)
-            .map(e => e.item)))
-            .filter((e) => !!e);
-    }
     setFocusedElements(items) {
         const elements = ( (items.map(item => this._itemElements.find(e => e.item === item))))
-            .filter((e) => !!e);
+            .filter((e) => !!e)
+            .filter(e => !e.hidden);
         this._tree.setFocus(elements);
         if (items.length > 0) {
             const focused = this._tree.getFocus()[0];
@@ -871,13 +847,6 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     getActiveDescendant() {
         return this._tree.getHTMLElement().getAttribute('aria-activedescendant');
     }
-    getSelectedElements() {
-        return (
-             (this._tree.getSelection()
-                .filter((e) => !!e && !!e.item)
-                .map(e => e.item))
-        );
-    }
     setSelectedElements(items) {
         const elements = ( (items.map(item => this._itemElements.find(e => e.item === item))))
             .filter((e) => !!e);
@@ -890,8 +859,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         );
     }
     setCheckedElements(items) {
-        try {
-            this._shouldFireCheckedEvents = false;
+        this._elementCheckedEventBufferer.bufferEvents(() => {
             const checked = ( (new Set()));
             for (const item of items) {
                 checked.add(item);
@@ -899,11 +867,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             for (const element of this._itemElements) {
                 element.checked = ( (checked.has(element.item)));
             }
-        }
-        finally {
-            this._shouldFireCheckedEvents = true;
-            this._fireCheckedEvents();
-        }
+        });
     }
     focus(what) {
         if (!this._itemElements.length) {
@@ -917,13 +881,24 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 this._tree.scrollTop = 0;
                 this._tree.focusFirst(undefined, (e) => e.element instanceof QuickPickItemElement);
                 break;
-            case QuickPickFocus.Second:
+            case QuickPickFocus.Second: {
                 this._tree.scrollTop = 0;
-                this._tree.setFocus([this._itemElements[1]]);
+                let isSecondItem = false;
+                this._tree.focusFirst(undefined, (e) => {
+                    if (!(e.element instanceof QuickPickItemElement)) {
+                        return false;
+                    }
+                    if (isSecondItem) {
+                        return true;
+                    }
+                    isSecondItem = !isSecondItem;
+                    return false;
+                });
                 break;
+            }
             case QuickPickFocus.Last:
                 this._tree.scrollTop = this._tree.scrollHeight;
-                this._tree.setFocus([this._itemElements[this._itemElements.length - 1]]);
+                this._tree.focusLast(undefined, (e) => e.element instanceof QuickPickItemElement);
                 break;
             case QuickPickFocus.Next: {
                 const prevFocus = this._tree.getFocus();
@@ -1021,7 +996,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 const after = this._tree.getFocus()[0];
                 if (before === after) {
                     this._tree.scrollTop = this._tree.scrollHeight;
-                    this._tree.setFocus([this._itemElements[this._itemElements.length - 1]]);
+                    this._tree.focusLast(undefined, (e) => e.element instanceof QuickPickItemElement);
                 }
                 break;
             }
@@ -1166,37 +1141,12 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             }
             return result;
         }, ( (new Array())));
-        const elements = ( (new Array()));
-        for (const element of finalElements) {
-            if (element instanceof QuickPickSeparatorElement) {
-                elements.push({
-                    element,
-                    collapsible: false,
-                    collapsed: false,
-                    children: ( (element.children.map(e => ({
-                        element: e,
-                        collapsible: false,
-                        collapsed: false,
-                    })))),
-                });
-            }
-            else {
-                elements.push({
-                    element,
-                    collapsible: false,
-                    collapsed: false,
-                });
-            }
-        }
-        this._tree.setChildren(null, elements);
+        this._setElementsToTree(finalElements);
         this._tree.layout();
-        this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
-        this._onChangedVisibleCount.fire(shownElements.length);
         return true;
     }
     toggleCheckbox() {
-        try {
-            this._shouldFireCheckedEvents = false;
+        this._elementCheckedEventBufferer.bufferEvents(() => {
             const elements = this._tree.getFocus().filter((e) => e instanceof QuickPickItemElement);
             const allChecked = this._allVisibleChecked(elements);
             for (const element of elements) {
@@ -1204,17 +1154,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                     element.checked = !allChecked;
                 }
             }
-        }
-        finally {
-            this._shouldFireCheckedEvents = true;
-            this._fireCheckedEvents();
-        }
-    }
-    display(display) {
-        this._container.style.display = display ? '' : 'none';
-    }
-    isDisplayed() {
-        return this._container.style.display !== 'none';
+        });
     }
     style(styles) {
         this._tree.style(styles);
@@ -1240,6 +1180,31 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         }
         this._elementDisposable.add(store);
     }
+    _setElementsToTree(elements) {
+        const treeElements = ( (new Array()));
+        for (const element of elements) {
+            if (element instanceof QuickPickSeparatorElement) {
+                treeElements.push({
+                    element,
+                    collapsible: false,
+                    collapsed: false,
+                    children: ( (element.children.map(e => ({
+                        element: e,
+                        collapsible: false,
+                        collapsed: false,
+                    })))),
+                });
+            }
+            else {
+                treeElements.push({
+                    element,
+                    collapsible: false,
+                    collapsed: false,
+                });
+            }
+        }
+        this._tree.setChildren(null, treeElements);
+    }
     _allVisibleChecked(elements, whenNoneVisible = true) {
         for (let i = 0, n = elements.length; i < n; i++) {
             const element = elements[i];
@@ -1254,19 +1219,11 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         }
         return whenNoneVisible;
     }
-    _fireCheckedEvents() {
-        if (!this._shouldFireCheckedEvents) {
-            return;
-        }
-        this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
-        this._onChangedCheckedCount.fire(this.getCheckedCount());
-        this._onChangedCheckedElements.fire(this.getCheckedElements());
-    }
-    fireButtonTriggered(event) {
-        this._onButtonTriggered.fire(event);
-    }
-    fireSeparatorButtonTriggered(event) {
-        this._onSeparatorButtonTriggered.fire(event);
+    _updateCheckedObservables() {
+        this._allVisibleCheckedObservable.set(this._allVisibleChecked(this._itemElements, false), undefined);
+        const checkedCount = this._itemElements.filter(element => element.checked).length;
+        this._checkedCountObservable.set(checkedCount, undefined);
+        this._checkedElementsObservable.set(this.getCheckedElements(), undefined);
     }
     showHover(element) {
         if (this._lastHover && !this._lastHover.isDisposed) {

package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js

@@ -8,8 +8,7 @@ import { IdGenerator } from '../../../base/common/idGenerator.js';
 import { KeyCode } from '../../../base/common/keyCodes.js';
 import { parseLinkedText } from '../../../base/common/linkedText.js';
 import './media/quickInput.css.js';
-import { localizeWithPath } from '../../../nls.js';
-const _moduleId = "vs/platform/quickinput/browser/quickInputUtils";
+import { localize } from '../../../nls.js';
 const iconPathToClass = {};
 const iconClassGenerator = ( (new IdGenerator('quick-input-button-icon-')));
 function getIconClass(iconPath) {
@@ -54,9 +53,8 @@ function renderQuickInputDescription(description, container, actionHandler) {
         else {
             let title = node.title;
             if (!title && node.href.startsWith('command:')) {
-                title = ( localizeWithPath(
-                    _moduleId,
-                    0,
+                title = ( localize(
+                    9852,
                     "Click to execute command '{0}'",
                     node.href.substring('command:'.length)
                 ));

package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js

@@ -1,8 +1,7 @@
 import { Codicon } from '../../../base/common/codicons.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-const _moduleId = "vs/platform/quickinput/browser/quickPickPin";
 const pinButtonClass = ThemeIcon.asClassName(Codicon.pin);
 const pinnedButtonClass = ThemeIcon.asClassName(Codicon.pinned);
 const buttonClasses = [pinButtonClass, pinnedButtonClass];
@@ -38,7 +37,7 @@ function _formatPinnedItems(storageKey, quickPick, storageService, changedItem,
         pinnedItems = getPinnedItems(storageKey, storageService);
     }
     if (pinnedItems.length) {
-        formattedItems.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 0, 'pinned')) });
+        formattedItems.push({ type: 'separator', label: ( localize(11353, 'pinned')) });
     }
     const pinnedIds = ( (new Set()));
     for (const itemToFind of pinnedItems) {
@@ -69,7 +68,7 @@ function updateButtons(item, removePin) {
     const newButtons = item.buttons?.filter(button => button.iconClass && !buttonClasses.includes(button.iconClass)) ?? [];
     newButtons.unshift({
         iconClass: removePin ? pinButtonClass : pinnedButtonClass,
-        tooltip: removePin ? ( localizeWithPath(_moduleId, 1, "Pin command")) : ( localizeWithPath(_moduleId, 2, "Pinned command")),
+        tooltip: removePin ? ( localize(11354, "Pin command")) : ( localize(11355, "Pinned command")),
         alwaysVisible: false
     });
     item.buttons = newButtons;

package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts

@@ -589,6 +589,16 @@ interface IInputBox extends IQuickInput {
      */
     severity: Severity;
 }
+declare enum QuickInputButtonLocation {
+    /**
+     * In the title bar.
+     */
+    Title = 1,
+    /**
+     * To the right of the input box.
+     */
+    Inline = 2
+}
 /**
  * Represents a button in the quick input UI.
  */
@@ -615,6 +625,11 @@ interface IQuickInputButton {
      * By default, buttons are only visible when hovering over them with the mouse.
      */
     alwaysVisible?: boolean;
+    /**
+     * Where the button should be rendered. The default is {@link QuickInputButtonLocation.Title}.
+     * @note This property is ignored if the button was added to a QuickPickItem.
+     */
+    location?: QuickInputButtonLocation;
 }
 /**
  * Represents an event that occurs when a button associated with a quick pick item is clicked.
@@ -656,4 +671,4 @@ interface IQuickPickItemButtonContext<T extends IQuickPickItem> extends IQuickPi
 type QuickPickInput<T = IQuickPickItem> = T | IQuickPickSeparator;
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-export { type IInputBox, type IInputOptions, type IKeyMods, type IPickOptions, type IQuickInput, type IQuickInputButton, type IQuickInputHideEvent, type IQuickInputToggle, type IQuickNavigateConfiguration, type IQuickPick, type IQuickPickDidAcceptEvent, type IQuickPickItem, type IQuickPickItemButtonContext, type IQuickPickItemButtonEvent, type IQuickPickItemHighlights, type IQuickPickSeparator, type IQuickPickSeparatorButtonEvent, type IQuickPickWillAcceptEvent, type IQuickWidget, ItemActivation, type Omit, QuickInputHideReason, QuickInputType, QuickPickFocus, type QuickPickInput };
+export { type IInputBox, type IInputOptions, type IKeyMods, type IPickOptions, type IQuickInput, type IQuickInputButton, type IQuickInputHideEvent, type IQuickInputToggle, type IQuickNavigateConfiguration, type IQuickPick, type IQuickPickDidAcceptEvent, type IQuickPickItem, type IQuickPickItemButtonContext, type IQuickPickItemButtonEvent, type IQuickPickItemHighlights, type IQuickPickSeparator, type IQuickPickSeparatorButtonEvent, type IQuickPickWillAcceptEvent, type IQuickWidget, ItemActivation, type Omit, QuickInputButtonLocation, QuickInputHideReason, QuickInputType, QuickPickFocus, type QuickPickInput };

package/vscode/src/vs/platform/quickinput/common/quickInput.js

@@ -31,6 +31,11 @@ var QuickPickFocus;
     QuickPickFocus[QuickPickFocus["NextSeparator"] = 8] = "NextSeparator";
     QuickPickFocus[QuickPickFocus["PreviousSeparator"] = 9] = "PreviousSeparator";
 })(QuickPickFocus || (QuickPickFocus = {})));
+var QuickInputButtonLocation;
+( (function(QuickInputButtonLocation) {
+    QuickInputButtonLocation[QuickInputButtonLocation["Title"] = 1] = "Title";
+    QuickInputButtonLocation[QuickInputButtonLocation["Inline"] = 2] = "Inline";
+})(QuickInputButtonLocation || (QuickInputButtonLocation = {})));
 class QuickPickItemScorerAccessor {
     constructor(options) {
         this.options = options;
@@ -55,4 +60,4 @@ class QuickPickItemScorerAccessor {
     }
 }
 const quickPickItemScorerAccessor = ( new QuickPickItemScorerAccessor());
-export { ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickInputType, QuickPickFocus, QuickPickItemScorerAccessor, quickPickItemScorerAccessor };
+export { ItemActivation, NO_KEY_MODS, QuickInputButtonLocation, QuickInputHideReason, QuickInputType, QuickPickFocus, QuickPickItemScorerAccessor, quickPickItemScorerAccessor };

package/vscode/src/vs/platform/request/common/request.js

@@ -1,11 +1,10 @@
 import { streamToBuffer } from '../../../base/common/buffer.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { Extensions, ConfigurationScope } from '../../configuration/common/configurationRegistry.js';
 import { CONTEXT_LOG_LEVEL, LogLevelToString, LogLevel } from '../../log/common/log.js';
 import { Registry } from '../../registry/common/platform.js';
-const _moduleId = "vs/platform/request/common/request";
 class LoggableHeaders {
     constructor(original) {
         this.original = original;
@@ -31,7 +30,7 @@ class AbstractRequestService extends Disposable {
         super();
         this.counter = 0;
         this.logger = loggerService.createLogger('network', {
-            name: ( localizeWithPath(_moduleId, 0, "Network Requests")),
+            name: ( localize(4769, "Network Requests")),
             when: ( (CONTEXT_LOG_LEVEL.isEqualTo(LogLevelToString(LogLevel.Trace)))).serialize()
         });
     }
@@ -94,16 +93,15 @@ function registerProxyConfigurations(scope) {
     proxyConfiguration = {
         id: 'http',
         order: 15,
-        title: ( localizeWithPath(_moduleId, 1, "HTTP")),
+        title: ( localize(4770, "HTTP")),
         type: 'object',
         scope,
         properties: {
             'http.proxy': {
                 type: 'string',
                 pattern: '^(https?|socks|socks4a?|socks5h?)://([^:]*(:[^@]*)?@)?([^:]+|\\[[:0-9a-fA-F]+\\])(:\\d+)?/?$|^$',
-                markdownDescription: ( localizeWithPath(
-                    _moduleId,
-                    2,
+                markdownDescription: ( localize(
+                    4771,
                     "The proxy setting to use. If not set, will be inherited from the `http_proxy` and `https_proxy` environment variables."
                 )),
                 restricted: true
@@ -111,18 +109,16 @@ function registerProxyConfigurations(scope) {
             'http.proxyStrictSSL': {
                 type: 'boolean',
                 default: true,
-                description: ( localizeWithPath(
-                    _moduleId,
-                    3,
+                description: ( localize(
+                    4772,
                     "Controls whether the proxy server certificate should be verified against the list of supplied CAs."
                 )),
                 restricted: true
             },
             'http.proxyKerberosServicePrincipal': {
                 type: 'string',
-                markdownDescription: ( localizeWithPath(
-                    _moduleId,
-                    4,
+                markdownDescription: ( localize(
+                    4773,
                     "Overrides the principal service name for Kerberos authentication with the HTTP proxy. A default based on the proxy hostname is used when this is not set."
                 )),
                 restricted: true
@@ -130,9 +126,8 @@ function registerProxyConfigurations(scope) {
             'http.noProxy': {
                 type: 'array',
                 items: { type: 'string' },
-                markdownDescription: ( localizeWithPath(
-                    _moduleId,
-                    5,
+                markdownDescription: ( localize(
+                    4774,
                     "Specifies domain names for which proxy settings should be ignored for HTTP/HTTPS requests."
                 )),
                 restricted: true
@@ -140,9 +135,8 @@ function registerProxyConfigurations(scope) {
             'http.proxyAuthorization': {
                 type: ['null', 'string'],
                 default: null,
-                markdownDescription: ( localizeWithPath(
-                    _moduleId,
-                    6,
+                markdownDescription: ( localize(
+                    4775,
                     "The value to send as the `Proxy-Authorization` header for every network request."
                 )),
                 restricted: true
@@ -151,29 +145,23 @@ function registerProxyConfigurations(scope) {
                 type: 'string',
                 enum: ['off', 'on', 'fallback', 'override'],
                 enumDescriptions: [
-                    ( localizeWithPath(_moduleId, 7, "Disable proxy support for extensions.")),
-                    ( localizeWithPath(_moduleId, 8, "Enable proxy support for extensions.")),
-                    ( localizeWithPath(
-                        _moduleId,
-                        9,
+                    ( localize(4776, "Disable proxy support for extensions.")),
+                    ( localize(4777, "Enable proxy support for extensions.")),
+                    ( localize(
+                        4778,
                         "Enable proxy support for extensions, fall back to request options, when no proxy found."
                     )),
-                    ( localizeWithPath(
-                        _moduleId,
-                        10,
-                        "Enable proxy support for extensions, override request options."
-                    )),
+                    ( localize(4779, "Enable proxy support for extensions, override request options.")),
                 ],
                 default: 'override',
-                description: ( localizeWithPath(_moduleId, 11, "Use the proxy support for extensions.")),
+                description: ( localize(4780, "Use the proxy support for extensions.")),
                 restricted: true
             },
             'http.systemCertificates': {
                 type: 'boolean',
                 default: true,
-                description: ( localizeWithPath(
-                    _moduleId,
-                    12,
+                description: ( localize(
+                    4781,
                     "Controls whether CA certificates should be loaded from the OS. (On Windows and macOS, a reload of the window is required after turning this off.)"
                 )),
                 restricted: true
@@ -182,9 +170,8 @@ function registerProxyConfigurations(scope) {
                 type: 'boolean',
                 tags: ['experimental'],
                 default: false,
-                description: ( localizeWithPath(
-                    _moduleId,
-                    13,
+                description: ( localize(
+                    4782,
                     "Controls whether experimental loading of CA certificates from the OS should be enabled. This uses a more general approach than the default implemenation."
                 )),
                 restricted: true