@codingame/monaco-vscode-api 18.4.0 → 19.0.1

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

@@ -21,23 +21,23 @@ const argsSchema = {
     properties: {
         'kind': {
             type: 'string',
-            description: ( localize(897, "Kind of the code action to run.")),
+            description: ( localize(908, "Kind of the code action to run.")),
         },
         'apply': {
             type: 'string',
-            description: ( localize(898, "Controls when the returned actions are applied.")),
+            description: ( localize(909, "Controls when the returned actions are applied.")),
             default: CodeActionAutoApply.IfSingle,
             enum: [CodeActionAutoApply.First, CodeActionAutoApply.IfSingle, CodeActionAutoApply.Never],
             enumDescriptions: [
-                ( localize(899, "Always apply the first returned code action.")),
-                ( localize(900, "Apply the first returned code action if it is the only one.")),
-                ( localize(901, "Do not apply the returned code actions.")),
+                ( localize(910, "Always apply the first returned code action.")),
+                ( localize(911, "Apply the first returned code action if it is the only one.")),
+                ( localize(912, "Do not apply the returned code actions.")),
             ]
         },
         'preferred': {
             type: 'boolean',
             default: false,
-            description: ( localize(902, "Controls if only preferred code actions should be returned.")),
+            description: ( localize(913, "Controls if only preferred code actions should be returned.")),
         }
     }
 };
