@codingame/monaco-vscode-api 24.2.0 → 25.0.0

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

@@ -1,13 +1,13 @@
 
-import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
+import { QuickInputButtonLocation } from '../../../../platform/quickinput/common/quickInput.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { inputActiveOptionBackground, inputActiveOptionForeground, inputActiveOptionBorder } from '../../../../platform/theme/common/colors/inputColors.js';
-import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { getCodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
+import { CursorColumns } from '../../../common/core/cursorColumns.js';
 import { ScrollType } from '../../../common/editorCommon.js';
 import { AbstractEditorNavigationQuickAccessProvider } from './editorNavigationQuickAccess.js';
 
@@ -25,7 +25,7 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
         this.storageService.store(AbstractGotoLineQuickAccessProvider.ZERO_BASED_OFFSET_STORAGE_KEY, value, StorageScope.APPLICATION, StorageTarget.USER);
     }
     provideWithoutTextEditor(picker) {
-        const label = ( localize(1436, "Open a text editor first to go to a line or an offset."));
+        const label = ( localize(1440, "Open a text editor first to go to a line or an offset."));
         picker.items = [{ label }];
         picker.ariaLabel = label;
         return Disposable.None;
@@ -45,23 +45,21 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
                 }
             }
         }));
+        const offsetButton = {
+            iconClass: ThemeIcon.asClassName(Codicon.indexZero),
+            tooltip: ( localize(1441, "Toggle Zero-Based Offset")),
+            location: QuickInputButtonLocation.Input,
+            toggle: { checked: this.useZeroBasedOffset }
+        };
         const updatePickerAndEditor = () => {
             const inputText = picker.value.trim().substring(AbstractGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX.length);
             const { inOffsetMode, lineNumber, column, label } = this.parsePosition(editor, inputText);
-            toggle.visible = !!inOffsetMode;
+            picker.buttons = inOffsetMode ? [offsetButton] : [];
             picker.items = [{
                     lineNumber,
                     column,
                     label,
                 }];
-            const cursor = editor.getPosition() ?? { lineNumber: 1, column: 1 };
-            picker.ariaLabel = ( localize(
-                1437,
-                "Current position: line {0}, column {1}. {2}",
-                cursor.lineNumber,
-                cursor.column,
-                label
-            ));
             if (!lineNumber) {
                 this.clearDecorations(editor);
                 return;
@@ -70,19 +68,12 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
             editor.revealRangeInCenter(range, ScrollType.Smooth);
             this.addDecorations(editor, range);
         };
-        const toggle = ( new Toggle({
-            title: ( localize(1438, "Use Zero-Based Offset")),
-            icon: Codicon.indexZero,
-            isChecked: this.useZeroBasedOffset,
-            inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
-            inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
-            inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-        }));
-        disposables.add(toggle.onChange(() => {
-            this.useZeroBasedOffset = !this.useZeroBasedOffset;
-            updatePickerAndEditor();
+        disposables.add(picker.onDidTriggerButton(button => {
+            if (button === offsetButton) {
+                this.useZeroBasedOffset = button.toggle?.checked ?? !this.useZeroBasedOffset;
+                updatePickerAndEditor();
+            }
         }));
-        picker.toggles = [toggle];
         updatePickerAndEditor();
         disposables.add(picker.onDidChangeValue(() => updatePickerAndEditor()));
         const codeEditor = getCodeEditor(editor);
@@ -108,7 +99,7 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
         const model = this.getModel(editor);
         if (!model) {
             return {
-                label: ( localize(1436, "Open a text editor first to go to a line or an offset."))
+                label: ( localize(1440, "Open a text editor first to go to a line or an offset."))
             };
         }
         if (value.startsWith(':')) {
@@ -118,8 +109,8 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
                 return {
                     inOffsetMode: true,
                     label: this.useZeroBasedOffset ?
-                        ( localize(1439, "Type a character position to go to (from 0 to {0}).", maxOffset - 1)) :
-                        ( localize(1440, "Type a character position to go to (from 1 to {0}).", maxOffset))
+                        ( localize(1442, "Type a character position to go to (from 0 to {0}).", maxOffset - 1)) :
+                        ( localize(1443, "Type a character position to go to (from 1 to {0}).", maxOffset))
                 };
             }
             else {
@@ -131,14 +122,15 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
                     offset += maxOffset;
                 }
                 const pos = model.getPositionAt(offset);
+                const visibleColumn = CursorColumns.visibleColumnFromColumn(model.getLineContent(pos.lineNumber), pos.column, model.getOptions().tabSize) + 1;
                 return {
                     ...pos,
                     inOffsetMode: true,
                     label: ( localize(
-                        1441,
+                        1444,
                         "Press 'Enter' to go to line {0} at column {1}.",
                         pos.lineNumber,
-                        pos.column
+                        visibleColumn
                     ))
                 };
             }
@@ -149,12 +141,14 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
             let lineNumber = parseInt(parts[0]?.trim(), 10);
             if (parts.length < 1 || isNaN(lineNumber)) {
                 return {
-                    label: ( localize(1442, "Type a line number to go to (from 1 to {0}).", maxLine))
+                    label: ( localize(1445, "Type a line number to go to (from 1 to {0}).", maxLine))
                 };
             }
             lineNumber = lineNumber >= 0 ? lineNumber : (maxLine + 1) + lineNumber;
             lineNumber = Math.min(Math.max(1, lineNumber), maxLine);
-            const maxColumn = model.getLineMaxColumn(lineNumber);
+            const tabSize = model.getOptions().tabSize;
+            const lineContent = model.getLineContent(lineNumber);
+            const maxColumn = CursorColumns.visibleColumnFromColumn(lineContent, model.getLineMaxColumn(lineNumber), tabSize) + 1;
             let column = parseInt(parts[1]?.trim(), 10);
             if (parts.length < 2 || isNaN(column)) {
                 return {
@@ -162,12 +156,12 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
                     column: 1,
                     label: parts.length < 2 ?
                         ( localize(
-                        1443,
+                        1446,
                         "Press 'Enter' to go to line {0} or enter colon : to add a column number.",
                         lineNumber
                     )) :
                         ( localize(
-                        1444,
+                        1447,
                         "Press 'Enter' to go to line {0} or enter a column number (from 1 to {1}).",
                         lineNumber,
                         maxColumn
@@ -176,10 +170,11 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
             }
             column = column >= 0 ? column : maxColumn + column;
             column = Math.min(Math.max(1, column), maxColumn);
+            const realColumn = CursorColumns.columnFromVisibleColumn(lineContent, column - 1, tabSize);
             return {
                 lineNumber,
-                column,
-                label: ( localize(1441, "Press 'Enter' to go to line {0} at column {1}.", lineNumber, column))
+                column: realColumn,
+                label: ( localize(1444, "Press 'Enter' to go to line {0} at column {1}.", lineNumber, column))
             };
         }
     }

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

@@ -31,7 +31,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
     }
     provideWithoutTextEditor(picker) {
         this.provideLabelPick(picker, ( localize(
-            1445,
+            1448,
             "To go to a symbol, first open a text editor with symbol information."
         )));
         return Disposable.None;
@@ -49,7 +49,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
     }
     doProvideWithoutEditorSymbols(context, model, picker, token) {
         const disposables = ( new DisposableStore());
-        this.provideLabelPick(picker, ( localize(1446, "The active text editor does not provide symbol information.")));
+        this.provideLabelPick(picker, ( localize(1449, "The active text editor does not provide symbol information.")));
         (async () => {
             const result = await this.waitForLanguageSymbolRegistry(model, disposables);
             if (!result || token.isCancellationRequested) {
@@ -120,10 +120,10 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
                 }
                 else {
                     if (query.original.length > 0) {
-                        this.provideLabelPick(picker, ( localize(1447, "No matching editor symbols")));
+                        this.provideLabelPick(picker, ( localize(1450, "No matching editor symbols")));
                     }
                     else {
-                        this.provideLabelPick(picker, ( localize(1448, "No editor symbols")));
+                        this.provideLabelPick(picker, ( localize(1451, "No editor symbols")));
                     }
                 }
             }
@@ -165,7 +165,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         if (openSideBySideDirection) {
             buttons = [{
                     iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
-                    tooltip: openSideBySideDirection === 'right' ? ( localize(1449, "Open to the Side")) : ( localize(1450, "Open to the Bottom"))
+                    tooltip: openSideBySideDirection === 'right' ? ( localize(1452, "Open to the Side")) : ( localize(1453, "Open to the Bottom"))
                 }];
         }
         const filteredSymbolPicks = [];
@@ -265,7 +265,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         }
         else if (sortedFilteredSymbolPicks.length > 0) {
             symbolPicks = [
-                { label: ( localize(1451, "symbols ({0})", filteredSymbolPicks.length)), type: 'separator' },
+                { label: ( localize(1454, "symbols ({0})", filteredSymbolPicks.length)), type: 'separator' },
                 ...sortedFilteredSymbolPicks
             ];
         }
@@ -312,33 +312,33 @@ AbstractGotoSymbolQuickAccessProvider = AbstractGotoSymbolQuickAccessProvider_1
     ( __param(0, ILanguageFeaturesService)),
     ( __param(1, IOutlineModelService))
 ], AbstractGotoSymbolQuickAccessProvider));
-const FALLBACK_NLS_SYMBOL_KIND = ( localize(1452, "properties ({0})"));
+const FALLBACK_NLS_SYMBOL_KIND = ( localize(1455, "properties ({0})"));
 const NLS_SYMBOL_KIND_CACHE = {
-    [SymbolKind.Method]: ( localize(1453, "methods ({0})")),
-    [SymbolKind.Function]: ( localize(1454, "functions ({0})")),
-    [SymbolKind.Constructor]: ( localize(1455, "constructors ({0})")),
-    [SymbolKind.Variable]: ( localize(1456, "variables ({0})")),
-    [SymbolKind.Class]: ( localize(1457, "classes ({0})")),
-    [SymbolKind.Struct]: ( localize(1458, "structs ({0})")),
-    [SymbolKind.Event]: ( localize(1459, "events ({0})")),
-    [SymbolKind.Operator]: ( localize(1460, "operators ({0})")),
-    [SymbolKind.Interface]: ( localize(1461, "interfaces ({0})")),
-    [SymbolKind.Namespace]: ( localize(1462, "namespaces ({0})")),
-    [SymbolKind.Package]: ( localize(1463, "packages ({0})")),
-    [SymbolKind.TypeParameter]: ( localize(1464, "type parameters ({0})")),
-    [SymbolKind.Module]: ( localize(1465, "modules ({0})")),
-    [SymbolKind.Property]: ( localize(1452, "properties ({0})")),
-    [SymbolKind.Enum]: ( localize(1466, "enumerations ({0})")),
-    [SymbolKind.EnumMember]: ( localize(1467, "enumeration members ({0})")),
-    [SymbolKind.String]: ( localize(1468, "strings ({0})")),
-    [SymbolKind.File]: ( localize(1469, "files ({0})")),
-    [SymbolKind.Array]: ( localize(1470, "arrays ({0})")),
-    [SymbolKind.Number]: ( localize(1471, "numbers ({0})")),
-    [SymbolKind.Boolean]: ( localize(1472, "booleans ({0})")),
-    [SymbolKind.Object]: ( localize(1473, "objects ({0})")),
-    [SymbolKind.Key]: ( localize(1474, "keys ({0})")),
-    [SymbolKind.Field]: ( localize(1475, "fields ({0})")),
-    [SymbolKind.Constant]: ( localize(1476, "constants ({0})"))
+    [SymbolKind.Method]: ( localize(1456, "methods ({0})")),
+    [SymbolKind.Function]: ( localize(1457, "functions ({0})")),
+    [SymbolKind.Constructor]: ( localize(1458, "constructors ({0})")),
+    [SymbolKind.Variable]: ( localize(1459, "variables ({0})")),
+    [SymbolKind.Class]: ( localize(1460, "classes ({0})")),
+    [SymbolKind.Struct]: ( localize(1461, "structs ({0})")),
+    [SymbolKind.Event]: ( localize(1462, "events ({0})")),
+    [SymbolKind.Operator]: ( localize(1463, "operators ({0})")),
+    [SymbolKind.Interface]: ( localize(1464, "interfaces ({0})")),
+    [SymbolKind.Namespace]: ( localize(1465, "namespaces ({0})")),
+    [SymbolKind.Package]: ( localize(1466, "packages ({0})")),
+    [SymbolKind.TypeParameter]: ( localize(1467, "type parameters ({0})")),
+    [SymbolKind.Module]: ( localize(1468, "modules ({0})")),
+    [SymbolKind.Property]: ( localize(1455, "properties ({0})")),
+    [SymbolKind.Enum]: ( localize(1469, "enumerations ({0})")),
+    [SymbolKind.EnumMember]: ( localize(1470, "enumeration members ({0})")),
+    [SymbolKind.String]: ( localize(1471, "strings ({0})")),
+    [SymbolKind.File]: ( localize(1472, "files ({0})")),
+    [SymbolKind.Array]: ( localize(1473, "arrays ({0})")),
+    [SymbolKind.Number]: ( localize(1474, "numbers ({0})")),
+    [SymbolKind.Boolean]: ( localize(1475, "booleans ({0})")),
+    [SymbolKind.Object]: ( localize(1476, "objects ({0})")),
+    [SymbolKind.Key]: ( localize(1477, "keys ({0})")),
+    [SymbolKind.Field]: ( localize(1478, "fields ({0})")),
+    [SymbolKind.Constant]: ( localize(1479, "constants ({0})"))
 };
 
 export { AbstractGotoSymbolQuickAccessProvider };

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

@@ -19,10 +19,10 @@ class ReadOnlyMessageController extends Disposable {
             let message = this.editor.getOptions().get(EditorOption.readOnlyMessage);
             if (!message) {
                 if (this.editor.isSimpleWidget) {
-                    message = ( new MarkdownString(( localize(1477, "Cannot edit in read-only input"))));
+                    message = ( new MarkdownString(( localize(1480, "Cannot edit in read-only input"))));
                 }
                 else {
-                    message = ( new MarkdownString(( localize(1478, "Cannot edit in read-only editor"))));
+                    message = ( new MarkdownString(( localize(1481, "Cannot edit in read-only editor"))));
                 }
             }
             messageController.showMessage(message, this.editor.getPosition());

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

@@ -94,7 +94,7 @@ class RenameSkeleton {
         }
         const result = await provider.provideRenameEdits(this.model, this.position, newName, token);
         if (!result) {
-            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1479, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1482, "No result."))), token);
         }
         else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
