@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js

@@ -9,11 +9,11 @@ import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import './parameterHints.css.js';
 import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
 import { ILanguageService } from '../../../common/languages/language.js';
 import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { Context } from './provideSignatureHelp.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
@@ -32,10 +32,9 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 var ParameterHintsWidget_1;
-const _moduleId = "vs/editor/contrib/parameterHints/browser/parameterHintsWidget";
 const $ = $$1;
-const parameterHintsNextIcon = registerIcon('parameter-hints-next', Codicon.chevronDown, ( localizeWithPath(_moduleId, 0, 'Icon for show next parameter hint.')));
-const parameterHintsPreviousIcon = registerIcon('parameter-hints-previous', Codicon.chevronUp, ( localizeWithPath(_moduleId, 1, 'Icon for show previous parameter hint.')));
+const parameterHintsNextIcon = registerIcon('parameter-hints-next', Codicon.chevronDown, ( localize(5240, 'Icon for show next parameter hint.')));
+const parameterHintsPreviousIcon = registerIcon('parameter-hints-previous', Codicon.chevronUp, ( localize(5241, 'Icon for show previous parameter hint.')));
 let ParameterHintsWidget = class ParameterHintsWidget extends Disposable {
     static { ParameterHintsWidget_1 = this; }
     static { this.ID = 'editor.widget.parameterHintsWidget'; }
@@ -96,8 +95,11 @@ let ParameterHintsWidget = class ParameterHintsWidget extends Disposable {
                 return;
             }
             const fontInfo = this.editor.getOption(EditorOption.fontInfo);
-            this.domNodes.element.style.fontSize = `${fontInfo.fontSize}px`;
-            this.domNodes.element.style.lineHeight = `${fontInfo.lineHeight / fontInfo.fontSize}`;
+            const element = this.domNodes.element;
+            element.style.fontSize = `${fontInfo.fontSize}px`;
+            element.style.lineHeight = `${fontInfo.lineHeight / fontInfo.fontSize}`;
+            element.style.setProperty('--vscode-parameterHintsWidget-editorFontFamily', fontInfo.fontFamily);
+            element.style.setProperty('--vscode-parameterHintsWidget-editorFontFamilyDefault', EDITOR_FONT_DEFAULTS.fontFamily);
         };
         updateFont();
         this._register(Event.chain(this.editor.onDidChangeConfiguration.bind(this.editor), $ => $.filter(e => e.hasChanged(EditorOption.fontInfo)))(updateFont));
@@ -153,9 +155,6 @@ let ParameterHintsWidget = class ParameterHintsWidget extends Disposable {
             return;
         }
         const code = append(this.domNodes.signature, $('.code'));
-        const fontInfo = this.editor.getOption(EditorOption.fontInfo);
-        code.style.fontSize = `${fontInfo.fontSize}px`;
-        code.style.fontFamily = fontInfo.fontFamily;
         const hasParameters = signature.parameters.length > 0;
         const activeParameterIndex = signature.activeParameter ?? hints.activeParameter;
         if (!hasParameters) {
@@ -206,7 +205,7 @@ let ParameterHintsWidget = class ParameterHintsWidget extends Disposable {
                 labelToAnnounce += typeof signature.documentation === 'string' ? `, ${signature.documentation}` : `, ${signature.documentation.value}`;
             }
             if (this.announcedLabel !== labelToAnnounce) {
-                alert(( localizeWithPath(_moduleId, 2, "{0}, hint", labelToAnnounce)));
+                alert(( localize(5242, "{0}, hint", labelToAnnounce)));
                 this.announcedLabel = labelToAnnounce;
             }
         }
@@ -311,5 +310,5 @@ ParameterHintsWidget = ParameterHintsWidget_1 = ( (__decorate([
     ( (__param(4, ILanguageService))),
     ( (__param(5, ITelemetryService)))
 ], ParameterHintsWidget)));
-registerColor('editorHoverWidget.highlightForeground', listHighlightForeground, ( localizeWithPath(_moduleId, 3, 'Foreground color of the active item in the parameter hint.')));
+registerColor('editorHoverWidget.highlightForeground', listHighlightForeground, ( localize(5243, 'Foreground color of the active item in the parameter hint.')));
 export { ParameterHintsWidget };

