@codingame/monaco-vscode-api 26.2.2 → 27.0.0

package/vscode/src/vs/base/browser/ui/tree/abstractTree.js

@@ -300,6 +300,7 @@ class TreeRenderer {
         this.renderedElements = ( new Map());
         this.renderedNodes = ( new Map());
         this.indent = TreeRenderer.DefaultIndent;
+        this.defaultIndent = TreeRenderer.DefaultIndent;
         this.hideTwistiesOfChildlessElements = false;
         this.shouldRenderIndentGuides = false;
         this.activeIndentNodes = ( new Set());
@@ -311,12 +312,16 @@ class TreeRenderer {
         renderer.onDidChangeTwistieState?.(this.onDidChangeTwistieState, this, this.disposables);
     }
     updateOptions(options = {}) {
-        if (typeof options.indent !== "undefined") {
-            const indent = clamp(options.indent, 0, 40);
-            if (indent !== this.indent) {
+        if (typeof options.defaultIndent !== "undefined") {
+            this.defaultIndent = options.defaultIndent;
+        }
+        if (typeof options.indent !== "undefined" || typeof options.defaultIndent !== "undefined") {
+            const indent = typeof options.indent !== "undefined" ? clamp(options.indent, 0, 40) : this.indent;
+            const needsRerender = indent !== this.indent || typeof options.defaultIndent !== "undefined";
+            if (needsRerender) {
                 this.indent = indent;
                 for (const [node, templateData] of this.renderedNodes) {
-                    templateData.indentSize = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent;
+                    templateData.indentSize = this.defaultIndent + (node.depth - 1) * this.indent;
                     this.renderTreeElement(node, templateData);
                 }
             }
@@ -360,7 +365,7 @@ class TreeRenderer {
         };
     }
     renderElement(node, index, templateData, details) {
-        templateData.indentSize = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent;
+        templateData.indentSize = this.defaultIndent + (node.depth - 1) * this.indent;
         this.renderedNodes.set(node, templateData);
         this.renderedElements.set(node.element, node);
         this.renderTreeElement(node, templateData);
@@ -708,7 +713,7 @@ class FindWidget extends Disposable {
             h(".monaco-tree-type-filter-actionbar@actionbar")
         ]);
         this.toggles = [];
-        this._onDidDisable = ( new Emitter());
+        this._onDidDisable = this._register(( new Emitter()));
         this.onDidDisable = this._onDidDisable.event;
         container.appendChild(this.elements.root);
         this._register(toDisposable(() => this.elements.root.remove()));
@@ -729,7 +734,7 @@ class FindWidget extends Disposable {
         }))))));
         const history = options?.history || [];
         this.findInput = this._register(( new FindInput(this.elements.findInput, contextViewProvider, {
-            label: ( localize(32, "Type to search")),
+            label: ( localize(33, "Type to search")),
             placeholder,
             additionalToggles: this.toggles,
             showCommonFindToggles: false,
@@ -767,7 +772,7 @@ class FindWidget extends Disposable {
                 return;
             }
         }));
-        const closeAction = this._register(( new Action("close", ( localize(33, "Close")), "codicon codicon-close", true, () => this.dispose())));
+        const closeAction = this._register(( new Action("close", ( localize(34, "Close")), "codicon codicon-close", true, () => this.dispose())));
         this.actionbar.push(closeAction, {
             icon: true,
             label: false
@@ -836,7 +841,7 @@ class AbstractFindController {
         this.enabledDisposables = ( new DisposableStore());
         this.disposables = ( new DisposableStore());
         this.toggles = ( new FindToggles(options.toggles ?? []));
-        this._placeholder = options.placeholder ?? ( localize(32, "Type to search"));
+        this._placeholder = options.placeholder ?? ( localize(33, "Type to search"));
     }
     isOpened() {
         return !!this.widget;
@@ -903,7 +908,7 @@ class AbstractFindController {
             if (this.tree.options.showNotFoundMessage ?? true) {
                 this.widget?.showMessage({
                     type: MessageType.WARNING,
-                    content: warningMessage ?? ( localize(34, "No results found."))
+                    content: warningMessage ?? ( localize(35, "No results found."))
                 });
             } else {
                 this.widget?.showMessage({
@@ -916,9 +921,9 @@ class AbstractFindController {
     }
     alertResults(results) {
         if (!results) {
-            alert(( localize(35, "No results")));
+            alert(( localize(36, "No results")));
         } else {
-            alert(( localize(36, "{0} results", results)));
+            alert(( localize(37, "{0} results", results)));
         }
     }
     dispose() {
@@ -938,7 +943,7 @@ class FindController extends AbstractFindController {
         }
         const isFilterMode = mode === TreeFindMode.Filter;
         this.updateToggleState(DefaultTreeToggles.Mode, isFilterMode);
-        this.placeholder = isFilterMode ? ( localize(37, "Type to filter")) : ( localize(32, "Type to search"));
+        this.placeholder = isFilterMode ? ( localize(38, "Type to filter")) : ( localize(33, "Type to search"));
         this.filter.findMode = mode;
         this.tree.refilter();
         this.render();
@@ -963,12 +968,12 @@ class FindController extends AbstractFindController {
         const toggleContributions = [{
             id: DefaultTreeToggles.Mode,
             icon: Codicon.listFilter,
-            title: ( localize(38, "Filter")),
+            title: ( localize(39, "Filter")),
             isChecked: defaultFindMode === TreeFindMode.Filter
         }, {
             id: DefaultTreeToggles.MatchType,
             icon: Codicon.searchFuzzy,
-            title: ( localize(39, "Fuzzy Match")),
+            title: ( localize(40, "Fuzzy Match")),
             isChecked: defaultFindMatchType === TreeFindMatchType.Fuzzy
         }];
         filter.findMatchType = defaultFindMatchType;
@@ -1162,7 +1167,7 @@ class StickyScrollController extends Disposable {
     }
     update() {
         const firstVisibleNode = this.getNodeAtHeight(this.paddingTop);
-        if (!firstVisibleNode || this.tree.scrollTop <= this.paddingTop) {
+        if (!firstVisibleNode || this.tree.scrollTop <= this.paddingTop || this.view.renderHeight === 0) {
             this._widget.setState(undefined);
             return;
         }
@@ -1548,9 +1553,9 @@ class StickyScrollFocus extends Disposable {
         this.view = view;
         this.focusedIndex = -1;
         this.elements = [];
-        this._onDidChangeHasFocus = ( new Emitter());
+        this._onDidChangeHasFocus = this._register(( new Emitter()));
         this.onDidChangeHasFocus = this._onDidChangeHasFocus.event;
-        this._onContextMenu = ( new Emitter());
+        this._onContextMenu = this._register(( new Emitter()));
         this.onContextMenu = this._onContextMenu.event;
         this._domHasFocus = false;
         this._register(addDisposableListener(this.container, "focus", () => this.onFocus()));
@@ -2687,7 +2692,7 @@ class AbstractTree {
                     deep
                 } = e;
                 if (node.collapsible && !deep && this.isDOMFocused()) {
-                    alert(node.collapsed ? ( localize(40, "collapsed")) : ( localize(41, "expanded")));
+                    alert(node.collapsed ? ( localize(41, "collapsed")) : ( localize(42, "expanded")));
                 }
             }));
         }

package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js

@@ -291,7 +291,7 @@ class AsyncFindController extends FindController {
         this.toggles.set(e.id, e.isChecked);
         this.filter.findMode = this.mode;
         this.filter.findMatchType = this.matchType;
-        this.placeholder = this.mode === TreeFindMode.Filter ? ( localize(42, "Type to filter")) : ( localize(43, "Type to search"));
+        this.placeholder = this.mode === TreeFindMode.Filter ? ( localize(43, "Type to filter")) : ( localize(44, "Type to search"));
         this.applyPattern(this.pattern);
     }
     shouldAllowFocus(node) {
@@ -1119,6 +1119,8 @@ class AsyncDataTree {
         };
     }
     dispose() {
+        this._onDidRender.dispose();
+        this._onDidChangeNodeSlowState.dispose();
         this.disposables.dispose();
         this.tree.dispose();
     }

package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js

@@ -4,7 +4,7 @@ import { localize } from '../../../../nls.js';
 
 class CollapseAllAction extends Action {
     constructor(viewer, enabled) {
-        super("vs.tree.collapse", ( localize(44, "Collapse All")), "collapse-all", enabled);
+        super("vs.tree.collapse", ( localize(45, "Collapse All")), "collapse-all", enabled);
         this.viewer = viewer;
     }
     async run() {

package/vscode/src/vs/base/common/actions.js

@@ -176,7 +176,7 @@ class EmptySubmenuAction extends Action {
         this.ID = "vs.actions.empty";
     }
     constructor() {
-        super(EmptySubmenuAction.ID, ( localize(45, "(empty)")), undefined, false);
+        super(EmptySubmenuAction.ID, ( localize(46, "(empty)")), undefined, false);
     }
 }
 function toAction(props) {

package/vscode/src/vs/base/common/codicons.d.ts

@@ -718,4 +718,6 @@ export declare const Codicon: {
     readonly ask: ThemeIcon;
     readonly openai: ThemeIcon;
     readonly claude: ThemeIcon;
+    readonly openInWindow: ThemeIcon;
+    readonly newSession: ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.d.ts

@@ -644,4 +644,6 @@ export declare const codiconsLibrary: {
     readonly ask: import("./themables.js").ThemeIcon;
     readonly openai: import("./themables.js").ThemeIcon;
     readonly claude: import("./themables.js").ThemeIcon;
+    readonly openInWindow: import("./themables.js").ThemeIcon;
+    readonly newSession: import("./themables.js").ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.js

@@ -647,6 +647,8 @@ const codiconsLibrary = {
     ask: register('ask', 0xec80),
     openai: register('openai', 0xec81),
     claude: register('claude', 0xec82),
+    openInWindow: register('open-in-window', 0xec83),
+    newSession: register('new-session', 0xec84),
 };
 
 export { codiconsLibrary };

package/vscode/src/vs/base/common/date.js

@@ -11,137 +11,137 @@ const month = day * 30;
 const year = day * 365;
 function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
     if (typeof date === "undefined") {
-        return localize(46, "unknown");
+        return localize(47, "unknown");
     }
     if (typeof date !== "number") {
         date = date.getTime();
     }
     const seconds = Math.round((( new Date()).getTime() - date) / 1000);
     if (seconds < -30) {
-        return localize(47, "in {0}", fromNow(( new Date()).getTime() + seconds * 1000, false));
+        return localize(48, "in {0}", fromNow(( new Date()).getTime() + seconds * 1000, false));
     }
     if (!disallowNow && seconds < 30) {
-        return localize(48, "now");
+        return localize(49, "now");
     }
     let value;
     if (seconds < minute) {
         value = seconds;
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(49, "{0} second ago", value)) : ( localize(50, "{0} sec ago", value));
+                return useFullTimeWords ? ( localize(50, "{0} second ago", value)) : ( localize(51, "{0} sec ago", value));
             } else {
-                return useFullTimeWords ? ( localize(51, "{0} seconds ago", value)) : ( localize(52, "{0} secs ago", value));
+                return useFullTimeWords ? ( localize(52, "{0} seconds ago", value)) : ( localize(53, "{0} secs ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(53, "{0} second", value)) : ( localize(54, "{0} sec", value));
+                return useFullTimeWords ? ( localize(54, "{0} second", value)) : ( localize(55, "{0} sec", value));
             } else {
-                return useFullTimeWords ? ( localize(55, "{0} seconds", value)) : ( localize(56, "{0} secs", value));
+                return useFullTimeWords ? ( localize(56, "{0} seconds", value)) : ( localize(57, "{0} secs", value));
             }
         }
     }
     if (seconds < hour) {
-        value = Math.floor(seconds / minute);
+        value = Math.round(seconds / minute);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(57, "{0} minute ago", value)) : ( localize(58, "{0} min ago", value));
+                return useFullTimeWords ? ( localize(58, "{0} minute ago", value)) : ( localize(59, "{0} min ago", value));
             } else {
-                return useFullTimeWords ? ( localize(59, "{0} minutes ago", value)) : ( localize(60, "{0} mins ago", value));
+                return useFullTimeWords ? ( localize(60, "{0} minutes ago", value)) : ( localize(61, "{0} mins ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(61, "{0} minute", value)) : ( localize(62, "{0} min", value));
+                return useFullTimeWords ? ( localize(62, "{0} minute", value)) : ( localize(63, "{0} min", value));
             } else {
-                return useFullTimeWords ? ( localize(63, "{0} minutes", value)) : ( localize(64, "{0} mins", value));
+                return useFullTimeWords ? ( localize(64, "{0} minutes", value)) : ( localize(65, "{0} mins", value));
             }
         }
     }
     if (seconds < day) {
-        value = Math.floor(seconds / hour);
+        value = Math.round(seconds / hour);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(65, "{0} hour ago", value)) : ( localize(66, "{0} hr ago", value));
+                return useFullTimeWords ? ( localize(66, "{0} hour ago", value)) : ( localize(67, "{0} hr ago", value));
             } else {
-                return useFullTimeWords ? ( localize(67, "{0} hours ago", value)) : ( localize(68, "{0} hrs ago", value));
+                return useFullTimeWords ? ( localize(68, "{0} hours ago", value)) : ( localize(69, "{0} hrs ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(69, "{0} hour", value)) : ( localize(70, "{0} hr", value));
+                return useFullTimeWords ? ( localize(70, "{0} hour", value)) : ( localize(71, "{0} hr", value));
             } else {
-                return useFullTimeWords ? ( localize(71, "{0} hours", value)) : ( localize(72, "{0} hrs", value));
+                return useFullTimeWords ? ( localize(72, "{0} hours", value)) : ( localize(73, "{0} hrs", value));
             }
         }
     }
     if (seconds < week) {
-        value = Math.floor(seconds / day);
+        value = Math.round(seconds / day);
         if (appendAgoLabel) {
-            return value === 1 ? ( localize(73, "{0} day ago", value)) : ( localize(74, "{0} days ago", value));
+            return value === 1 ? ( localize(74, "{0} day ago", value)) : ( localize(75, "{0} days ago", value));
         } else {
-            return value === 1 ? ( localize(75, "{0} day", value)) : ( localize(76, "{0} days", value));
+            return value === 1 ? ( localize(76, "{0} day", value)) : ( localize(77, "{0} days", value));
         }
     }
     if (seconds < month) {
-        value = Math.floor(seconds / week);
+        value = Math.round(seconds / week);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(77, "{0} week ago", value)) : ( localize(78, "{0} wk ago", value));
+                return useFullTimeWords ? ( localize(78, "{0} week ago", value)) : ( localize(79, "{0} wk ago", value));
             } else {
-                return useFullTimeWords ? ( localize(79, "{0} weeks ago", value)) : ( localize(80, "{0} wks ago", value));
+                return useFullTimeWords ? ( localize(80, "{0} weeks ago", value)) : ( localize(81, "{0} wks ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(81, "{0} week", value)) : ( localize(82, "{0} wk", value));
+                return useFullTimeWords ? ( localize(82, "{0} week", value)) : ( localize(83, "{0} wk", value));
             } else {
-                return useFullTimeWords ? ( localize(83, "{0} weeks", value)) : ( localize(84, "{0} wks", value));
+                return useFullTimeWords ? ( localize(84, "{0} weeks", value)) : ( localize(85, "{0} wks", value));
             }
         }
     }
     if (seconds < year) {
-        value = Math.floor(seconds / month);
+        value = Math.round(seconds / month);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(85, "{0} month ago", value)) : ( localize(86, "{0} mo ago", value));
+                return useFullTimeWords ? ( localize(86, "{0} month ago", value)) : ( localize(87, "{0} mo ago", value));
             } else {
-                return useFullTimeWords ? ( localize(87, "{0} months ago", value)) : ( localize(88, "{0} mos ago", value));
+                return useFullTimeWords ? ( localize(88, "{0} months ago", value)) : ( localize(89, "{0} mos ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(89, "{0} month", value)) : ( localize(90, "{0} mo", value));
+                return useFullTimeWords ? ( localize(90, "{0} month", value)) : ( localize(91, "{0} mo", value));
             } else {
-                return useFullTimeWords ? ( localize(91, "{0} months", value)) : ( localize(92, "{0} mos", value));
+                return useFullTimeWords ? ( localize(92, "{0} months", value)) : ( localize(93, "{0} mos", value));
             }
         }
     }
-    value = Math.floor(seconds / year);
+    value = Math.round(seconds / year);
     if (appendAgoLabel) {
         if (value === 1) {
-            return useFullTimeWords ? ( localize(93, "{0} year ago", value)) : ( localize(94, "{0} yr ago", value));
+            return useFullTimeWords ? ( localize(94, "{0} year ago", value)) : ( localize(95, "{0} yr ago", value));
         } else {
-            return useFullTimeWords ? ( localize(95, "{0} years ago", value)) : ( localize(96, "{0} yrs ago", value));
+            return useFullTimeWords ? ( localize(96, "{0} years ago", value)) : ( localize(97, "{0} yrs ago", value));
         }
     } else {
         if (value === 1) {
-            return useFullTimeWords ? ( localize(97, "{0} year", value)) : ( localize(98, "{0} yr", value));
+            return useFullTimeWords ? ( localize(98, "{0} year", value)) : ( localize(99, "{0} yr", value));
         } else {
-            return useFullTimeWords ? ( localize(99, "{0} years", value)) : ( localize(100, "{0} yrs", value));
+            return useFullTimeWords ? ( localize(100, "{0} years", value)) : ( localize(101, "{0} yrs", value));
         }
     }
 }
 function getDurationString(ms, useFullTimeWords) {
     const seconds = Math.abs(ms / 1000);
     if (seconds < 1) {
-        return useFullTimeWords ? ( localize(101, "{0} milliseconds", ms)) : ( localize(102, "{0}ms", ms));
+        return useFullTimeWords ? ( localize(102, "{0} milliseconds", ms)) : ( localize(103, "{0}ms", ms));
     }
     if (seconds < minute) {
-        return useFullTimeWords ? ( localize(103, "{0} seconds", Math.round(ms) / 1000)) : ( localize(104, "{0}s", Math.round(ms) / 1000));
+        return useFullTimeWords ? ( localize(104, "{0} seconds", Math.round(ms) / 1000)) : ( localize(105, "{0}s", Math.round(ms) / 1000));
     }
     if (seconds < hour) {
-        return useFullTimeWords ? ( localize(105, "{0} minutes", Math.round(ms / (1000 * minute)))) : ( localize(106, "{0} mins", Math.round(ms / (1000 * minute))));
+        return useFullTimeWords ? ( localize(106, "{0} minutes", Math.round(ms / (1000 * minute)))) : ( localize(107, "{0} mins", Math.round(ms / (1000 * minute))));
     }
     if (seconds < day) {
-        return useFullTimeWords ? ( localize(107, "{0} hours", Math.round(ms / (1000 * hour)))) : ( localize(108, "{0} hrs", Math.round(ms / (1000 * hour))));
+        return useFullTimeWords ? ( localize(108, "{0} hours", Math.round(ms / (1000 * hour)))) : ( localize(109, "{0} hrs", Math.round(ms / (1000 * hour))));
     }
-    return localize(109, "{0} days", Math.round(ms / (1000 * day)));
+    return localize(110, "{0} days", Math.round(ms / (1000 * day)));
 }
 function toLocalISOString(date) {
     return date.getFullYear() + "-" + String(date.getMonth() + 1).padStart(2, "0") + "-" + String(date.getDate()).padStart(2, "0") + "T" + String(date.getHours()).padStart(2, "0") + ":" + String(date.getMinutes()).padStart(2, "0") + ":" + String(date.getSeconds()).padStart(2, "0") + "." + (date.getMilliseconds() / 1000).toFixed(3).slice(2, 5) + "Z";

package/vscode/src/vs/base/common/defaultAccount.d.ts

@@ -39,6 +39,10 @@ export interface IPolicyData {
     readonly mcpRegistryUrl?: string;
     readonly mcpAccess?: "allow_all" | "registry_only";
 }
+export interface ICopilotTokenInfo {
+    readonly sn?: string;
+    readonly fcv1?: string;
+}
 export interface IDefaultAccountAuthenticationProvider {
     readonly id: string;
     readonly name: string;
@@ -46,6 +50,7 @@ export interface IDefaultAccountAuthenticationProvider {
 }
 export interface IDefaultAccount {
     readonly authenticationProvider: IDefaultAccountAuthenticationProvider;
+    readonly accountName: string;
     readonly sessionId: string;
     readonly enterprise: boolean;
     readonly entitlementsData?: IEntitlementsData | null;

package/vscode/src/vs/base/common/errorMessage.js

@@ -6,7 +6,7 @@ import { localize } from '../../nls.js';
 function exceptionToErrorMessage(exception, verbose) {
     if (verbose && (exception.stack || exception.stacktrace)) {
         return localize(
-            110,
+            111,
             "{0}: {1}",
             detectSystemErrorMessage(exception),
             stackToString(exception.stack) || stackToString(exception.stacktrace)
@@ -25,19 +25,19 @@ function detectSystemErrorMessage(exception) {
         return `${exception.message}. Please update the 'security.allowedUNCHosts' setting if you want to allow this host.`;
     }
     if (typeof exception.code === "string" && typeof exception.errno === "number" && typeof exception.syscall === "string") {
-        return localize(111, "A system error occurred ({0})", exception.message);
+        return localize(112, "A system error occurred ({0})", exception.message);
     }
-    return exception.message || ( localize(112, "An unknown error occurred. Please consult the log for more details."));
+    return exception.message || ( localize(113, "An unknown error occurred. Please consult the log for more details."));
 }
 function toErrorMessage(error = null, verbose = false) {
     if (!error) {
-        return localize(112, "An unknown error occurred. Please consult the log for more details.");
+        return localize(113, "An unknown error occurred. Please consult the log for more details.");
     }
     if (Array.isArray(error)) {
         const errors = coalesce(error);
         const msg = toErrorMessage(errors[0], verbose);
         if (errors.length > 1) {
-            return localize(113, "{0} ({1} errors in total)", msg, errors.length);
+            return localize(114, "{0} ({1} errors in total)", msg, errors.length);
         }
         return msg;
     }
@@ -59,7 +59,7 @@ function toErrorMessage(error = null, verbose = false) {
     if (error.message) {
         return error.message;
     }
-    return localize(112, "An unknown error occurred. Please consult the log for more details.");
+    return localize(113, "An unknown error occurred. Please consult the log for more details.");
 }
 function isErrorWithActions(obj) {
     const candidate = obj;

package/vscode/src/vs/base/common/jsonErrorMessages.js

@@ -5,23 +5,23 @@ import { ParseErrorCode } from './json.js';
 function getParseErrorMessage(errorCode) {
     switch (errorCode) {
     case ParseErrorCode.InvalidSymbol:
-        return localize(114, "Invalid symbol");
+        return localize(115, "Invalid symbol");
     case ParseErrorCode.InvalidNumberFormat:
-        return localize(115, "Invalid number format");
+        return localize(116, "Invalid number format");
     case ParseErrorCode.PropertyNameExpected:
-        return localize(116, "Property name expected");
+        return localize(117, "Property name expected");
     case ParseErrorCode.ValueExpected:
-        return localize(117, "Value expected");
+        return localize(118, "Value expected");
     case ParseErrorCode.ColonExpected:
-        return localize(118, "Colon expected");
+        return localize(119, "Colon expected");
     case ParseErrorCode.CommaExpected:
-        return localize(119, "Comma expected");
+        return localize(120, "Comma expected");
     case ParseErrorCode.CloseBraceExpected:
-        return localize(120, "Closing brace expected");
+        return localize(121, "Closing brace expected");
     case ParseErrorCode.CloseBracketExpected:
-        return localize(121, "Closing bracket expected");
+        return localize(122, "Closing bracket expected");
     case ParseErrorCode.EndOfFileExpected:
-        return localize(122, "End of file expected");
+        return localize(123, "End of file expected");
     default:
         return "";
     }

package/vscode/src/vs/base/common/keyCodes.js

@@ -852,10 +852,10 @@ for (let i = 0; i <= KeyCode.MAX_VALUE; i++) {
             ScanCode.Delete,
             "Delete",
             KeyCode.Delete,
-            "Delete",
+            "Del",
             46,
             "VK_DELETE",
-            empty,
+            "Delete",
             empty
         ],
         [1, ScanCode.End, "End", KeyCode.End, "End", 35, "VK_END", empty, empty],
@@ -2226,6 +2226,8 @@ var KeyCodeUtils;
             return "Left";
         case KeyCode.RightArrow:
             return "Right";
+        case KeyCode.Delete:
+            return "Delete";
         }
         return uiMap.keyCodeToStr(keyCode);
     }

package/vscode/src/vs/base/common/keybindingLabels.js

@@ -32,35 +32,35 @@ const UILabelProvider = ( new ModifierLabelProvider({
     metaKey: "⌘",
     separator: ""
 }, {
-    ctrlKey: ( localize(123, "Ctrl")),
-    shiftKey: ( localize(124, "Shift")),
-    altKey: ( localize(125, "Alt")),
-    metaKey: ( localize(126, "Windows")),
+    ctrlKey: ( localize(124, "Ctrl")),
+    shiftKey: ( localize(125, "Shift")),
+    altKey: ( localize(126, "Alt")),
+    metaKey: ( localize(127, "Windows")),
     separator: "+"
 }, {
-    ctrlKey: ( localize(123, "Ctrl")),
-    shiftKey: ( localize(124, "Shift")),
-    altKey: ( localize(125, "Alt")),
-    metaKey: ( localize(127, "Super")),
+    ctrlKey: ( localize(124, "Ctrl")),
+    shiftKey: ( localize(125, "Shift")),
+    altKey: ( localize(126, "Alt")),
+    metaKey: ( localize(128, "Super")),
     separator: "+"
 }));
 const AriaLabelProvider = ( new ModifierLabelProvider({
-    ctrlKey: ( localize(128, "Control")),
-    shiftKey: ( localize(129, "Shift")),
-    altKey: ( localize(130, "Option")),
-    metaKey: ( localize(131, "Command")),
+    ctrlKey: ( localize(129, "Control")),
+    shiftKey: ( localize(130, "Shift")),
+    altKey: ( localize(131, "Option")),
+    metaKey: ( localize(132, "Command")),
     separator: "+"
 }, {
-    ctrlKey: ( localize(128, "Control")),
-    shiftKey: ( localize(129, "Shift")),
-    altKey: ( localize(132, "Alt")),
-    metaKey: ( localize(133, "Windows")),
+    ctrlKey: ( localize(129, "Control")),
+    shiftKey: ( localize(130, "Shift")),
+    altKey: ( localize(133, "Alt")),
+    metaKey: ( localize(134, "Windows")),
     separator: "+"
 }, {
-    ctrlKey: ( localize(128, "Control")),
-    shiftKey: ( localize(129, "Shift")),
-    altKey: ( localize(132, "Alt")),
-    metaKey: ( localize(134, "Super")),
+    ctrlKey: ( localize(129, "Control")),
+    shiftKey: ( localize(130, "Shift")),
+    altKey: ( localize(133, "Alt")),
+    metaKey: ( localize(135, "Super")),
     separator: "+"
 }));
 const ElectronAcceleratorLabelProvider = ( new ModifierLabelProvider({

package/vscode/src/vs/base/common/layout.d.ts

@@ -0,0 +1,67 @@
+export interface IAnchor {
+    x: number;
+    y: number;
+    width?: number;
+    height?: number;
+}
+export declare enum AnchorAlignment {
+    LEFT = 0,
+    RIGHT = 1
+}
+export declare enum AnchorPosition {
+    BELOW = 0,
+    ABOVE = 1
+}
+export declare enum AnchorAxisAlignment {
+    VERTICAL = 0,
+    HORIZONTAL = 1
+}
+interface IPosition {
+    readonly top: number;
+    readonly left: number;
+}
+interface ISize {
+    readonly width: number;
+    readonly height: number;
+}
+export interface IRect extends IPosition, ISize {
+}
+export declare enum LayoutAnchorPosition {
+    Before = 0,
+    After = 1
+}
+export declare enum LayoutAnchorMode {
+    AVOID = 0,
+    ALIGN = 1
+}
+export interface ILayoutAnchor {
+    offset: number;
+    size: number;
+    mode?: LayoutAnchorMode;
+    position: LayoutAnchorPosition;
+}
+export interface ILayoutResult {
+    position: number;
+    result: "ok" | "flipped" | "overlap";
+}
+/**
+ * Lays out a one dimensional view next to an anchor in a viewport.
+ *
+ * @returns The view offset within the viewport.
+ */
+export declare function layout(viewportSize: number, viewSize: number, anchor: ILayoutAnchor): ILayoutResult;
+interface ILayout2DOptions {
+    readonly anchorAlignment?: AnchorAlignment;
+    readonly anchorPosition?: AnchorPosition;
+    readonly anchorAxisAlignment?: AnchorAxisAlignment;
+}
+export interface ILayout2DResult {
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+    anchorAlignment: AnchorAlignment;
+    anchorPosition: AnchorPosition;
+}
+export declare function layout2d(viewport: IRect, view: ISize, anchor: IRect, options?: ILayout2DOptions): ILayout2DResult;
+export {};