@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js

@@ -14,7 +14,7 @@ import { CodeActionKeybindingResolver } from './codeActionKeybindingResolver.js'
 import { toMenuItems } from './codeActionMenu.js';
 import { LightBulbWidget } from './lightBulbWidget.js';
 import { MessageController } from '../../message/browser/messageController.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -39,7 +39,6 @@ import { CodeActionTriggerSource, CodeActionAutoApply, CodeActionKind } from '..
 import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 var CodeActionController_1;
-const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionController";
 const DECORATION_CLASS_NAME = 'quickfix-edit-highlight';
 let CodeActionController = class CodeActionController extends Disposable {
     static { CodeActionController_1 = this; }
@@ -123,10 +122,11 @@ let CodeActionController = class CodeActionController extends Disposable {
     }
     hideLightBulbWidget() {
         this._lightBulbWidget.rawValue?.hide();
+        this._lightBulbWidget.rawValue?.gutterHide();
     }
     async update(newState) {
         if (newState.type !== CodeActionsState.Type.Triggered) {
-            this._lightBulbWidget.rawValue?.hide();
+            this.hideLightBulbWidget();
             return;
         }
         let actions;
@@ -146,7 +146,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                 const validActionToApply = this.tryGetValidActionToApply(newState.trigger, actions);
                 if (validActionToApply) {
                     try {
-                        this._lightBulbWidget.value?.hide();
+                        this.hideLightBulbWidget();
                         await this._applyCodeAction(validActionToApply, false, false, ApplyCodeActionReason.FromCodeActions);
                     }
                     finally {
@@ -269,9 +269,8 @@ let CodeActionController = class CodeActionController extends Disposable {
                         const diagnostic = diagnostics[0];
                         if (diagnostic.startLineNumber && diagnostic.startColumn) {
                             const selectionText = this._editor.getModel()?.getWordAtPosition({ lineNumber: diagnostic.startLineNumber, column: diagnostic.startColumn })?.word;
-                            status(( localizeWithPath(
-                                _moduleId,
-                                0,
+                            status(( localize(
+                                4930,
                                 "Context: {0} at line {1} and column {2}.",
                                 selectionText,
                                 diagnostic.startLineNumber,
@@ -318,7 +317,7 @@ let CodeActionController = class CodeActionController extends Disposable {
         if (options.includeDisabledActions && actions.validActions.length > 0 && actions.allActions.length !== actions.validActions.length) {
             resultActions.push(this._showDisabled ? {
                 id: 'hideMoreActions',
-                label: ( localizeWithPath(_moduleId, 1, 'Hide Disabled')),
+                label: ( localize(4931, 'Hide Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,
@@ -328,7 +327,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                 }
             } : {
                 id: 'showMoreActions',
-                label: ( localizeWithPath(_moduleId, 2, 'Show Disabled')),
+                label: ( localize(4932, 'Show Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js

@@ -3,19 +3,18 @@ import '../../../../base/browser/ui/codicons/codicon/codicon-modifiers.css.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { CodeActionKind } from '../common/types.js';
 import '../../symbolIcons/browser/symbolIcons.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ActionListItemKind } from '../../../../platform/actionWidget/browser/actionList.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionMenu";
-const uncategorizedCodeActionGroup = ( (Object.freeze({ kind: HierarchicalKind.Empty, title: ( localizeWithPath(_moduleId, 0, 'More Actions...')) })));
+const uncategorizedCodeActionGroup = ( (Object.freeze({ kind: HierarchicalKind.Empty, title: ( localize(9822, 'More Actions...')) })));
 const codeActionGroups = ( (Object.freeze([
-    { kind: CodeActionKind.QuickFix, title: ( localizeWithPath(_moduleId, 1, 'Quick Fix')) },
-    { kind: CodeActionKind.RefactorExtract, title: ( localizeWithPath(_moduleId, 2, 'Extract')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorInline, title: ( localizeWithPath(_moduleId, 3, 'Inline')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorRewrite, title: ( localizeWithPath(_moduleId, 4, 'Rewrite')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorMove, title: ( localizeWithPath(_moduleId, 5, 'Move')), icon: Codicon.wrench },
-    { kind: CodeActionKind.SurroundWith, title: ( localizeWithPath(_moduleId, 6, 'Surround With')), icon: Codicon.surroundWith },
-    { kind: CodeActionKind.Source, title: ( localizeWithPath(_moduleId, 7, 'Source Action')), icon: Codicon.symbolFile },
+    { kind: CodeActionKind.QuickFix, title: ( localize(9823, 'Quick Fix')) },
+    { kind: CodeActionKind.RefactorExtract, title: ( localize(9824, 'Extract')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorInline, title: ( localize(9825, 'Inline')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorRewrite, title: ( localize(9826, 'Rewrite')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorMove, title: ( localize(9827, 'Move')), icon: Codicon.wrench },
+    { kind: CodeActionKind.SurroundWith, title: ( localize(9828, 'Surround With')), icon: Codicon.surroundWith },
+    { kind: CodeActionKind.Source, title: ( localize(9829, 'Source Action')), icon: Codicon.symbolFile },
     uncategorizedCodeActionGroup,
 ])));
 function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .lightBulbWidget{align-items:center;display:flex;justify-content:center}.monaco-editor .lightBulbWidget:hover{cursor:pointer}.monaco-editor .lightBulbWidget.codicon-light-bulb,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle{color:var(--vscode-editorLightBulb-foreground)}.monaco-editor .lightBulbWidget.codicon-lightbulb-autofix,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle-autofix{color:var(--vscode-editorLightBulbAutoFix-foreground,var(--vscode-editorLightBulb-foreground))}.monaco-editor .lightBulbWidget.codicon-sparkle-filled{color:var(--vscode-editorLightBulbAi-foreground,var(--vscode-icon-foreground))}.monaco-editor .lightBulbWidget:before{position:relative;z-index:2}.monaco-editor .lightBulbWidget:after{content:\"\";display:block;height:100%;left:0;opacity:.3;position:absolute;top:0;width:100%;z-index:1}";
+var css = ".monaco-editor .lightBulbWidget{align-items:center;display:flex;justify-content:center}.monaco-editor .lightBulbWidget:hover{cursor:pointer}.monaco-editor .lightBulbWidget.codicon-light-bulb,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle{color:var(--vscode-editorLightBulb-foreground)}.monaco-editor .lightBulbWidget.codicon-lightbulb-autofix,.monaco-editor .lightBulbWidget.codicon-lightbulb-sparkle-autofix{color:var(--vscode-editorLightBulbAutoFix-foreground,var(--vscode-editorLightBulb-foreground))}.monaco-editor .lightBulbWidget.codicon-sparkle-filled{color:var(--vscode-editorLightBulbAi-foreground,var(--vscode-icon-foreground))}.monaco-editor .lightBulbWidget:before{position:relative;z-index:2}.monaco-editor .lightBulbWidget:after{content:\"\";display:block;height:100%;left:0;opacity:.3;position:absolute;top:0;width:100%;z-index:1}.monaco-editor .glyph-margin-widgets .cgmr[class*=codicon-gutter-lightbulb]{cursor:pointer;display:block}.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb,.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-sparkle{color:var(--vscode-editorLightBulb-foreground)}.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-aifix-auto-fix,.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-auto-fix{color:var(--vscode-editorLightBulbAutoFix-foreground,var(--vscode-editorLightBulb-foreground))}.monaco-editor .glyph-margin-widgets .cgmr.codicon-gutter-lightbulb-sparkle-filled{color:var(--vscode-editorLightBulbAi-foreground,var(--vscode-icon-foreground))}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js

@@ -8,12 +8,35 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import './lightBulbWidget.css.js';
 import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
+import { GlyphMarginLane, TrackedRangeStickiness } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { computeIndentLevel } from '../../../common/model/utils.js';
 import { autoFixCommandId, quickFixCommandId } from './codeAction.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+import { Range } from '../../../common/core/range.js';
 var LightBulbWidget_1;
-const _moduleId = "vs/editor/contrib/codeAction/browser/lightBulbWidget";
+const GUTTER_LIGHTBULB_ICON = registerIcon('gutter-lightbulb', Codicon.lightBulb, ( localize(
+    4933,
+    'Icon which spawns code actions menu from the gutter when there is no space in the editor.'
+)));
+const GUTTER_LIGHTBULB_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-auto-fix', Codicon.lightbulbAutofix, ( localize(
+    4934,
+    'Icon which spawns code actions menu from the gutter when there is no space in the editor and a quick fix is available.'
+)));
+const GUTTER_LIGHTBULB_AIFIX_ICON = registerIcon('gutter-lightbulb-sparkle', Codicon.lightbulbSparkle, ( localize(
+    4935,
+    'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix is available.'
+)));
+const GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-aifix-auto-fix', Codicon.lightbulbSparkleAutofix, ( localize(
+    4936,
+    'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'
+)));
+const GUTTER_SPARKLE_FILLED_ICON = registerIcon('gutter-lightbulb-sparkle-filled', Codicon.sparkleFilled, ( localize(
+    4937,
+    'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'
+)));
 var LightBulbState;
 ( ((function(LightBulbState) {
     let Type;
@@ -35,6 +58,12 @@ var LightBulbState;
 })(LightBulbState || (LightBulbState = {}))));
 let LightBulbWidget = class LightBulbWidget extends Disposable {
     static { LightBulbWidget_1 = this; }
+    static { this.GUTTER_DECORATION = ModelDecorationOptions.register({
+        description: 'codicon-gutter-lightbulb-decoration',
+        glyphMarginClassName: ThemeIcon.asClassName(Codicon.lightBulb),
+        glyphMargin: { position: GlyphMarginLane.Left },
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+    }); }
     static { this.ID = 'editor.contrib.lightbulbWidget'; }
     static { this._posPref = [ContentWidgetPositionPreference.EXACT]; }
     constructor(_editor, _keybindingService) {
@@ -44,7 +73,9 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._onClick = this._register(( (new Emitter())));
         this.onClick = this._onClick.event;
         this._state = LightBulbState.Hidden;
+        this._gutterState = LightBulbState.Hidden;
         this._iconClasses = [];
+        this.gutterDecoration = LightBulbWidget_1.GUTTER_DECORATION;
         this._domNode = $('div.lightBulbWidget');
         this._domNode.role = 'listbox';
         this._register(Gesture.ignoreTarget(this._domNode));
@@ -54,6 +85,9 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             if (this.state.type !== LightBulbState.Type.Showing || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
                 this.hide();
             }
+            if (this.gutterState.type !== LightBulbState.Type.Showing || !editorModel || this.gutterState.editorPosition.lineNumber >= editorModel.getLineCount()) {
+                this.gutterHide();
+            }
         }));
         this._register(addStandardDisposableGenericMouseDownListener(this._domNode, e => {
             if (this.state.type !== LightBulbState.Type.Showing) {
@@ -85,10 +119,41 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             this._quickFixKbLabel = this._keybindingService.lookupKeybinding(quickFixCommandId)?.getLabel() ?? undefined;
             this._updateLightBulbTitleAndIcon();
         }));
+        this._register(this._editor.onMouseDown(async (e) => {
+            const lightbulbClasses = [
+                'codicon-' + GUTTER_LIGHTBULB_ICON.id,
+                'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
+                'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
+                'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
+                'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
+            ];
+            if (!e.target.element || !( (lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))))) {
+                return;
+            }
+            if (this.gutterState.type !== LightBulbState.Type.Showing) {
+                return;
+            }
+            this._editor.focus();
+            const { top, height } = getDomNodePagePosition(e.target.element);
+            const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+            let pad = Math.floor(lineHeight / 3);
+            if (this.gutterState.widgetPosition.position !== null && this.gutterState.widgetPosition.position.lineNumber < this.gutterState.editorPosition.lineNumber) {
+                pad += lineHeight;
+            }
+            this._onClick.fire({
+                x: e.event.posx,
+                y: top + height + pad,
+                actions: this.gutterState.actions,
+                trigger: this.gutterState.trigger,
+            });
+        }));
     }
     dispose() {
         super.dispose();
         this._editor.removeContentWidget(this);
+        if (this._gutterDecorationID) {
+            this._removeGutterDecoration(this._gutterDecorationID);
+        }
     }
     getId() {
         return 'LightBulbWidget';
@@ -101,14 +166,17 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
     }
     update(actions, trigger, atPosition) {
         if (actions.validActions.length <= 0) {
+            this.gutterHide();
             return this.hide();
         }
         const options = this._editor.getOptions();
         if (!options.get(EditorOption.lightbulb).enabled) {
+            this.gutterHide();
             return this.hide();
         }
         const model = this._editor.getModel();
         if (!model) {
+            this.gutterHide();
             return this.hide();
         }
         const { lineNumber, column } = model.validatePosition(atPosition);
@@ -134,13 +202,38 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
                 const nextLineEmptyOrIndented = !endLine && isLineEmptyOrIndented(lineNumber + 1);
                 const currLineEmptyOrIndented = isLineEmptyOrIndented(lineNumber);
                 const notEmpty = !nextLineEmptyOrIndented && !prevLineEmptyOrIndented;
-                if (prevLineEmptyOrIndented || endLine || (notEmpty && !currLineEmptyOrIndented)) {
+                let hasDecoration = false;
+                const currLineDecorations = this._editor.getLineDecorations(lineNumber);
+                if (currLineDecorations) {
+                    for (const decoration of currLineDecorations) {
+                        if (decoration.options.glyphMarginClassName?.includes(Codicon.debugBreakpoint.id)) {
+                            hasDecoration = true;
+                        }
+                    }
+                }
+                if (!nextLineEmptyOrIndented && !prevLineEmptyOrIndented && !hasDecoration) {
+                    this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
+                        position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
+                        preference: LightBulbWidget_1._posPref
+                    });
+                    this.renderGutterLightbub();
+                    return this.hide();
+                }
+                else if (prevLineEmptyOrIndented || endLine || (notEmpty && !currLineEmptyOrIndented)) {
                     effectiveLineNumber -= 1;
                 }
                 else if (nextLineEmptyOrIndented || (notEmpty && currLineEmptyOrIndented)) {
                     effectiveLineNumber += 1;
                 }
             }
+            else if (lineNumber === 1 && (lineNumber === model.getLineCount() || !isLineEmptyOrIndented(lineNumber + 1) && !isLineEmptyOrIndented(lineNumber))) {
+                this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
+                    position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
+                    preference: LightBulbWidget_1._posPref
+                });
+                this.renderGutterLightbub();
+                return this.hide();
+            }
             else if ((lineNumber < model.getLineCount()) && !isFolded(lineNumber + 1)) {
                 effectiveLineNumber += 1;
             }
@@ -153,6 +246,10 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
             preference: LightBulbWidget_1._posPref
         });
+        if (this._gutterDecorationID) {
+            this._removeGutterDecoration(this._gutterDecorationID);
+            this.gutterHide();
+        }
         const validActions = actions.validActions;
         const actionKind = actions.validActions[0].action.kind;
         if (validActions.length !== 1 || !actionKind) {
@@ -168,11 +265,25 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this.state = LightBulbState.Hidden;
         this._editor.layoutContentWidget(this);
     }
+    gutterHide() {
+        if (this.gutterState === LightBulbState.Hidden) {
+            return;
+        }
+        if (this._gutterDecorationID) {
+            this._removeGutterDecoration(this._gutterDecorationID);
+        }
+        this.gutterState = LightBulbState.Hidden;
+    }
     get state() { return this._state; }
     set state(value) {
         this._state = value;
         this._updateLightBulbTitleAndIcon();
     }
+    get gutterState() { return this._gutterState; }
+    set gutterState(value) {
+        this._gutterState = value;
+        this._updateGutterLightBulbTitleAndIcon();
+    }
     _updateLightBulbTitleAndIcon() {
         this._domNode.classList.remove(...this._iconClasses);
         this._iconClasses = [];
@@ -205,26 +316,89 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._iconClasses = ThemeIcon.asClassNameArray(icon);
         this._domNode.classList.add(...this._iconClasses);
     }
+    _updateGutterLightBulbTitleAndIcon() {
+        if (this.gutterState.type !== LightBulbState.Type.Showing) {
+            return;
+        }
+        let icon;
+        let autoRun = false;
+        if (this.gutterState.actions.allAIFixes) {
+            icon = GUTTER_SPARKLE_FILLED_ICON;
+            if (this.gutterState.actions.validActions.length === 1) {
+                autoRun = true;
+            }
+        }
+        else if (this.gutterState.actions.hasAutoFix) {
+            if (this.gutterState.actions.hasAIFix) {
+                icon = GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON;
+            }
+            else {
+                icon = GUTTER_LIGHTBULB_AUTO_FIX_ICON;
+            }
+        }
+        else if (this.gutterState.actions.hasAIFix) {
+            icon = GUTTER_LIGHTBULB_AIFIX_ICON;
+        }
+        else {
+            icon = GUTTER_LIGHTBULB_ICON;
+        }
+        this._updateLightbulbTitle(this.gutterState.actions.hasAutoFix, autoRun);
+        const GUTTER_DECORATION = ModelDecorationOptions.register({
+            description: 'codicon-gutter-lightbulb-decoration',
+            glyphMarginClassName: ThemeIcon.asClassName(icon),
+            glyphMargin: { position: GlyphMarginLane.Left },
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        });
+        this.gutterDecoration = GUTTER_DECORATION;
+    }
+    renderGutterLightbub() {
+        const selection = this._editor.getSelection();
+        if (!selection) {
+            return;
+        }
+        if (this._gutterDecorationID === undefined) {
+            this._addGutterDecoration(selection.startLineNumber);
+        }
+        else {
+            this._updateGutterDecoration(this._gutterDecorationID, selection.startLineNumber);
+        }
+    }
+    _addGutterDecoration(lineNumber) {
+        this._editor.changeDecorations((accessor) => {
+            this._gutterDecorationID = accessor.addDecoration(( (new Range(lineNumber, 0, lineNumber, 0))), this.gutterDecoration);
+        });
+    }
+    _removeGutterDecoration(decorationId) {
+        this._editor.changeDecorations((accessor) => {
+            accessor.removeDecoration(decorationId);
+            this._gutterDecorationID = undefined;
+        });
+    }
+    _updateGutterDecoration(decorationId, lineNumber) {
+        this._editor.changeDecorations((accessor) => {
+            accessor.changeDecoration(decorationId, ( (new Range(lineNumber, 0, lineNumber, 0))));
+            accessor.changeDecorationOptions(decorationId, this.gutterDecoration);
+        });
+    }
     _updateLightbulbTitle(autoFix, autoRun) {
         if (this.state.type !== LightBulbState.Type.Showing) {
             return;
         }
         if (autoRun) {
-            this.title = ( localizeWithPath(_moduleId, 0, "Run: {0}", this.state.actions.validActions[0].action.title));
+            this.title = ( localize(4938, "Run: {0}", this.state.actions.validActions[0].action.title));
         }
         else if (autoFix && this._preferredKbLabel) {
-            this.title = ( localizeWithPath(
-                _moduleId,
-                1,
+            this.title = ( localize(
+                4939,
                 "Show Code Actions. Preferred Quick Fix Available ({0})",
                 this._preferredKbLabel
             ));
         }
         else if (!autoFix && this._quickFixKbLabel) {
-            this.title = ( localizeWithPath(_moduleId, 2, "Show Code Actions ({0})", this._quickFixKbLabel));
+            this.title = ( localize(4940, "Show Code Actions ({0})", this._quickFixKbLabel));
         }
         else if (!autoFix) {
-            this.title = ( localizeWithPath(_moduleId, 3, "Show Code Actions"));
+            this.title = ( localize(4941, "Show Code Actions"));
         }
     }
     set title(value) {

package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js

@@ -29,14 +29,13 @@ let CodeLensCache = class CodeLensCache {
         const key = 'codelens/cache2';
         const raw = storageService.get(key, StorageScope.WORKSPACE, '{}');
         this._deserialize(raw);
-        Event.once(storageService.onWillSaveState)(e => {
-            if (e.reason === WillSaveStateReason.SHUTDOWN) {
-                storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
-            }
+        const onWillSaveStateBecauseOfShutdown = Event.filter(storageService.onWillSaveState, e => e.reason === WillSaveStateReason.SHUTDOWN);
+        Event.once(onWillSaveStateBecauseOfShutdown)(e => {
+            storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         });
     }
     put(model, data) {
-        const copyItems = ( data.lenses.map(item => {
+        const copyItems = ( data.lenses.map((item) => {
             return {
                 range: item.symbol.range,
                 command: item.symbol.command && { id: '', title: item.symbol.command?.title },

package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js

@@ -10,13 +10,12 @@ import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { getCodeLensModel } from './codelens.js';
 import { ICodeLensCache } from './codeLensCache.js';
 import { CodeLensWidget, CodeLensHelper } from './codelensWidget.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-const _moduleId = "vs/editor/contrib/codelens/browser/codelensController";
 let CodeLensContribution = class CodeLensContribution {
     static { this.ID = 'css.editor.codeLens'; }
     constructor(_editor, _languageFeaturesService, debounceService, _commandService, _notificationService, _codeLensCache) {
@@ -389,7 +388,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         super({
             id: 'codelens.showLensesInCurrentLine',
             precondition: EditorContextKeys.hasCodeLensProvider,
-            label: ( localizeWithPath(_moduleId, 0, "Show CodeLens Commands For Current Line")),
+            label: ( localize(1315, "Show CodeLens Commands For Current Line")),
             alias: 'Show CodeLens Commands For Current Line',
         });
     }
@@ -423,7 +422,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         }
         const item = await quickInputService.pick(items, {
             canPickMany: false,
-            placeHolder: ( localizeWithPath(_moduleId, 1, "Select a command"))
+            placeHolder: ( localize(1316, "Select a command"))
         });
         if (!item) {
             return;

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js

@@ -13,8 +13,7 @@ import { ColorPickerWidget } from './colorPickerWidget.js';
 import { RenderedHoverParts, HoverAnchorType } from '../../hover/browser/hoverTypes.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { Dimension } from '../../../../base/browser/dom.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/editor/contrib/colorPicker/browser/colorHoverParticipant";
+import { localize } from '../../../../nls.js';
 class ColorHover {
     constructor(owner, range, model, provider) {
         this.owner = owner;
@@ -79,7 +78,7 @@ let ColorHoverParticipant = class ColorHoverParticipant {
         );
     }
     getAccessibleContent(hoverPart) {
-        return ( localizeWithPath(_moduleId, 0, 'There is a color picker here.'));
+        return ( localize(4901, 'There is a color picker here.'));
     }
     handleResize() {
         this._colorPicker?.layout();

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js

@@ -8,7 +8,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './colorPicker.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -21,7 +21,6 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const _moduleId = "vs/editor/contrib/colorPicker/browser/colorPickerWidget";
 const $ = $$1;
 class ColorPickerHeader extends Disposable {
     constructor(container, model, themeService, showingStandaloneColorPicker = false) {
@@ -35,7 +34,7 @@ class ColorPickerHeader extends Disposable {
         append(this._pickedColorNode, $('span.codicon.codicon-color-mode'));
         this._pickedColorPresentation = append(this._pickedColorNode, document.createElement('span'));
         this._pickedColorPresentation.classList.add('picked-color-presentation');
-        const tooltip = ( localizeWithPath(_moduleId, 0, "Click to toggle color options (rgb/hsl/hex)"));
+        const tooltip = ( localize(9813, "Click to toggle color options (rgb/hsl/hex)"));
         this._pickedColorNode.setAttribute('title', tooltip);
         this._originalColorNode = append(this._domNode, $('.original-color'));
         this._originalColorNode.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor) || '';
@@ -90,7 +89,7 @@ class CloseButton extends Disposable {
         const innerDiv = document.createElement('div');
         innerDiv.classList.add('close-button-inner-div');
         append(this._button, innerDiv);
-        const closeButton = append(innerDiv, $('.button' + ThemeIcon.asCSSSelector(registerIcon('color-picker-close', Codicon.close, ( localizeWithPath(_moduleId, 1, 'Icon to close the color picker'))))));
+        const closeButton = append(innerDiv, $('.button' + ThemeIcon.asCSSSelector(registerIcon('color-picker-close', Codicon.close, ( localize(9814, 'Icon to close the color picker'))))));
         closeButton.classList.add('close-icon');
         this._register(addDisposableListener(this._button, EventType.CLICK, () => {
             this._onClicked.fire();

package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js

@@ -1,28 +1,26 @@
 import { registerEditorAction, EditorAction2, EditorAction } from '../../../browser/editorExtensions.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { StandaloneColorPickerController } from './standaloneColorPickerWidget.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { registerAction2, MenuId } from '../../../../platform/actions/common/actions.js';
 import './colorPicker.css.js';
-const _moduleId = "vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions";
 class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.showOrFocusStandaloneColorPicker',
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Show or Focus Standalone Color Picker")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Show or Focus Standalone Color Picker")),
+                ...( localize2(1317, "Show or Focus Standalone Color Picker")),
+                mnemonicTitle: ( localize(1318, "&&Show or Focus Standalone Color Picker")),
             },
             precondition: undefined,
             menu: [
                 { id: MenuId.CommandPalette },
             ],
             metadata: {
-                description: ( localize2WithPath(
-                    _moduleId,
-                    2,
+                description: ( localize2(
+                    1319,
                     "Show or focus a standalone color picker which uses the default color provider. It displays hex/rgb/hsl colors."
                 )),
             }
@@ -36,7 +34,7 @@ class HideStandaloneColorPicker extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.hideColorPicker',
-            label: ( localizeWithPath(_moduleId, 3, "Hide the Color Picker")),
+            label: ( localize(1320, "Hide the Color Picker")),
             alias: 'Hide the Color Picker',
             precondition: ( (EditorContextKeys.standaloneColorPickerVisible.isEqualTo(true))),
             kbOpts: {
@@ -44,7 +42,7 @@ class HideStandaloneColorPicker extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2WithPath(_moduleId, 4, "Hide the standalone color picker.")),
+                description: ( localize2(1321, "Hide the standalone color picker.")),
             }
         });
     }
@@ -56,7 +54,7 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.insertColorWithStandaloneColorPicker',
-            label: ( localizeWithPath(_moduleId, 5, "Insert Color with Standalone Color Picker")),
+            label: ( localize(1322, "Insert Color with Standalone Color Picker")),
             alias: 'Insert Color with Standalone Color Picker',
             precondition: ( (EditorContextKeys.standaloneColorPickerFocused.isEqualTo(true))),
             kbOpts: {
@@ -64,9 +62,8 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2WithPath(
-                    _moduleId,
-                    6,
+                description: ( localize2(
+                    1323,
                     "Insert hex/rgb/hsl colors with the focused standalone color picker."
                 )),
             }