package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js

@@ -13,7 +13,7 @@ import { ICodeEditorService } from '../../../browser/services/codeEditorService.
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { ZoneWidget } from '../../zoneWidget/browser/zoneWidget.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -30,7 +30,6 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-const _moduleId = "vs/editor/contrib/peekView/browser/peekView";
 const IPeekViewService = ( (createDecorator('IPeekViewService')));
 registerSingleton(IPeekViewService, class {
     constructor() {
@@ -54,7 +53,7 @@ registerSingleton(IPeekViewService, class {
 }, InstantiationType.Delayed);
 var PeekContext;
 ( ((function(PeekContext) {
-    PeekContext.inPeekEditor = ( (new RawContextKey('inReferenceSearchEditor', true, ( localizeWithPath(_moduleId, 0, "Whether the current code editor is embedded inside peek")))));
+    PeekContext.inPeekEditor = ( (new RawContextKey('inReferenceSearchEditor', true, ( localize(5148, "Whether the current code editor is embedded inside peek")))));
     PeekContext.notInPeekEditor = ( (PeekContext.inPeekEditor.toNegated()));
 })(PeekContext || (PeekContext = {}))));
 let PeekContextController = class PeekContextController {
@@ -153,7 +152,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
         this._actionbarWidget = ( (new ActionBar(actionsContainer, actionBarOptions)));
         this._disposables.add(this._actionbarWidget);
         if (!noCloseAction) {
-            this._actionbarWidget.push(( (new Action('peekview.close', ( localizeWithPath(_moduleId, 1, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+            this._actionbarWidget.push(( (new Action('peekview.close', ( localize(5149, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                 this.dispose();
                 return Promise.resolve();
             }))), { label: false, icon: true });
@@ -217,39 +216,25 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
 PeekViewWidget = ( (__decorate([
     ( (__param(2, IInstantiationService)))
 ], PeekViewWidget)));
-const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(_moduleId, 2, 'Background color of the peek view title area.')));
-const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: Color.white, light: Color.black, hcDark: Color.white, hcLight: editorForeground }, ( localizeWithPath(_moduleId, 3, 'Color of the peek view title.')));
-const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161', hcDark: '#FFFFFF99', hcLight: '#292929' }, ( localizeWithPath(_moduleId, 4, 'Color of the peek view title info.')));
-const peekViewBorder = registerColor('peekView.border', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 5, 'Color of the peek view borders and arrow.')));
-const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(_moduleId, 6, 'Background color of the peek view result list.')));
-registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hcDark: Color.white, hcLight: editorForeground }, ( localizeWithPath(
-    _moduleId,
-    7,
-    'Foreground color for line nodes in the peek view result list.'
-)));
-registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hcDark: Color.white, hcLight: editorForeground }, ( localizeWithPath(
-    _moduleId,
-    8,
-    'Foreground color for file nodes in the peek view result list.'
-)));
-registerColor('peekViewResult.selectionBackground', { dark: '#3399ff33', light: '#3399ff33', hcDark: null, hcLight: null }, ( localizeWithPath(
-    _moduleId,
-    9,
+const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(5150, 'Background color of the peek view title area.')));
+const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: Color.white, light: Color.black, hcDark: Color.white, hcLight: editorForeground }, ( localize(5151, 'Color of the peek view title.')));
+const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161', hcDark: '#FFFFFF99', hcLight: '#292929' }, ( localize(5152, 'Color of the peek view title info.')));
+const peekViewBorder = registerColor('peekView.border', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5153, 'Color of the peek view borders and arrow.')));
+const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(5154, 'Background color of the peek view result list.')));
+registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hcDark: Color.white, hcLight: editorForeground }, ( localize(5155, 'Foreground color for line nodes in the peek view result list.')));
+registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hcDark: Color.white, hcLight: editorForeground }, ( localize(5156, 'Foreground color for file nodes in the peek view result list.')));
+registerColor('peekViewResult.selectionBackground', { dark: '#3399ff33', light: '#3399ff33', hcDark: null, hcLight: null }, ( localize(
+    5157,
     'Background color of the selected entry in the peek view result list.'
 )));
-registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hcDark: Color.white, hcLight: editorForeground }, ( localizeWithPath(
-    _moduleId,
-    10,
+registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hcDark: Color.white, hcLight: editorForeground }, ( localize(
+    5158,
     'Foreground color of the selected entry in the peek view result list.'
 )));
-const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, ( localizeWithPath(_moduleId, 11, 'Background color of the peek view editor.')));
-registerColor('peekViewEditorGutter.background', peekViewEditorBackground, ( localizeWithPath(_moduleId, 12, 'Background color of the gutter in the peek view editor.')));
-registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, ( localizeWithPath(
-    _moduleId,
-    13,
-    'Background color of sticky scroll in the peek view editor.'
-)));
-registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, ( localizeWithPath(_moduleId, 14, 'Match highlight color in the peek view result list.')));
-const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, ( localizeWithPath(_moduleId, 15, 'Match highlight color in the peek view editor.')));
-registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localizeWithPath(_moduleId, 16, 'Match highlight border in the peek view editor.')));
+const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, ( localize(5159, 'Background color of the peek view editor.')));
+registerColor('peekViewEditorGutter.background', peekViewEditorBackground, ( localize(5160, 'Background color of the gutter in the peek view editor.')));
+registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, ( localize(5161, 'Background color of sticky scroll in the peek view editor.')));
+registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, ( localize(5162, 'Match highlight color in the peek view result list.')));
+const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, ( localize(5163, 'Match highlight color in the peek view editor.')));
+registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(5164, 'Match highlight border in the peek view editor.')));
 export { IPeekViewService, PeekContext, PeekViewWidget, getOuterEditor, peekViewBorder, peekViewEditorBackground, peekViewEditorMatchHighlight, peekViewResultsBackground, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground };

package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js

@@ -1,60 +1,9 @@
-import { structuralEquals } from '../../../../base/common/equals.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { derivedOpts, derived } from '../../../../base/common/observableInternal/derived.js';
-import '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
-import '../../../../base/common/cancellation.js';
 import './placeholderText.css.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
-import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
 import { ghostTextForeground } from '../../../common/core/editorColorRegistry.js';
-import { Range } from '../../../common/core/range.js';
-import { InjectedTextCursorStops } from '../../../common/model.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
-const _moduleId = "vs/editor/contrib/placeholderText/browser/placeholderText.contribution";
-class PlaceholderTextContribution extends Disposable {
-    static get(editor) {
-        return editor.getContribution(PlaceholderTextContribution.ID);
-    }
-    static { this.ID = 'editor.contrib.placeholderText'; }
-    constructor(_editor) {
-        super();
-        this._editor = _editor;
-        this._editorObs = observableCodeEditor(this._editor);
-        this._placeholderText = this._editorObs.getOption(EditorOption.placeholder);
-        this._decorationOptions = derivedOpts({ owner: this, equalsFn: structuralEquals }, reader => {
-            const p = this._placeholderText.read(reader);
-            if (!p) {
-                return undefined;
-            }
-            if (!this._editorObs.valueIsEmpty.read(reader)) {
-                return undefined;
-            }
-            return { placeholder: p };
-        });
-        this._decorations = derived(this, (reader) => {
-            const options = this._decorationOptions.read(reader);
-            if (!options) {
-                return [];
-            }
-            return [{
-                    range: ( (new Range(1, 1, 1, 1))),
-                    options: {
-                        description: 'placeholder',
-                        showIfCollapsed: true,
-                        after: {
-                            content: options.placeholder,
-                            cursorStops: InjectedTextCursorStops.None,
-                            inlineClassName: 'placeholder-text'
-                        }
-                    }
-                }];
-        });
-        this._register(this._editorObs.setDecorations(this._decorations));
-    }
-}
-registerEditorContribution(PlaceholderTextContribution.ID, PlaceholderTextContribution, EditorContributionInstantiation.Eager);
-registerColor('editor.placeholder.foreground', { dark: ghostTextForeground, light: ghostTextForeground, hcDark: ghostTextForeground, hcLight: ghostTextForeground }, ( localizeWithPath(_moduleId, 0, 'Foreground color of the placeholder text in the editor.')));
-export { PlaceholderTextContribution };
+import { PlaceholderTextContribution } from './placeholderTextContribution.js';
+import { wrapInReloadableClass1 } from '../../../../platform/observable/common/wrapInReloadableClass.js';
+registerEditorContribution(PlaceholderTextContribution.ID, wrapInReloadableClass1(() => PlaceholderTextContribution), EditorContributionInstantiation.Eager);
+registerColor('editor.placeholder.foreground', ghostTextForeground, ( localize(1866, 'Foreground color of the placeholder text in the editor.')));

package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor{--vscode-editor-placeholder-foreground:var(--vscode-editorGhostText-foreground)}.monaco-editor .placeholder-text{color:var(--vscode-editor-placeholder-foreground)}";
+var css = ".monaco-editor{--vscode-editor-placeholder-foreground:var(--vscode-editorGhostText-foreground);.editorPlaceholder{text-wrap:nowrap;color:var(--vscode-editor-placeholder-foreground);overflow:hidden;pointer-events:none;position:absolute;text-overflow:ellipsis;top:0}}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.js

@@ -0,0 +1,71 @@
+import { h } from '../../../../base/browser/dom.js';
+import { structuralEquals } from '../../../../base/common/equals.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { derivedOpts, derivedWithStore } from '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { derivedObservableWithCache, constObservable } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
+import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+class PlaceholderTextContribution extends Disposable {
+    static get(editor) {
+        return editor.getContribution(PlaceholderTextContribution.ID);
+    }
+    static { this.ID = 'editor.contrib.placeholderText'; }
+    constructor(_editor) {
+        super();
+        this._editor = _editor;
+        this._editorObs = observableCodeEditor(this._editor);
+        this._placeholderText = this._editorObs.getOption(EditorOption.placeholder);
+        this._state = derivedOpts({ owner: this, equalsFn: structuralEquals }, reader => {
+            const p = this._placeholderText.read(reader);
+            if (!p) {
+                return undefined;
+            }
+            if (!this._editorObs.valueIsEmpty.read(reader)) {
+                return undefined;
+            }
+            return { placeholder: p };
+        });
+        this._shouldViewBeAlive = isOrWasTrue(this, reader => this._state.read(reader)?.placeholder !== undefined);
+        this._view = derivedWithStore((reader, store) => {
+            if (!this._shouldViewBeAlive.read(reader)) {
+                return;
+            }
+            const element = h('div.editorPlaceholder');
+            store.add(autorun(reader => {
+                const data = this._state.read(reader);
+                const shouldBeVisibile = data?.placeholder !== undefined;
+                element.root.style.display = shouldBeVisibile ? 'block' : 'none';
+                element.root.innerText = data?.placeholder ?? '';
+            }));
+            store.add(autorun(reader => {
+                const info = this._editorObs.layoutInfo.read(reader);
+                element.root.style.left = `${info.contentLeft}px`;
+                element.root.style.width = (info.contentWidth - info.verticalScrollbarWidth) + 'px';
+                element.root.style.top = `${this._editor.getTopForLineNumber(0)}px`;
+            }));
+            store.add(autorun(reader => {
+                element.root.style.fontFamily = this._editorObs.getOption(EditorOption.fontFamily).read(reader);
+                element.root.style.fontSize = this._editorObs.getOption(EditorOption.fontSize).read(reader) + 'px';
+                element.root.style.lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader) + 'px';
+            }));
+            store.add(this._editorObs.createOverlayWidget({
+                allowEditorOverflow: false,
+                minContentWidthInPx: constObservable(0),
+                position: constObservable(null),
+                domNode: element.root,
+            }));
+        });
+        this._view.recomputeInitiallyAndOnChange(this._store);
+    }
+}
+function isOrWasTrue(owner, fn) {
+    return derivedObservableWithCache(owner, (reader, lastValue) => {
+        if (lastValue === true) {
+            return true;
+        }
+        return fn(reader);
+    });
+}
+export { PlaceholderTextContribution };

package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js