@@ -180,7 +180,7 @@ let RenameController = class RenameController {
             else {
                 trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
                 if (typeof e === 'string' || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localize(1480, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1483, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -252,16 +252,16 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localize(1481, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
+                label: ( localize(1484, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: 'undoredo.rename',
-                quotableLabel: ( localize(1482, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1485, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true,
                 reason: EditSources.rename(loc?.text, inputFieldResult.newName),
             }).then(result => {
                 trace('edits applied');
                 if (result.ariaSummary) {
                     alert(( localize(
-                        1483,
+                        1486,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -270,12 +270,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, '\t')}`);
-                this._notificationService.error(( localize(1484, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1487, "Rename failed to apply edits")));
                 this._logService.error(err);
             });
         }, err => {
             trace('error when providing rename edits', JSON.stringify(err, null, '\t'));
-            this._notificationService.error(( localize(1485, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1488, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -310,7 +310,7 @@ class RenameAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.rename',
-            label: ( localize2(1486, "Rename Symbol")),
+            label: ( localize2(1489, "Rename Symbol")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -391,7 +391,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: 'focusNextRenameSuggestion',
             title: {
-                ...( localize2(1487, "Focus Next Rename Suggestion")),
+                ...( localize2(1490, "Focus Next Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -419,7 +419,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: 'focusPreviousRenameSuggestion',
             title: {
-                ...( localize2(1488, "Focus Previous Rename Suggestion")),
+                ...( localize2(1491, "Focus Previous Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -462,7 +462,7 @@ registerModelAndPositionCommand('_executePrepareRename', async function (accesso
     properties: {
         'editor.rename.enablePreview': {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1489, "Enable/disable the ability to preview changes before renaming")),
+            description: ( localize(1492, "Enable/disable the ability to preview changes before renaming")),
             default: true,
             type: 'boolean'
         }

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js

@@ -45,7 +45,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { HoverStyle } from '../../../../base/browser/ui/hover/hover.js';
 
 registerCss(renameWidget);
-const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1490, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1493, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(_editor, _acceptKeybindings, _themeService, _keybindingService, contextKeyService, _logService) {
         this._editor = _editor;
@@ -168,7 +168,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1491,
+            1494,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -464,7 +464,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1492, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1495, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = '0px';
@@ -603,13 +603,13 @@ class InputWithButton {
             this._inputNode.className = 'rename-input';
             this._inputNode.type = 'text';
             this._inputNode.style.border = 'none';
-            this._inputNode.setAttribute('aria-label', ( localize(1493, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute('aria-label', ( localize(1496, "Rename input. Type new name and press Enter to commit.")));
             this._domNode.appendChild(this._inputNode);
             this._buttonNode = createElement('div');
             this._buttonNode.className = 'rename-suggestions-button';
             this._buttonNode.setAttribute('tabindex', '0');
-            this._buttonGenHoverText = ( localize(1494, "Generate New Name Suggestions"));
-            this._buttonCancelHoverText = ( localize(1495, "Cancel"));
+            this._buttonGenHoverText = ( localize(1497, "Generate New Name Suggestions"));
+            this._buttonCancelHoverText = ( localize(1498, "Cancel"));
             this._buttonHoverContent = this._buttonGenHoverText;
             this._disposables.add(getBaseLayerHoverDelegate().setupDelayedHover(this._buttonNode, () => ({
                 content: this._buttonHoverContent,

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

@@ -113,8 +113,9 @@ let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
                 const tokens = model.tokenization.getLineTokens(validRange.startLineNumber);
                 const idx = tokens.findTokenIndexAtOffset(validRange.startColumn - 1);
                 const tokenType = tokens.getStandardTokenType(idx);
-                const languageId = tokens.getLanguageId(idx);
-                return (languageId === model.getLanguageId() && tokenType === StandardTokenType.Comment);
+                const languageIdAtPosition = model.getLanguageIdAtPosition(validRange.startLineNumber, validRange.startColumn);
+                const tokenLanguageId = tokens.getLanguageId(idx);
+                return (tokenLanguageId === languageIdAtPosition && tokenType === StandardTokenType.Comment);
             });
         }
         const oldDecorations = ( ( Object.values(this.currentOccurrences)).map(occurrence => occurrence.decorationId));

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

@@ -118,7 +118,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: 'editor.action.smartSelect.expand',
-            label: ( localize2(1496, "Expand Selection")),
+            label: ( localize2(1499, "Expand Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -132,7 +132,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localize(1497, "&&Expand Selection")),
+                title: ( localize(1500, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -143,7 +143,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: 'editor.action.smartSelect.shrink',
-            label: ( localize2(1498, "Shrink Selection")),
+            label: ( localize2(1501, "Shrink Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -157,7 +157,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localize(1499, "&&Shrink Selection")),
+                title: ( localize(1502, "&&Shrink Selection")),
                 order: 3
             }
         });

package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js

@@ -35,9 +35,9 @@ let SnippetController2 = class SnippetController2 {
     static get(editor) {
         return editor.getContribution(SnippetController2_1.ID);
     }
-    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1500, "Whether the editor in current in snippet mode")))); }
-    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1501, "Whether there is a next tab stop when in snippet mode")))); }
-    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1502, "Whether there is a previous tab stop when in snippet mode")))); }
+    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1503, "Whether the editor in current in snippet mode")))); }
+    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1504, "Whether there is a next tab stop when in snippet mode")))); }
+    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1505, "Whether there is a previous tab stop when in snippet mode")))); }
     constructor(_editor, _logService, _languageFeaturesService, contextKeyService, _languageConfigurationService) {
         this._editor = _editor;
         this._logService = _logService;
@@ -128,7 +128,7 @@ let SnippetController2 = class SnippetController2 {
                             sortText: 'a'.repeat(i + 1),
                             range: activeChoice.range,
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
-                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1503, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1506, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };

package/vscode/src/vs/editor/contrib/snippet/browser/snippetParser.d.ts

@@ -88,8 +88,10 @@ export declare class FormatString extends Marker {
     readonly elseValue?: string | undefined;
     constructor(index: number, shorthandName?: string | undefined, ifValue?: string | undefined, elseValue?: string | undefined);
     resolve(value?: string): string;
+    private _toKebabCase;
     private _toPascalCase;
     private _toCamelCase;
+    private _toSnakeCase;
     toTextmateString(): string;
     clone(): FormatString;
 }

package/vscode/src/vs/editor/contrib/snippet/browser/snippetParser.js

@@ -333,6 +333,12 @@ class FormatString extends Marker {
         else if (this.shorthandName === 'camelcase') {
             return !value ? '' : this._toCamelCase(value);
         }
+        else if (this.shorthandName === 'kebabcase') {
+            return !value ? '' : this._toKebabCase(value);
+        }
+        else if (this.shorthandName === 'snakecase') {
+            return !value ? '' : this._toSnakeCase(value);
+        }
         else if (Boolean(value) && typeof this.ifValue === 'string') {
             return this.ifValue;
         }
@@ -343,6 +349,28 @@ class FormatString extends Marker {
             return value || '';
         }
     }
+    _toKebabCase(value) {
+        const match = value.match(/[a-z0-9]+/gi);
+        if (!match) {
+            return value;
+        }
+        if (!value.match(/[a-z0-9]/)) {
+            return value
+                .trim()
+                .toLowerCase()
+                .replace(/^_+|_+$/g, '')
+                .replace(/[\s_]+/g, '-');
+        }
+        const match2 = value
+            .trim()
+            .match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g);
+        if (!match2) {
+            return value;
+        }
+        return ( match2
+            .map(x => x.toLowerCase()))
+            .join('-');
+    }
     _toPascalCase(value) {
         const match = value.match(/[a-z0-9]+/gi);
         if (!match) {
@@ -366,6 +394,11 @@ class FormatString extends Marker {
         }))
             .join('');
     }
+    _toSnakeCase(value) {
+        return value.replace(/([a-z])([A-Z])/g, '$1_$2')
+            .replace(/[\s\-]+/g, '_')
+            .toLowerCase();
+    }
     toTextmateString() {
         let value = '${';
         value += this.index;

package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js

@@ -221,10 +221,10 @@ class TimeBasedVariableResolver {
     constructor() {
         this._date = ( new Date());
     }
-    static { this.dayNames = [( localize(1504, "Sunday")), ( localize(1505, "Monday")), ( localize(1506, "Tuesday")), ( localize(1507, "Wednesday")), ( localize(1508, "Thursday")), ( localize(1509, "Friday")), ( localize(1510, "Saturday"))]; }
-    static { this.dayNamesShort = [( localize(1511, "Sun")), ( localize(1512, "Mon")), ( localize(1513, "Tue")), ( localize(1514, "Wed")), ( localize(1515, "Thu")), ( localize(1516, "Fri")), ( localize(1517, "Sat"))]; }
-    static { this.monthNames = [( localize(1518, "January")), ( localize(1519, "February")), ( localize(1520, "March")), ( localize(1521, "April")), ( localize(1522, "May")), ( localize(1523, "June")), ( localize(1524, "July")), ( localize(1525, "August")), ( localize(1526, "September")), ( localize(1527, "October")), ( localize(1528, "November")), ( localize(1529, "December"))]; }
-    static { this.monthNamesShort = [( localize(1530, "Jan")), ( localize(1531, "Feb")), ( localize(1532, "Mar")), ( localize(1533, "Apr")), ( localize(1534, "May")), ( localize(1535, "Jun")), ( localize(1536, "Jul")), ( localize(1537, "Aug")), ( localize(1538, "Sep")), ( localize(1539, "Oct")), ( localize(1540, "Nov")), ( localize(1541, "Dec"))]; }
+    static { this.dayNames = [( localize(1507, "Sunday")), ( localize(1508, "Monday")), ( localize(1509, "Tuesday")), ( localize(1510, "Wednesday")), ( localize(1511, "Thursday")), ( localize(1512, "Friday")), ( localize(1513, "Saturday"))]; }
+    static { this.dayNamesShort = [( localize(1514, "Sun")), ( localize(1515, "Mon")), ( localize(1516, "Tue")), ( localize(1517, "Wed")), ( localize(1518, "Thu")), ( localize(1519, "Fri")), ( localize(1520, "Sat"))]; }
+    static { this.monthNames = [( localize(1521, "January")), ( localize(1522, "February")), ( localize(1523, "March")), ( localize(1524, "April")), ( localize(1525, "May")), ( localize(1526, "June")), ( localize(1527, "July")), ( localize(1528, "August")), ( localize(1529, "September")), ( localize(1530, "October")), ( localize(1531, "November")), ( localize(1532, "December"))]; }
+    static { this.monthNamesShort = [( localize(1533, "Jan")), ( localize(1534, "Feb")), ( localize(1535, "Mar")), ( localize(1536, "Apr")), ( localize(1537, "May")), ( localize(1538, "Jun")), ( localize(1539, "Jul")), ( localize(1540, "Aug")), ( localize(1541, "Sep")), ( localize(1542, "Oct")), ( localize(1543, "Nov")), ( localize(1544, "Dec"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {