@codingame/monaco-vscode-api 31.0.0 → 32.0.0

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(1514, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1526, "No result."))), token);
         } else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
         }
@@ -200,7 +200,7 @@ let RenameController = class RenameController {
                     e instanceof Error ? e : JSON.stringify(e, null, "\t")
                 );
                 if (typeof e === "string" || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localize(1515, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1527, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -283,16 +283,16 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localize(1516, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
+                label: ( localize(1528, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: "undoredo.rename",
-                quotableLabel: ( localize(1517, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1529, "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(
-                        1518,
+                        1530,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -301,12 +301,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, "\t")}`);
-                this._notificationService.error(( localize(1519, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1531, "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(1520, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1532, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -333,7 +333,7 @@ class RenameAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.rename",
-            label: ( localize2(1521, "Rename Symbol")),
+            label: ( localize2(1533, "Rename Symbol")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -420,7 +420,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: "focusNextRenameSuggestion",
             title: {
-                ...( localize2(1522, "Focus Next Rename Suggestion"))
+                ...( localize2(1534, "Focus Next Rename Suggestion"))
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [{
@@ -446,7 +446,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: "focusPreviousRenameSuggestion",
             title: {
-                ...( localize2(1523, "Focus Previous Rename Suggestion"))
+                ...( localize2(1535, "Focus Previous Rename Suggestion"))
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [{
@@ -494,7 +494,7 @@ registerModelAndPositionCommand("_executePrepareRename", async function(accessor
     properties: {
         "editor.rename.enablePreview": {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1524, "Enable/disable the ability to preview changes before renaming")),
+            description: ( localize(1536, "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(1525, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey("renameInputVisible", false, ( localize(1537, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(
         _editor,
@@ -185,7 +185,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1526,
+            1538,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -512,7 +512,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1527, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1539, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = "0px";
@@ -655,13 +655,13 @@ class InputWithButton {
             this._inputNode.className = "rename-input";
             this._inputNode.type = "text";
             this._inputNode.style.border = "none";
-            this._inputNode.setAttribute("aria-label", ( localize(1528, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute("aria-label", ( localize(1540, "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(1529, "Generate New Name Suggestions"));
-            this._buttonCancelHoverText = ( localize(1530, "Cancel"));
+            this._buttonGenHoverText = ( localize(1541, "Generate New Name Suggestions"));
+            this._buttonCancelHoverText = ( localize(1542, "Cancel"));
             this._buttonHoverContent = this._buttonGenHoverText;
             this._disposables.add(getBaseLayerHoverDelegate().setupDelayedHover(this._buttonNode, () => ({
                 content: this._buttonHoverContent,

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

@@ -126,7 +126,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: "editor.action.smartSelect.expand",
-            label: ( localize2(1531, "Expand Selection")),
+            label: ( localize2(1543, "Expand Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -140,7 +140,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: "1_basic",
-                title: ( localize(1532, "&&Expand Selection")),
+                title: ( localize(1544, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -151,7 +151,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: "editor.action.smartSelect.shrink",
-            label: ( localize2(1533, "Shrink Selection")),
+            label: ( localize2(1545, "Shrink Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -165,7 +165,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: "1_basic",
-                title: ( localize(1534, "&&Shrink Selection")),
+                title: ( localize(1546, "&&Shrink Selection")),
                 order: 3
             }
         });

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

@@ -40,13 +40,13 @@ let SnippetController2 = class SnippetController2 {
         return editor.getContribution(SnippetController2_1.ID);
     }
     static {
-        this.InSnippetMode = ( new RawContextKey("inSnippetMode", false, ( localize(1535, "Whether the editor in current in snippet mode"))));
+        this.InSnippetMode = ( new RawContextKey("inSnippetMode", false, ( localize(1547, "Whether the editor in current in snippet mode"))));
     }
     static {
-        this.HasNextTabstop = ( new RawContextKey("hasNextTabstop", false, ( localize(1536, "Whether there is a next tab stop when in snippet mode"))));
+        this.HasNextTabstop = ( new RawContextKey("hasNextTabstop", false, ( localize(1548, "Whether there is a next tab stop when in snippet mode"))));
     }
     static {
-        this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1537, "Whether there is a previous tab stop when in snippet mode"))));
+        this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1549, "Whether there is a previous tab stop when in snippet mode"))));
     }
     constructor(
         _editor,
@@ -157,7 +157,7 @@ let SnippetController2 = class SnippetController2 {
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
                             command: {
                                 id: "jumpToNextSnippetPlaceholder",
-                                title: ( localize(1538, "Go to next placeholder..."))
+                                title: ( localize(1550, "Go to next placeholder..."))
                             }
                         });
                     }

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

@@ -301,7 +301,7 @@ class Transform extends Marker {
         return "";
     }
     toTextmateString() {
-        return `/${this.regexp.source}/${( this.children.map(c => c.toTextmateString()))}/${(this.regexp.ignoreCase ? "i" : "") + (this.regexp.global ? "g" : "")}`;
+        return `/${this.regexp.source}/${( this.children.map(c => c.toTextmateString())).join("")}/${(this.regexp.ignoreCase ? "i" : "") + (this.regexp.global ? "g" : "")}`;
     }
     clone() {
         const ret = ( new Transform());

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

@@ -38,6 +38,7 @@ export declare class OneSnippet {
         range: Range;
     } | undefined;
     get hasChoice(): boolean;
+    get activePlaceholderCount(): number;
     merge(others: OneSnippet[]): void;
     getEnclosingRange(): Range | undefined;
 }

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

@@ -92,20 +92,21 @@ class OneSnippet {
             return [];
         }
         this._initDecorations();
+        const model = this._editor.getModel();
         if (this._placeholderGroupsIdx >= 0) {
             const operations = [];
             for (const placeholder of this._placeholderGroups[this._placeholderGroupsIdx]) {
                 if (placeholder.transform) {
                     const id = this._placeholderDecorations.get(placeholder);
-                    const range = this._editor.getModel().getDecorationRange(id);
-                    const currentValue = this._editor.getModel().getValueInRange(range);
-                    const transformedValueLines = placeholder.transform.resolve(currentValue).split(/\r\n|\r|\n/);
-                    for (let i = 1; i < transformedValueLines.length; i++) {
-                        transformedValueLines[i] = this._editor.getModel().normalizeIndentation(this._snippetLineLeadingWhitespace + transformedValueLines[i]);
+                    const range = id ? model.getDecorationRange(id) : null;
+                    if (range) {
+                        const currentValue = model.getValueInRange(range);
+                        const transformedValueLines = placeholder.transform.resolve(currentValue).split(/\r\n|\r|\n/);
+                        for (let i = 1; i < transformedValueLines.length; i++) {
+                            transformedValueLines[i] = model.normalizeIndentation(this._snippetLineLeadingWhitespace + transformedValueLines[i]);
+                        }
+                        operations.push(EditOperation.replace(range, transformedValueLines.join(model.getEOL())));
                     }
-                    operations.push(
-                        EditOperation.replace(range, transformedValueLines.join(this._editor.getModel().getEOL()))
-                    );
                 }
             }
             if (operations.length > 0) {
@@ -121,19 +122,22 @@ class OneSnippet {
             couldSkipThisPlaceholder = true;
         } else
             ;
-        const newSelections = this._editor.getModel().changeDecorations(accessor => {
+        const newSelections = model.changeDecorations(accessor => {
             const activePlaceholders = ( new Set());
             const selections = [];
             for (const placeholder of this._placeholderGroups[this._placeholderGroupsIdx]) {
                 const id = this._placeholderDecorations.get(placeholder);
-                const range = this._editor.getModel().getDecorationRange(id);
+                const range = id ? model.getDecorationRange(id) : null;
+                couldSkipThisPlaceholder = couldSkipThisPlaceholder && this._hasPlaceholderBeenCollapsed(placeholder);
+                if (!id || !range) {
+                    continue;
+                }
                 selections.push(( new Selection(
                     range.startLineNumber,
                     range.startColumn,
                     range.endLineNumber,
                     range.endColumn
                 )));
-                couldSkipThisPlaceholder = couldSkipThisPlaceholder && this._hasPlaceholderBeenCollapsed(placeholder);
                 accessor.changeDecorationOptions(
                     id,
                     placeholder.isFinalTabstop ? OneSnippet._decor.activeFinal : OneSnippet._decor.active
@@ -141,11 +145,13 @@ class OneSnippet {
                 activePlaceholders.add(placeholder);
                 for (const enclosingPlaceholder of this._snippet.enclosingPlaceholders(placeholder)) {
                     const id = this._placeholderDecorations.get(enclosingPlaceholder);
-                    accessor.changeDecorationOptions(
-                        id,
-                        enclosingPlaceholder.isFinalTabstop ? OneSnippet._decor.activeFinal : OneSnippet._decor.active
-                    );
-                    activePlaceholders.add(enclosingPlaceholder);
+                    if (id) {
+                        accessor.changeDecorationOptions(
+                            id,
+                            enclosingPlaceholder.isFinalTabstop ? OneSnippet._decor.activeFinal : OneSnippet._decor.active
+                        );
+                        activePlaceholders.add(enclosingPlaceholder);
+                    }
                 }
             }
             for (const [placeholder, id] of this._placeholderDecorations) {
@@ -161,12 +167,13 @@ class OneSnippet {
         return !couldSkipThisPlaceholder ? newSelections ?? [] : this.move(fwd);
     }
     _hasPlaceholderBeenCollapsed(placeholder) {
+        const model = this._editor.getModel();
         let marker = placeholder;
         while (marker) {
             if (marker instanceof Placeholder) {
                 const id = this._placeholderDecorations.get(marker);
-                const range = this._editor.getModel().getDecorationRange(id);
-                if (range.isEmpty() && ( marker.toString()).length > 0) {
+                const range = id ? model.getDecorationRange(id) : null;
+                if ((!range || range.isEmpty()) && ( marker.toString()).length > 0) {
                     return true;
                 }
             }
@@ -249,6 +256,9 @@ class OneSnippet {
         });
         return result;
     }
+    get activePlaceholderCount() {
+        return this._placeholderGroupsIdx < 0 ? 0 : this._placeholderGroups[this._placeholderGroupsIdx].length;
+    }
     merge(others) {
         const model = this._editor.getModel();
         this._nestingLevel *= 10;
@@ -595,13 +605,14 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
                 snippets[idx].initialize(undoEdits[idx].textChange);
             }
             const isTrivialSnippet = snippets[0].isTrivialSnippet;
-            if (!isTrivialSnippet) {
+            const canMergeSnippets = snippets.length === this._snippets.reduce((count, snippet) => count + snippet.activePlaceholderCount, 0);
+            if (!isTrivialSnippet && canMergeSnippets) {
                 for (const snippet of this._snippets) {
                     snippet.merge(snippets);
                 }
                 console.assert(snippets.length === 0);
             }
-            if (this._snippets[0].hasPlaceholder && !isTrivialSnippet) {
+            if (this._snippets[0].hasPlaceholder && !isTrivialSnippet && canMergeSnippets) {
                 return this._move(undefined);
             } else {
                 return ( undoEdits.map(edit => Selection.fromPositions(edit.range.getEndPosition())));
@@ -610,13 +621,17 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
     }
     next() {
         const newSelections = this._move(true);
-        this._editor.setSelections(newSelections);
-        this._editor.revealPositionInCenterIfOutsideViewport(newSelections[0].getPosition());
+        if (newSelections.length > 0) {
+            this._editor.setSelections(newSelections);
+            this._editor.revealPositionInCenterIfOutsideViewport(newSelections[0].getPosition());
+        }
     }
     prev() {
         const newSelections = this._move(false);
-        this._editor.setSelections(newSelections);
-        this._editor.revealPositionInCenterIfOutsideViewport(newSelections[0].getPosition());
+        if (newSelections.length > 0) {
+            this._editor.setSelections(newSelections);
+            this._editor.revealPositionInCenterIfOutsideViewport(newSelections[0].getPosition());
+        }
     }
     _move(fwd) {
         const selections = [];

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

@@ -51,6 +51,7 @@ export declare class TimeBasedVariableResolver implements VariableResolver {
     private static readonly monthNames;
     private static readonly monthNamesShort;
     private readonly _date;
+    private _timezoneName;
     resolve(variable: Variable): string | undefined;
 }
 export declare class WorkspaceBasedVariableResolver implements VariableResolver {

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

@@ -18,12 +18,15 @@ const KnownSnippetVariableNames = ( Object.freeze({
     "CURRENT_HOUR": true,
     "CURRENT_MINUTE": true,
     "CURRENT_SECOND": true,
+    "CURRENT_MILLISECOND": true,
     "CURRENT_DAY_NAME": true,
     "CURRENT_DAY_NAME_SHORT": true,
     "CURRENT_MONTH_NAME": true,
     "CURRENT_MONTH_NAME_SHORT": true,
     "CURRENT_SECONDS_UNIX": true,
+    "CURRENT_MILLISECONDS_UNIX": true,
     "CURRENT_TIMEZONE_OFFSET": true,
+    "CURRENT_TIMEZONE_NAME": true,
     "SELECTION": true,
     "CLIPBOARD": true,
     "TM_SELECTED_TEXT": true,
@@ -221,53 +224,62 @@ class TimeBasedVariableResolver {
         this._date = ( new Date());
     }
     static {
-        this.dayNames = [( localize(1539, "Sunday")), ( localize(1540, "Monday")), ( localize(1541, "Tuesday")), ( localize(1542, "Wednesday")), ( localize(1543, "Thursday")), ( localize(1544, "Friday")), ( localize(1545, "Saturday"))];
+        this.dayNames = [( localize(1551, "Sunday")), ( localize(1552, "Monday")), ( localize(1553, "Tuesday")), ( localize(1554, "Wednesday")), ( localize(1555, "Thursday")), ( localize(1556, "Friday")), ( localize(1557, "Saturday"))];
     }
     static {
-        this.dayNamesShort = [( localize(1546, "Sun")), ( localize(1547, "Mon")), ( localize(1548, "Tue")), ( localize(1549, "Wed")), ( localize(1550, "Thu")), ( localize(1551, "Fri")), ( localize(1552, "Sat"))];
+        this.dayNamesShort = [( localize(1558, "Sun")), ( localize(1559, "Mon")), ( localize(1560, "Tue")), ( localize(1561, "Wed")), ( localize(1562, "Thu")), ( localize(1563, "Fri")), ( localize(1564, "Sat"))];
     }
     static {
-        this.monthNames = [( localize(1553, "January")), ( localize(1554, "February")), ( localize(1555, "March")), ( localize(1556, "April")), ( localize(1557, "May")), ( localize(1558, "June")), ( localize(1559, "July")), ( localize(1560, "August")), ( localize(1561, "September")), ( localize(1562, "October")), ( localize(1563, "November")), ( localize(1564, "December"))];
+        this.monthNames = [( localize(1565, "January")), ( localize(1566, "February")), ( localize(1567, "March")), ( localize(1568, "April")), ( localize(1569, "May")), ( localize(1570, "June")), ( localize(1571, "July")), ( localize(1572, "August")), ( localize(1573, "September")), ( localize(1574, "October")), ( localize(1575, "November")), ( localize(1576, "December"))];
     }
     static {
-        this.monthNamesShort = [( localize(1565, "Jan")), ( localize(1566, "Feb")), ( localize(1567, "Mar")), ( localize(1568, "Apr")), ( localize(1569, "May")), ( localize(1570, "Jun")), ( localize(1571, "Jul")), ( localize(1572, "Aug")), ( localize(1573, "Sep")), ( localize(1574, "Oct")), ( localize(1575, "Nov")), ( localize(1576, "Dec"))];
+        this.monthNamesShort = [( localize(1577, "Jan")), ( localize(1578, "Feb")), ( localize(1579, "Mar")), ( localize(1580, "Apr")), ( localize(1581, "May")), ( localize(1582, "Jun")), ( localize(1583, "Jul")), ( localize(1584, "Aug")), ( localize(1585, "Sep")), ( localize(1586, "Oct")), ( localize(1587, "Nov")), ( localize(1588, "Dec"))];
     }
     resolve(variable) {
         const {
             name
         } = variable;
-        if (name === "CURRENT_YEAR") {
+        switch (name) {
+        case "CURRENT_YEAR":
             return String(this._date.getFullYear());
-        } else if (name === "CURRENT_YEAR_SHORT") {
+        case "CURRENT_YEAR_SHORT":
             return String(this._date.getFullYear()).slice(-2);
-        } else if (name === "CURRENT_MONTH") {
+        case "CURRENT_MONTH":
             return String(this._date.getMonth().valueOf() + 1).padStart(2, "0");
-        } else if (name === "CURRENT_DATE") {
+        case "CURRENT_DATE":
             return String(this._date.getDate().valueOf()).padStart(2, "0");
-        } else if (name === "CURRENT_HOUR") {
+        case "CURRENT_HOUR":
             return String(this._date.getHours().valueOf()).padStart(2, "0");
-        } else if (name === "CURRENT_MINUTE") {
+        case "CURRENT_MINUTE":
             return String(this._date.getMinutes().valueOf()).padStart(2, "0");
-        } else if (name === "CURRENT_SECOND") {
+        case "CURRENT_SECOND":
             return String(this._date.getSeconds().valueOf()).padStart(2, "0");
-        } else if (name === "CURRENT_DAY_NAME") {
+        case "CURRENT_MILLISECOND":
+            return String(this._date.getMilliseconds().valueOf()).padStart(3, "0");
+        case "CURRENT_DAY_NAME":
             return TimeBasedVariableResolver.dayNames[this._date.getDay()];
-        } else if (name === "CURRENT_DAY_NAME_SHORT") {
+        case "CURRENT_DAY_NAME_SHORT":
             return TimeBasedVariableResolver.dayNamesShort[this._date.getDay()];
-        } else if (name === "CURRENT_MONTH_NAME") {
+        case "CURRENT_MONTH_NAME":
             return TimeBasedVariableResolver.monthNames[this._date.getMonth()];
-        } else if (name === "CURRENT_MONTH_NAME_SHORT") {
+        case "CURRENT_MONTH_NAME_SHORT":
             return TimeBasedVariableResolver.monthNamesShort[this._date.getMonth()];
-        } else if (name === "CURRENT_SECONDS_UNIX") {
+        case "CURRENT_SECONDS_UNIX":
             return String(Math.floor(this._date.getTime() / 1000));
-        } else if (name === "CURRENT_TIMEZONE_OFFSET") {
-            const rawTimeOffset = this._date.getTimezoneOffset();
-            const sign = rawTimeOffset > 0 ? "-" : "+";
-            const hours = Math.trunc(Math.abs(rawTimeOffset / 60));
-            const hoursString = (hours < 10 ? "0" + hours : hours);
-            const minutes = Math.abs(rawTimeOffset) - hours * 60;
-            const minutesString = (minutes < 10 ? "0" + minutes : minutes);
-            return sign + hoursString + ":" + minutesString;
+        case "CURRENT_MILLISECONDS_UNIX":
+            return String(this._date.getTime());
+        case "CURRENT_TIMEZONE_OFFSET":
+            {
+                const rawTimeOffset = this._date.getTimezoneOffset();
+                const sign = rawTimeOffset > 0 ? "-" : "+";
+                const hours = Math.trunc(Math.abs(rawTimeOffset / 60));
+                const hoursString = (hours < 10 ? "0" + hours : hours);
+                const minutes = Math.abs(rawTimeOffset) - hours * 60;
+                const minutesString = (minutes < 10 ? "0" + minutes : minutes);
+                return sign + hoursString + ":" + minutesString;
+            }
+        case "CURRENT_TIMEZONE_NAME":
+            return this._timezoneName ??= Intl.DateTimeFormat().resolvedOptions().timeZone;
         }
         return undefined;
     }

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js

@@ -15,20 +15,20 @@ class ToggleStickyScroll extends EditorAction2 {
         super({
             id: "editor.action.toggleStickyScroll",
             title: {
-                ...( localize2(1577, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1578, "&&Toggle Editor Sticky Scroll"))
+                ...( localize2(1589, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1590, "&&Toggle Editor Sticky Scroll"))
             },
             metadata: {
                 description: ( localize2(
-                    1579,
+                    1591,
                     "Toggle/enable the editor sticky scroll which shows the nested scopes at the top of the viewport"
                 ))
             },
             category: Categories.View,
             toggled: {
                 condition: ( ContextKeyExpr.equals("config.editor.stickyScroll.enabled", true)),
-                title: ( localize(1580, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1581, "&&Sticky Scroll"))
+                title: ( localize(1592, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1593, "&&Sticky Scroll"))
             },
             menu: [{
                 id: MenuId.CommandPalette
@@ -57,8 +57,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: "editor.action.focusStickyScroll",
             title: {
-                ...( localize2(1582, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1583, "&&Focus Editor Sticky Scroll"))
+                ...( localize2(1594, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1595, "&&Focus Editor Sticky Scroll"))
             },
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.has("config.editor.stickyScroll.enabled")), EditorContextKeys.stickyScrollVisible)),
             menu: [{
@@ -74,7 +74,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.selectNextStickyScrollLine",
-            title: ( localize2(1584, "Select the next editor sticky scroll line")),
+            title: ( localize2(1596, "Select the next editor sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -90,7 +90,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.selectPreviousStickyScrollLine",
-            title: ( localize2(1585, "Select the previous sticky scroll line")),
+            title: ( localize2(1597, "Select the previous sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -106,7 +106,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.goToFocusedStickyScrollLine",
-            title: ( localize2(1586, "Go to the focused sticky scroll line")),
+            title: ( localize2(1598, "Go to the focused sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -122,7 +122,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.selectEditor",
-            title: ( localize2(1587, "Select Editor")),
+            title: ( localize2(1599, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

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

@@ -21,21 +21,21 @@ import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 
 const Context = {
     Visible: historyNavigationVisible,
-    HasFocusedSuggestion: ( new RawContextKey("suggestWidgetHasFocusedSuggestion", false, ( localize(1588, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1589, "Whether suggestion details are visible")))),
-    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1590, "Whether the details pane of the suggest widget has focus")))),
-    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1591, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey("suggestWidgetHasFocusedSuggestion", false, ( localize(1600, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1601, "Whether suggestion details are visible")))),
+    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1602, "Whether the details pane of the suggest widget has focus")))),
+    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1603, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey("suggestionMakesTextEdit", true, ( localize(
-        1592,
+        1604,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1593, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1594, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1605, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1606, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey("suggestionInsertMode", undefined, {
         type: "string",
-        description: ( localize(1595, "Whether the default behaviour is to insert or replace"))
+        description: ( localize(1607, "Whether the default behaviour is to insert or replace"))
     })),
-    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1596, "Whether the current suggestion supports to resolve further details"))))
+    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1608, "Whether the current suggestion supports to resolve further details"))))
 };
 const suggestWidgetStatusbarMenu = ( new MenuId("suggestWidgetStatusBar"));
 class CompletionItem {