@@ -3,15 +3,14 @@ import { getCodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
 import { ScrollType } from '../../../common/editorCommon.js';
 import { AbstractEditorNavigationQuickAccessProvider } from './editorNavigationQuickAccess.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess";
+import { localize } from '../../../../nls.js';
 class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickAccessProvider {
     static { this.PREFIX = ':'; }
     constructor() {
         super({ canAcceptInBackground: true });
     }
     provideWithoutTextEditor(picker) {
-        const label = ( localizeWithPath(_moduleId, 0, "Open a text editor first to go to a line."));
+        const label = ( localize(4815, "Open a text editor first to go to a line."));
         picker.items = [{ label }];
         picker.ariaLabel = label;
         return Disposable.None;
@@ -80,25 +79,23 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
     getPickLabel(editor, lineNumber, column) {
         if (this.isValidLineNumber(editor, lineNumber)) {
             if (this.isValidColumn(editor, lineNumber, column)) {
-                return ( localizeWithPath(_moduleId, 1, "Go to line {0} and character {1}.", lineNumber, column));
+                return ( localize(4816, "Go to line {0} and character {1}.", lineNumber, column));
             }
-            return ( localizeWithPath(_moduleId, 2, "Go to line {0}.", lineNumber));
+            return ( localize(4817, "Go to line {0}.", lineNumber));
         }
         const position = editor.getPosition() || { lineNumber: 1, column: 1 };
         const lineCount = this.lineCount(editor);
         if (lineCount > 1) {
-            return ( localizeWithPath(
-                _moduleId,
-                3,
+            return ( localize(
+                4818,
                 "Current Line: {0}, Character: {1}. Type a line number between 1 and {2} to navigate to.",
                 position.lineNumber,
                 position.column,
                 lineCount
             ));
         }
-        return ( localizeWithPath(
-            _moduleId,
-            4,
+        return ( localize(
+            4819,
             "Current Line: {0}, Character: {1}. Type a line number to navigate to.",
             position.lineNumber,
             position.column

package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js

@@ -11,16 +11,15 @@ import { ScrollType } from '../../../common/editorCommon.js';
 import { SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol } from '../../../common/languages.js';
 import { IOutlineModelService } from '../../documentSymbols/browser/outlineModel.js';
 import { AbstractEditorNavigationQuickAccessProvider } from './editorNavigationQuickAccess.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { findLast } from '../../../../base/common/arraysFind.js';
 var AbstractGotoSymbolQuickAccessProvider_1;
-const _moduleId = "vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess";
 let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessProvider extends AbstractEditorNavigationQuickAccessProvider {
     static { AbstractGotoSymbolQuickAccessProvider_1 = this; }
     static { this.PREFIX = '@'; }
     static { this.SCOPE_PREFIX = ':'; }
-    static { this.PREFIX_BY_CATEGORY = `${AbstractGotoSymbolQuickAccessProvider_1.PREFIX}${AbstractGotoSymbolQuickAccessProvider_1.SCOPE_PREFIX}`; }
+    static { this.PREFIX_BY_CATEGORY = `${this.PREFIX}${this.SCOPE_PREFIX}`; }
     constructor(_languageFeaturesService, _outlineModelService, options = Object.create(null)) {
         super(options);
         this._languageFeaturesService = _languageFeaturesService;
@@ -29,9 +28,8 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         this.options.canAcceptInBackground = true;
     }
     provideWithoutTextEditor(picker) {
-        this.provideLabelPick(picker, ( localizeWithPath(
-            _moduleId,
-            0,
+        this.provideLabelPick(picker, ( localize(
+            4826,
             "To go to a symbol, first open a text editor with symbol information."
         )));
         return Disposable.None;
@@ -49,11 +47,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
     }
     doProvideWithoutEditorSymbols(context, model, picker, token) {
         const disposables = ( (new DisposableStore()));
-        this.provideLabelPick(picker, ( localizeWithPath(
-            _moduleId,
-            1,
-            "The active text editor does not provide symbol information."
-        )));
+        this.provideLabelPick(picker, ( localize(4827, "The active text editor does not provide symbol information.")));
         (async () => {
             const result = await this.waitForLanguageSymbolRegistry(model, disposables);
             if (!result || token.isCancellationRequested) {
@@ -124,10 +118,10 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
                 }
                 else {
                     if (query.original.length > 0) {
-                        this.provideLabelPick(picker, ( localizeWithPath(_moduleId, 2, "No matching editor symbols")));
+                        this.provideLabelPick(picker, ( localize(4828, "No matching editor symbols")));
                     }
                     else {
-                        this.provideLabelPick(picker, ( localizeWithPath(_moduleId, 3, "No editor symbols")));
+                        this.provideLabelPick(picker, ( localize(4829, "No editor symbols")));
                     }
                 }
             }
@@ -169,7 +163,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         if (openSideBySideDirection) {
             buttons = [{
                     iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
-                    tooltip: openSideBySideDirection === 'right' ? ( localizeWithPath(_moduleId, 4, "Open to the Side")) : ( localizeWithPath(_moduleId, 5, "Open to the Bottom"))
+                    tooltip: openSideBySideDirection === 'right' ? ( localize(4830, "Open to the Side")) : ( localize(4831, "Open to the Bottom"))
                 }];
         }
         const filteredSymbolPicks = [];
@@ -269,7 +263,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         }
         else if (sortedFilteredSymbolPicks.length > 0) {
             symbolPicks = [
-                { label: ( localizeWithPath(_moduleId, 6, "symbols ({0})", filteredSymbolPicks.length)), type: 'separator' },
+                { label: ( localize(4832, "symbols ({0})", filteredSymbolPicks.length)), type: 'separator' },
                 ...sortedFilteredSymbolPicks
             ];
         }
@@ -316,32 +310,32 @@ AbstractGotoSymbolQuickAccessProvider = AbstractGotoSymbolQuickAccessProvider_1
     ( (__param(0, ILanguageFeaturesService))),
     ( (__param(1, IOutlineModelService)))
 ], AbstractGotoSymbolQuickAccessProvider)));
-const FALLBACK_NLS_SYMBOL_KIND = ( localizeWithPath(_moduleId, 7, "properties ({0})"));
+const FALLBACK_NLS_SYMBOL_KIND = ( localize(4833, "properties ({0})"));
 const NLS_SYMBOL_KIND_CACHE = {
-    [SymbolKind.Method]: ( localizeWithPath(_moduleId, 8, "methods ({0})")),
-    [SymbolKind.Function]: ( localizeWithPath(_moduleId, 9, "functions ({0})")),
-    [SymbolKind.Constructor]: ( localizeWithPath(_moduleId, 10, "constructors ({0})")),
-    [SymbolKind.Variable]: ( localizeWithPath(_moduleId, 11, "variables ({0})")),
-    [SymbolKind.Class]: ( localizeWithPath(_moduleId, 12, "classes ({0})")),
-    [SymbolKind.Struct]: ( localizeWithPath(_moduleId, 13, "structs ({0})")),
-    [SymbolKind.Event]: ( localizeWithPath(_moduleId, 14, "events ({0})")),
-    [SymbolKind.Operator]: ( localizeWithPath(_moduleId, 15, "operators ({0})")),
-    [SymbolKind.Interface]: ( localizeWithPath(_moduleId, 16, "interfaces ({0})")),
-    [SymbolKind.Namespace]: ( localizeWithPath(_moduleId, 17, "namespaces ({0})")),
-    [SymbolKind.Package]: ( localizeWithPath(_moduleId, 18, "packages ({0})")),
-    [SymbolKind.TypeParameter]: ( localizeWithPath(_moduleId, 19, "type parameters ({0})")),
-    [SymbolKind.Module]: ( localizeWithPath(_moduleId, 20, "modules ({0})")),
-    [SymbolKind.Property]: ( localizeWithPath(_moduleId, 7, "properties ({0})")),
-    [SymbolKind.Enum]: ( localizeWithPath(_moduleId, 21, "enumerations ({0})")),
-    [SymbolKind.EnumMember]: ( localizeWithPath(_moduleId, 22, "enumeration members ({0})")),
-    [SymbolKind.String]: ( localizeWithPath(_moduleId, 23, "strings ({0})")),
-    [SymbolKind.File]: ( localizeWithPath(_moduleId, 24, "files ({0})")),
-    [SymbolKind.Array]: ( localizeWithPath(_moduleId, 25, "arrays ({0})")),
-    [SymbolKind.Number]: ( localizeWithPath(_moduleId, 26, "numbers ({0})")),
-    [SymbolKind.Boolean]: ( localizeWithPath(_moduleId, 27, "booleans ({0})")),
-    [SymbolKind.Object]: ( localizeWithPath(_moduleId, 28, "objects ({0})")),
-    [SymbolKind.Key]: ( localizeWithPath(_moduleId, 29, "keys ({0})")),
-    [SymbolKind.Field]: ( localizeWithPath(_moduleId, 30, "fields ({0})")),
-    [SymbolKind.Constant]: ( localizeWithPath(_moduleId, 31, "constants ({0})"))
+    [SymbolKind.Method]: ( localize(4834, "methods ({0})")),
+    [SymbolKind.Function]: ( localize(4835, "functions ({0})")),
+    [SymbolKind.Constructor]: ( localize(4836, "constructors ({0})")),
+    [SymbolKind.Variable]: ( localize(4837, "variables ({0})")),
+    [SymbolKind.Class]: ( localize(4838, "classes ({0})")),
+    [SymbolKind.Struct]: ( localize(4839, "structs ({0})")),
+    [SymbolKind.Event]: ( localize(4840, "events ({0})")),
+    [SymbolKind.Operator]: ( localize(4841, "operators ({0})")),
+    [SymbolKind.Interface]: ( localize(4842, "interfaces ({0})")),
+    [SymbolKind.Namespace]: ( localize(4843, "namespaces ({0})")),
+    [SymbolKind.Package]: ( localize(4844, "packages ({0})")),
+    [SymbolKind.TypeParameter]: ( localize(4845, "type parameters ({0})")),
+    [SymbolKind.Module]: ( localize(4846, "modules ({0})")),
+    [SymbolKind.Property]: ( localize(4846, "properties ({0})")),
+    [SymbolKind.Enum]: ( localize(4847, "enumerations ({0})")),
+    [SymbolKind.EnumMember]: ( localize(4848, "enumeration members ({0})")),
+    [SymbolKind.String]: ( localize(4849, "strings ({0})")),
+    [SymbolKind.File]: ( localize(4850, "files ({0})")),
+    [SymbolKind.Array]: ( localize(4851, "arrays ({0})")),
+    [SymbolKind.Number]: ( localize(4852, "numbers ({0})")),
+    [SymbolKind.Boolean]: ( localize(4853, "booleans ({0})")),
+    [SymbolKind.Object]: ( localize(4854, "objects ({0})")),
+    [SymbolKind.Key]: ( localize(4855, "keys ({0})")),
+    [SymbolKind.Field]: ( localize(4856, "fields ({0})")),
+    [SymbolKind.Constant]: ( localize(4857, "constants ({0})"))
 };
 export { AbstractGotoSymbolQuickAccessProvider };

package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js

@@ -3,8 +3,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { MessageController } from '../../message/browser/messageController.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/editor/contrib/readOnlyMessage/browser/contribution";
+import { localize } from '../../../../nls.js';
 class ReadOnlyMessageController extends Disposable {
     static { this.ID = 'editor.contrib.readOnlyMessageController'; }
     constructor(editor) {
@@ -18,10 +17,10 @@ class ReadOnlyMessageController extends Disposable {
             let message = this.editor.getOptions().get(EditorOption.readOnlyMessage);
             if (!message) {
                 if (this.editor.isSimpleWidget) {
-                    message = ( (new MarkdownString(( localizeWithPath(_moduleId, 0, "Cannot edit in read-only input")))));
+                    message = ( (new MarkdownString(( localize(1931, "Cannot edit in read-only input")))));
                 }
                 else {
-                    message = ( (new MarkdownString(( localizeWithPath(_moduleId, 1, "Cannot edit in read-only editor")))));
+                    message = ( (new MarkdownString(( localize(1932, "Cannot edit in read-only editor")))));
                 }
             }
             messageController.showMessage(message, this.editor.getPosition());