@@ -51,7 +51,7 @@ class QuickFixAction extends EditorAction {
     constructor() {
         super({
             id: quickFixCommandId,
-            label: ( localize2(903, "Quick Fix...")),
+            label: ( localize2(914, "Quick Fix...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -61,7 +61,7 @@ class QuickFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(904, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(915, "No code actions available")), undefined, undefined, CodeActionTriggerSource.QuickFix);
     }
 }
 class CodeActionCommand extends EditorCommand {
@@ -82,11 +82,11 @@ class CodeActionCommand extends EditorCommand {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(905, "No preferred code actions for '{0}' available", userArgs.kind))
-                : ( localize(906, "No code actions for '{0}' available", userArgs.kind))
+                ? ( localize(916, "No preferred code actions for '{0}' available", userArgs.kind))
+                : ( localize(917, "No code actions for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(907, "No preferred code actions available"))
-                : ( localize(908, "No code actions available")), {
+                ? ( localize(918, "No preferred code actions available"))
+                : ( localize(919, "No code actions available")), {
             include: args.kind,
             includeSourceActions: true,
             onlyIncludePreferredActions: args.preferred,
@@ -97,7 +97,7 @@ class RefactorAction extends EditorAction {
     constructor() {
         super({
             id: refactorCommandId,
-            label: ( localize2(909, "Refactor...")),
+            label: ( localize2(920, "Refactor...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -128,11 +128,11 @@ class RefactorAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(910, "No preferred refactorings for '{0}' available", userArgs.kind))
-                : ( localize(911, "No refactorings for '{0}' available", userArgs.kind))
+                ? ( localize(921, "No preferred refactorings for '{0}' available", userArgs.kind))
+                : ( localize(922, "No refactorings for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(912, "No preferred refactorings available"))
-                : ( localize(913, "No refactorings available")), {
+                ? ( localize(923, "No preferred refactorings available"))
+                : ( localize(924, "No refactorings available")), {
             include: CodeActionKind.Refactor.contains(args.kind) ? args.kind : HierarchicalKind.None,
             onlyIncludePreferredActions: args.preferred
         }, args.apply, CodeActionTriggerSource.Refactor);
@@ -142,7 +142,7 @@ class SourceAction extends EditorAction {
     constructor() {
         super({
             id: sourceActionCommandId,
-            label: ( localize2(914, "Source Action...")),
+            label: ( localize2(925, "Source Action...")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)),
             contextMenuOpts: {
                 group: '1_modification',
@@ -165,11 +165,11 @@ class SourceAction extends EditorAction {
         });
         return triggerCodeActionsForEditorSelection(editor, typeof userArgs?.kind === 'string'
             ? args.preferred
-                ? ( localize(915, "No preferred source actions for '{0}' available", userArgs.kind))
-                : ( localize(916, "No source actions for '{0}' available", userArgs.kind))
+                ? ( localize(926, "No preferred source actions for '{0}' available", userArgs.kind))
+                : ( localize(927, "No source actions for '{0}' available", userArgs.kind))
             : args.preferred
-                ? ( localize(917, "No preferred source actions available"))
-                : ( localize(918, "No source actions available")), {
+                ? ( localize(928, "No preferred source actions available"))
+                : ( localize(929, "No source actions available")), {
             include: CodeActionKind.Source.contains(args.kind) ? args.kind : HierarchicalKind.None,
             includeSourceActions: true,
             onlyIncludePreferredActions: args.preferred,
@@ -180,7 +180,7 @@ class OrganizeImportsAction extends EditorAction {
     constructor() {
         super({
             id: organizeImportsCommandId,
-            label: ( localize2(919, "Organize Imports")),
+            label: ( localize2(930, "Organize Imports")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.SourceOrganizeImports)
@@ -192,21 +192,21 @@ class OrganizeImportsAction extends EditorAction {
             },
             metadata: {
                 description: ( localize2(
-                    920,
+                    931,
                     "Organize imports in the current file. Also called 'Optimize Imports' by some tools"
                 ))
             }
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(921, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(932, "No organize imports action available")), { include: CodeActionKind.SourceOrganizeImports, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.OrganizeImports);
     }
 }
 class FixAllAction extends EditorAction {
     constructor() {
         super({
             id: fixAllCommandId,
-            label: ( localize2(922, "Fix All")),
+            label: ( localize2(933, "Fix All")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.SourceFixAll)
@@ -214,14 +214,14 @@ class FixAllAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(923, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
+        return triggerCodeActionsForEditorSelection(editor, ( localize(934, "No fix all action available")), { include: CodeActionKind.SourceFixAll, includeSourceActions: true }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.FixAll);
     }
 }
 class AutoFixAction extends EditorAction {
     constructor() {
         super({
             id: autoFixCommandId,
-            label: ( localize2(924, "Auto Fix...")),
+            label: ( localize2(935, "Auto Fix...")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 contextKeyForSupportedActions(CodeActionKind.QuickFix)
@@ -237,7 +237,7 @@ class AutoFixAction extends EditorAction {
         });
     }
     run(_accessor, editor) {
-        return triggerCodeActionsForEditorSelection(editor, ( localize(925, "No auto fixes available")), {
+        return triggerCodeActionsForEditorSelection(editor, ( localize(936, "No auto fixes available")), {
             include: CodeActionKind.QuickFix,
             onlyIncludePreferredActions: true
         }, CodeActionAutoApply.IfSingle, CodeActionTriggerSource.AutoFix);

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

@@ -23,7 +23,7 @@ registerEditorCommand(( new CodeActionCommand()));
         'editor.codeActionWidget.showHeaders': {
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(926, "Enable/disable showing group headers in the Code Action menu.")),
+            description: ( localize(937, "Enable/disable showing group headers in the Code Action menu.")),
             default: true,
         },
     }
@@ -35,7 +35,7 @@ registerEditorCommand(( new CodeActionCommand()));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localize(
-                927,
+                938,
                 "Enable/disable showing nearest Quick Fix within a line when not currently on a diagnostic."
             )),
             default: true,
@@ -49,7 +49,7 @@ registerEditorCommand(( new CodeActionCommand()));
             type: 'boolean',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             markdownDescription: ( localize(
-                928,
+                939,
                 'Enable triggering {0} when {1} is set to {2}. Code Actions must be set to {3} to be triggered for window and focus changes.',
                 '`#editor.codeActionsOnSave#`',
                 '`#files.autoSave#`',

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

@@ -279,7 +279,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                         if (diagnostic.startLineNumber && diagnostic.startColumn) {
                             const selectionText = this._editor.getModel()?.getWordAtPosition({ lineNumber: diagnostic.startLineNumber, column: diagnostic.startColumn })?.word;
                             status(( localize(
-                                929,
+                                940,
                                 "Context: {0} at line {1} and column {2}.",
                                 selectionText,
                                 diagnostic.startLineNumber,
@@ -326,7 +326,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: ( localize(930, 'Hide Disabled')),
+                label: ( localize(941, 'Hide Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,
@@ -336,7 +336,7 @@ let CodeActionController = class CodeActionController extends Disposable {
                 }
             } : {
                 id: 'showMoreActions',
-                label: ( localize(931, 'Show Disabled')),
+                label: ( localize(942, 'Show Disabled')),
                 enabled: true,
                 tooltip: '',
                 class: undefined,

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

@@ -7,15 +7,15 @@ import { localize } from '../../../../nls.js';
 import { ActionListItemKind } from '../../../../platform/actionWidget/browser/actionList.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 
-const uncategorizedCodeActionGroup = ( Object.freeze({ kind: HierarchicalKind.Empty, title: ( localize(932, 'More Actions...')) }));
+const uncategorizedCodeActionGroup = ( Object.freeze({ kind: HierarchicalKind.Empty, title: ( localize(943, 'More Actions...')) }));
 const codeActionGroups = ( Object.freeze([
-    { kind: CodeActionKind.QuickFix, title: ( localize(933, 'Quick Fix')) },
-    { kind: CodeActionKind.RefactorExtract, title: ( localize(934, 'Extract')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorInline, title: ( localize(935, 'Inline')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorRewrite, title: ( localize(936, 'Rewrite')), icon: Codicon.wrench },
-    { kind: CodeActionKind.RefactorMove, title: ( localize(937, 'Move')), icon: Codicon.wrench },
-    { kind: CodeActionKind.SurroundWith, title: ( localize(938, 'Surround With')), icon: Codicon.surroundWith },
-    { kind: CodeActionKind.Source, title: ( localize(939, 'Source Action')), icon: Codicon.symbolFile },
+    { kind: CodeActionKind.QuickFix, title: ( localize(944, 'Quick Fix')) },
+    { kind: CodeActionKind.RefactorExtract, title: ( localize(945, 'Extract')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorInline, title: ( localize(946, 'Inline')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorRewrite, title: ( localize(947, 'Rewrite')), icon: Codicon.wrench },
+    { kind: CodeActionKind.RefactorMove, title: ( localize(948, 'Move')), icon: Codicon.wrench },
+    { kind: CodeActionKind.SurroundWith, title: ( localize(949, 'Surround With')), icon: Codicon.surroundWith },
+    { kind: CodeActionKind.Source, title: ( localize(950, 'Source Action')), icon: Codicon.symbolFile },
     uncategorizedCodeActionGroup,
 ]));
 function toMenuItems(inputCodeActions, showHeaders, keybindingResolver) {

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

@@ -22,23 +22,23 @@ import { Range } from '../../../common/core/range.js';
 var LightBulbWidget_1;
 registerCss(lightBulbWidget);
 const GUTTER_LIGHTBULB_ICON = registerIcon('gutter-lightbulb', Codicon.lightBulb, ( localize(
-    940,
+    951,
     '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(
-    941,
+    952,
     '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(
-    942,
+    953,
     '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(
-    943,
+    954,
     '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(
-    944,
+    955,
     '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;
@@ -401,20 +401,20 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             return;
         }
         if (autoRun) {
-            this.title = ( localize(945, "Run: {0}", this.state.actions.validActions[0].action.title));
+            this.title = ( localize(956, "Run: {0}", this.state.actions.validActions[0].action.title));
         }
         else if (autoFix && this._preferredKbLabel) {
             this.title = ( localize(
-                946,
+                957,
                 "Show Code Actions. Preferred Quick Fix Available ({0})",
                 this._preferredKbLabel
             ));
         }
         else if (!autoFix && this._quickFixKbLabel) {
-            this.title = ( localize(947, "Show Code Actions ({0})", this._quickFixKbLabel));
+            this.title = ( localize(958, "Show Code Actions ({0})", this._quickFixKbLabel));
         }
         else if (!autoFix) {
-            this.title = ( localize(948, "Show Code Actions"));
+            this.title = ( localize(959, "Show Code Actions"));
         }
     }
     set title(value) {

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

@@ -391,7 +391,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         super({
             id: 'codelens.showLensesInCurrentLine',
             precondition: EditorContextKeys.hasCodeLensProvider,
-            label: ( localize2(949, "Show CodeLens Commands for Current Line")),
+            label: ( localize2(960, "Show CodeLens Commands for Current Line")),
         });
     }
     async run(accessor, editor) {
@@ -424,7 +424,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         }
         const item = await quickInputService.pick(items, {
             canPickMany: false,
-            placeHolder: ( localize(950, "Select a command"))
+            placeHolder: ( localize(961, "Select a command"))
         });
         if (!item) {
             return;

package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.css

@@ -41,13 +41,8 @@
 	cursor: pointer;
 }
 @keyframes fadein {
-	0% {
-		opacity: 0;
-		visibility: visible;
-	}
-	100% {
-		opacity: 1;
-	}
+	0% { opacity: 0;}
+	100% { opacity: 1;}
 }
 .monaco-editor .codelens-decoration.fadein {
 	animation: fadein 0.1s linear;

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.js

@@ -22,7 +22,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, ( localize(951, 'Icon to close the color picker'))))));
+        const closeButton = append(innerDiv, $('.button' + ThemeIcon.asCSSSelector(registerIcon('color-picker-close', Codicon.close, ( localize(962, '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/colorPickerParts/colorPickerHeader.js

@@ -33,7 +33,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 = ( localize(952, "Click to toggle color options (rgb/hsl/hex)"));
+        const tooltip = ( localize(963, "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) || '';

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

@@ -22,9 +22,9 @@ let DefaultDocumentColorProvider = class DefaultDocumentColorProvider {
             Math.round(255 * colorFromInfo.blue),
             alpha
         ))));
-        const rgb = alpha ? Color.Format.CSS.formatRGB(color) : Color.Format.CSS.formatRGBA(color);
-        const hsl = alpha ? Color.Format.CSS.formatHSL(color) : Color.Format.CSS.formatHSLA(color);
-        const hex = alpha ? Color.Format.CSS.formatHex(color) : Color.Format.CSS.formatHexA(color);
+        const rgb = alpha ? Color.Format.CSS.formatRGBA(color) : Color.Format.CSS.formatRGB(color);
+        const hsl = alpha ? Color.Format.CSS.formatHSLA(color) : Color.Format.CSS.formatHSL(color);
+        const hex = alpha ? Color.Format.CSS.formatHexA(color) : Color.Format.CSS.formatHex(color);
         const colorPresentations = [];
         colorPresentations.push({ label: rgb, textEdit: { range: range, text: rgb } });
         colorPresentations.push({ label: hsl, textEdit: { range: range, text: hsl } });

package/vscode/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js

@@ -126,7 +126,7 @@ let HoverColorPickerParticipant = class HoverColorPickerParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(953, 'There is a color picker here.');
+        return localize(964, 'There is a color picker here.');
     }
     handleResize() {
         this._colorPicker?.layout();

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

@@ -12,8 +12,8 @@ class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
         super({
             id: 'editor.action.showOrFocusStandaloneColorPicker',
             title: {
-                ...( localize2(954, "Show or Focus Standalone Color Picker")),
-                mnemonicTitle: ( localize(955, "&&Show or Focus Standalone Color Picker")),
+                ...( localize2(965, "Show or Focus Standalone Color Picker")),
+                mnemonicTitle: ( localize(966, "&&Show or Focus Standalone Color Picker")),
             },
             precondition: undefined,
             menu: [
@@ -21,7 +21,7 @@ class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
             ],
             metadata: {
                 description: ( localize2(
-                    956,
+                    967,
                     "Show or focus a standalone color picker which uses the default color provider. It displays hex/rgb/hsl colors."
                 )),
             }
@@ -35,14 +35,14 @@ class HideStandaloneColorPicker extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.hideColorPicker',
-            label: ( localize2(957, "Hide the Color Picker")),
+            label: ( localize2(968, "Hide the Color Picker")),
             precondition: ( EditorContextKeys.standaloneColorPickerVisible.isEqualTo(true)),
             kbOpts: {
                 primary: KeyCode.Escape,
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(958, "Hide the standalone color picker.")),
+                description: ( localize2(969, "Hide the standalone color picker.")),
             }
         });
     }
@@ -54,14 +54,14 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.insertColorWithStandaloneColorPicker',
-            label: ( localize2(959, "Insert Color with Standalone Color Picker")),
+            label: ( localize2(970, "Insert Color with Standalone Color Picker")),
             precondition: ( EditorContextKeys.standaloneColorPickerFocused.isEqualTo(true)),
             kbOpts: {
                 primary: KeyCode.Enter,
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(960, "Insert hex/rgb/hsl colors with the focused standalone color picker.")),
+                description: ( localize2(971, "Insert hex/rgb/hsl colors with the focused standalone color picker.")),
             }
         });
     }

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

@@ -60,7 +60,7 @@ class ToggleCommentLineAction extends CommentLineAction {
     constructor() {
         super(Type.Toggle, {
             id: 'editor.action.commentLine',
-            label: ( localize2(961, "Toggle Line Comment")),
+            label: ( localize2(972, "Toggle Line Comment")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -70,7 +70,7 @@ class ToggleCommentLineAction extends CommentLineAction {
             menuOpts: {
                 menuId: MenuId.MenubarEditMenu,
                 group: '5_insert',
-                title: ( localize(962, "&&Toggle Line Comment")),
+                title: ( localize(973, "&&Toggle Line Comment")),
                 order: 1
             }
         });
@@ -80,7 +80,7 @@ class AddLineCommentAction extends CommentLineAction {
     constructor() {
         super(Type.ForceAdd, {
             id: 'editor.action.addCommentLine',
-            label: ( localize2(963, "Add Line Comment")),
+            label: ( localize2(974, "Add Line Comment")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -94,7 +94,7 @@ class RemoveLineCommentAction extends CommentLineAction {
     constructor() {
         super(Type.ForceRemove, {
             id: 'editor.action.removeCommentLine',
-            label: ( localize2(964, "Remove Line Comment")),
+            label: ( localize2(975, "Remove Line Comment")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -108,7 +108,7 @@ class BlockCommentAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.blockComment',
-            label: ( localize2(965, "Toggle Block Comment")),
+            label: ( localize2(976, "Toggle Block Comment")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -119,7 +119,7 @@ class BlockCommentAction extends EditorAction {
             menuOpts: {
                 menuId: MenuId.MenubarEditMenu,
                 group: '5_insert',
-                title: ( localize(966, "Toggle &&Block Comment")),
+                title: ( localize(977, "Toggle &&Block Comment")),
                 order: 2
             }
         });

package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.d.ts

@@ -43,7 +43,7 @@ export declare class LineCommentCommand implements ICommand {
     private _ignoreFirstLine;
     constructor(languageConfigurationService: ILanguageConfigurationService, selection: Selection, indentSize: number, type: Type, insertSpace: boolean, ignoreEmptyLines: boolean, ignoreFirstLine?: boolean);
     private static _gatherPreflightCommentStrings;
-    static _analyzeLines(type: Type, insertSpace: boolean, model: ISimpleModel, lines: ILinePreflightData[], startLineNumber: number, ignoreEmptyLines: boolean, ignoreFirstLine: boolean, languageConfigurationService: ILanguageConfigurationService): IPreflightData;
+    static _analyzeLines(type: Type, insertSpace: boolean, model: ISimpleModel, lines: ILinePreflightData[], startLineNumber: number, ignoreEmptyLines: boolean, ignoreFirstLine: boolean, languageConfigurationService: ILanguageConfigurationService, languageId: string): IPreflightData;
     static _gatherPreflightData(type: Type, insertSpace: boolean, model: ITextModel, startLineNumber: number, endLineNumber: number, ignoreEmptyLines: boolean, ignoreFirstLine: boolean, languageConfigurationService: ILanguageConfigurationService): IPreflightData;
     private _executeLineComments;
     private _attemptRemoveBlockComment;

package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.js

@@ -46,8 +46,10 @@ class LineCommentCommand {
         }
         return lines;
     }
-    static _analyzeLines(type, insertSpace, model, lines, startLineNumber, ignoreEmptyLines, ignoreFirstLine, languageConfigurationService) {
+    static _analyzeLines(type, insertSpace, model, lines, startLineNumber, ignoreEmptyLines, ignoreFirstLine, languageConfigurationService, languageId) {
         let onlyWhitespaceLines = true;
+        const config = languageConfigurationService.getLanguageConfiguration(languageId).comments;
+        const lineCommentNoIndent = config?.lineCommentNoIndent ?? false;
         let shouldRemoveComments;
         if (type === Type.Toggle) {
             shouldRemoveComments = true;
@@ -69,13 +71,14 @@ class LineCommentCommand {
             const lineContentStartOffset = firstNonWhitespaceIndex(lineContent);
             if (lineContentStartOffset === -1) {
                 lineData.ignore = ignoreEmptyLines;
-                lineData.commentStrOffset = lineContent.length;
+                lineData.commentStrOffset = lineCommentNoIndent ? 0 : lineContent.length;
                 continue;
             }
             onlyWhitespaceLines = false;
+            const offset = lineCommentNoIndent ? 0 : lineContentStartOffset;
             lineData.ignore = false;
-            lineData.commentStrOffset = lineContentStartOffset;
-            if (shouldRemoveComments && !BlockCommentCommand._haystackHasNeedleAtOffset(lineContent, lineData.commentStr, lineContentStartOffset)) {
+            lineData.commentStrOffset = offset;
+            if (shouldRemoveComments && !BlockCommentCommand._haystackHasNeedleAtOffset(lineContent, lineData.commentStr, offset)) {
                 if (type === Type.Toggle) {
                     shouldRemoveComments = false;
                 }
@@ -105,12 +108,13 @@ class LineCommentCommand {
     }
     static _gatherPreflightData(type, insertSpace, model, startLineNumber, endLineNumber, ignoreEmptyLines, ignoreFirstLine, languageConfigurationService) {
         const lines = LineCommentCommand._gatherPreflightCommentStrings(model, startLineNumber, endLineNumber, languageConfigurationService);
+        const languageId = model.getLanguageIdAtPosition(startLineNumber, 1);
         if (lines === null) {
             return {
                 supported: false
             };
         }
-        return LineCommentCommand._analyzeLines(type, insertSpace, model, lines, startLineNumber, ignoreEmptyLines, ignoreFirstLine, languageConfigurationService);
+        return LineCommentCommand._analyzeLines(type, insertSpace, model, lines, startLineNumber, ignoreEmptyLines, ignoreFirstLine, languageConfigurationService, languageId);
     }
     _executeLineComments(model, builder, data, s) {
         let ops;

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

@@ -241,7 +241,7 @@ let ContextMenuController = class ContextMenuController {
         };
         const actions = [];
         actions.push(createAction({
-            label: ( localize(967, "Minimap")),
+            label: ( localize(978, "Minimap")),
             checked: minimapOptions.enabled,
             run: () => {
                 this._configurationService.updateValue(`editor.minimap.enabled`, !minimapOptions.enabled);
@@ -249,28 +249,28 @@ let ContextMenuController = class ContextMenuController {
         }));
         actions.push(( new Separator()));
         actions.push(createAction({
-            label: ( localize(968, "Render Characters")),
+            label: ( localize(979, "Render Characters")),
             enabled: minimapOptions.enabled,
             checked: minimapOptions.renderCharacters,
             run: () => {
                 this._configurationService.updateValue(`editor.minimap.renderCharacters`, !minimapOptions.renderCharacters);
             }
         }));
-        actions.push(createEnumAction(( localize(969, "Vertical size")), minimapOptions.enabled, 'editor.minimap.size', minimapOptions.size, [{
-                label: ( localize(970, "Proportional")),
+        actions.push(createEnumAction(( localize(980, "Vertical size")), minimapOptions.enabled, 'editor.minimap.size', minimapOptions.size, [{
+                label: ( localize(981, "Proportional")),
                 value: 'proportional'
             }, {
-                label: ( localize(971, "Fill")),
+                label: ( localize(982, "Fill")),
                 value: 'fill'
             }, {
-                label: ( localize(972, "Fit")),
+                label: ( localize(983, "Fit")),
                 value: 'fit'
             }]));
-        actions.push(createEnumAction(( localize(973, "Slider")), minimapOptions.enabled, 'editor.minimap.showSlider', minimapOptions.showSlider, [{
-                label: ( localize(974, "Mouse Over")),
+        actions.push(createEnumAction(( localize(984, "Slider")), minimapOptions.enabled, 'editor.minimap.showSlider', minimapOptions.showSlider, [{
+                label: ( localize(985, "Mouse Over")),
                 value: 'mouseover'
             }, {
-                label: ( localize(975, "Always")),
+                label: ( localize(986, "Always")),
                 value: 'always'
             }]));
         const useShadowDOM = this._editor.getOption(EditorOption.useShadowDOM) && !isIOS;
@@ -308,7 +308,7 @@ class ShowContextMenu extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.showContextMenu',
-            label: ( localize2(976, "Show Editor Context Menu")),
+            label: ( localize2(987, "Show Editor Context Menu")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,

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

@@ -99,7 +99,7 @@ class CursorUndo extends EditorAction {
     constructor() {
         super({
             id: 'cursorUndo',
-            label: ( localize2(977, "Cursor Undo")),
+            label: ( localize2(988, "Cursor Undo")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
@@ -116,7 +116,7 @@ class CursorRedo extends EditorAction {
     constructor() {
         super({
             id: 'cursorRedo',
-            label: ( localize2(978, "Cursor Redo")),
+            label: ( localize2(989, "Cursor Redo")),
             precondition: undefined
         });
     }