@codingame/monaco-vscode-api 8.0.4 → 9.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -1,7 +1,7 @@
 import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { focusBorder } from '../../../../platform/theme/common/colors/baseColors.js';
@@ -19,9 +19,10 @@ var InlineChatConfigKeys;
     InlineChatConfigKeys["Mode"] = "inlineChat.mode";
     InlineChatConfigKeys["FinishOnType"] = "inlineChat.finishOnType";
     InlineChatConfigKeys["AcceptedOrDiscardBeforeSave"] = "inlineChat.acceptedOrDiscardBeforeSave";
+    InlineChatConfigKeys["StartWithOverlayWidget"] = "inlineChat.startWithOverlayWidget";
+    InlineChatConfigKeys["ZoneToolbar"] = "inlineChat.experimental.enableZoneToolbar";
     InlineChatConfigKeys["HoldToSpeech"] = "inlineChat.holdToSpeech";
     InlineChatConfigKeys["AccessibleDiffView"] = "inlineChat.accessibleDiffView";
-    InlineChatConfigKeys["ExpTextButtons"] = "inlineChat.experimental.textButtons";
 })(InlineChatConfigKeys || (InlineChatConfigKeys = {}))));
 var EditMode;
 ( ((function(EditMode) {
@@ -33,7 +34,7 @@ var EditMode;
     properties: {
         [InlineChatConfigKeys.Mode]: {
             description: ( localize(
-                7041,
+                6994,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: EditMode.Live,
@@ -41,11 +42,11 @@ var EditMode;
             enum: [EditMode.Live, EditMode.Preview],
             markdownEnumDescriptions: [
                 ( localize(
-                    7042,
+                    6995,
                     "Changes are applied directly to the document, can be highlighted via inline diffs, and accepted/discarded by hunks. Ending a session will keep the changes."
                 )),
                 ( localize(
-                    7043,
+                    6996,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
@@ -53,20 +54,20 @@ var EditMode;
         },
         [InlineChatConfigKeys.FinishOnType]: {
             description: ( localize(
-                7044,
+                6997,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
-            description: ( localize(7045, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localize(6998, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         [InlineChatConfigKeys.HoldToSpeech]: {
             description: ( localize(
-                7046,
+                6999,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
@@ -74,7 +75,7 @@ var EditMode;
         },
         [InlineChatConfigKeys.AccessibleDiffView]: {
             description: ( localize(
-                7047,
+                7000,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -82,15 +83,26 @@ var EditMode;
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
                 ( localize(
-                    7048,
+                    7001,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localize(7049, "The accessible diff viewer is always enabled.")),
-                ( localize(7050, "The accessible diff viewer is never enabled.")),
+                ( localize(7002, "The accessible diff viewer is always enabled.")),
+                ( localize(7003, "The accessible diff viewer is never enabled.")),
             ],
         },
-        [InlineChatConfigKeys.ExpTextButtons]: {
-            description: ( localize(7051, "Whether to use textual buttons.")),
+        [InlineChatConfigKeys.StartWithOverlayWidget]: {
+            description: ( localize(
+                7004,
+                "Whether inline chat opens directly as zone widget, between the lines, or as overlay widget which turns into a zone."
+            )),
+            default: false,
+            type: 'boolean',
+        },
+        [InlineChatConfigKeys.ZoneToolbar]: {
+            description: ( localize(
+                7005,
+                "Whether to show a toolbar to accept or reject changes in the inline chat changes view."
+            )),
             default: false,
             type: 'boolean',
             tags: ['experimental']
@@ -104,53 +116,59 @@ var InlineChatResponseType;
     InlineChatResponseType["Messages"] = "messages";
     InlineChatResponseType["MessagesAndEdits"] = "messagesAndEdits";
 })(InlineChatResponseType || (InlineChatResponseType = {}))));
-const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7052, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7053, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7054, "Whether the interactive editor input is focused")))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7055, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7056, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7006, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7007, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7008, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_EDITING = ( (new RawContextKey('inlineChatEditing', true, ( localize(
+    7009,
+    "Whether the user is currently editing or generating code in the inline chat"
+)))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7010, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7011, "Whether the interactive editor input is empty")))));
 const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
-    7057,
+    7012,
     "Whether the cursor of the iteractive editor input is on the first line"
 )))));
 const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localize(
-    7058,
+    7013,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
-    7061,
+    7016,
     "Whether the cursor of the outer editor is above or below the interactive editor input"
 )))));
-const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7062, "Whether interactive editor has kept a session for quick restore")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7063, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7064, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7065, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7066, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7017, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7018, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7019, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7020, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7021, "Whether the current change showing a diff")))));
 const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', EditMode.Live)));
-const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7067, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7022, "Whether an inline chat request is currently in progress")))));
 const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localize(
-    7068,
+    7023,
     "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
 )))));
-const CTX_INLINE_CHAT_CONFIG_TXT_BTNS = ( (ContextKeyExpr.equals(`config.${[InlineChatConfigKeys.ExpTextButtons]}`, true)));
 const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
+const ACTION_DISCARD_CHANGES = 'inlineChat.discardHunkChange';
 const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
 const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
-const MENU_INLINE_CHAT_EXECUTE = MenuId.for('inlineChat.execute');
+const ACTION_REPORT_ISSUE = 'inlineChat.reportIssue';
 const MENU_INLINE_CHAT_CONTENT_STATUS = MenuId.for('inlineChat.content.status');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7069, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7070, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', editorWidgetBorder, ( localize(7071, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', widgetShadow, ( localize(7072, "Shadow color of the interactive editor widget")));
-registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7073, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7074, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7075, "Foreground color of the interactive editor input placeholder")));
-registerColor('inlineChatInput.background', inputBackground, ( localize(7076, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7077, "Background color of inserted text in the interactive editor input")));
-const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7078, 'Overview ruler marker color for inline chat inserted content.')));
-const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7078, 'Overview ruler marker color for inline chat inserted content.')));
-registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7079, "Background color of removed text in the interactive editor input")));
-registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localize(7080, 'Overview ruler marker color for inline chat removed content.')));
-export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_CONFIG_TXT_BTNS, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_EXECUTE, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };
+const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for('inlineChatWidget.secondary');
+const MENU_INLINE_CHAT_ZONE = MenuId.for('inlineChatWidget.changesZone');
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7024, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7025, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7026, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7027, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7028, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7029, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7030, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7031, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7032, "Background color of inserted text in the interactive editor input")));
+const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7033, 'Overview ruler marker color for inline chat inserted content.')));
+const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7033, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7034, "Background color of removed text in the interactive editor input")));
+registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localize(7035, 'Overview ruler marker color for inline chat removed content.')));
+export { ACTION_ACCEPT_CHANGES, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js

@@ -1,6 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ListResizeColumnAction } from './listResizeColumnAction.js';
 let ListContext = class ListContext {
     static { this.ID = 'workbench.contrib.listContext'; }
     constructor(contextKeyService) {
@@ -12,4 +14,5 @@ ListContext = ( __decorate([
     ( __param(0, IContextKeyService))
 ], ListContext));
 registerWorkbenchContribution2(ListContext.ID, ListContext, WorkbenchPhase.BlockStartup);
+registerAction2(ListResizeColumnAction);
 export { ListContext };

package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js

@@ -0,0 +1,27 @@
+import { TableColumnResizeQuickPick } from './tableColumnResizeQuickPick.js';
+import { Table } from '../../../../base/browser/ui/table/tableWidget.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchListFocusContextKey } from '../../../../platform/list/browser/listService.js';
+import { IListService } from '../../../../platform/list/browser/listService.service.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { localize } from '../../../../nls.js';
+class ListResizeColumnAction extends Action2 {
+    constructor() {
+        super({
+            id: 'list.resizeColumn',
+            title: { value: ( localize(4609, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(4610, "List")), original: 'List' },
+            precondition: WorkbenchListFocusContextKey,
+            f1: true
+        });
+    }
+    async run(accessor) {
+        const listService = accessor.get(IListService);
+        const instantiationService = accessor.get(IInstantiationService);
+        const list = listService.lastFocusedList;
+        if (list instanceof Table) {
+            await instantiationService.createInstance(TableColumnResizeQuickPick, list).show();
+        }
+    }
+}
+export { ListResizeColumnAction };

package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js

@@ -0,0 +1,54 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
+let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Disposable {
+    constructor(_table, _quickInputService) {
+        super();
+        this._table = _table;
+        this._quickInputService = _quickInputService;
+    }
+    async show() {
+        const items = [];
+        this._table.getColumnLabels().forEach((label, index) => {
+            if (label) {
+                items.push({ label, index });
+            }
+        });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9838, "Select the column to resize, type to filter.")) });
+        if (!column) {
+            return;
+        }
+        const value = await this._quickInputService.input({
+            placeHolder: ( localize(9839, "i.e. 20, 60, 100...")),
+            prompt: ( localize(
+                9840,
+                "Please enter a width in percentage for the '{0}' column.",
+                column.label
+            )),
+            validateInput: (input) => this._validateColumnResizeValue(input)
+        });
+        const percentageValue = value ? Number.parseInt(value) : undefined;
+        if (!percentageValue) {
+            return;
+        }
+        this._table.resizeColumn(column.index, percentageValue);
+    }
+    async _validateColumnResizeValue(input) {
+        const percentage = Number.parseInt(input);
+        if (input && !Number.isInteger(percentage)) {
+            return ( localize(9841, "Please enter an integer."));
+        }
+        else if (percentage < 0 || percentage > 100) {
+            return ( localize(
+                9842,
+                "Please enter a number greater than 0 and less than or equal to 100."
+            ));
+        }
+        return null;
+    }
+};
+TableColumnResizeQuickPick = ( (__decorate([
+    ( (__param(1, IQuickInputService)))
+], TableColumnResizeQuickPick)));
+export { TableColumnResizeQuickPick };

package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js

@@ -1,10 +1,10 @@
 import { hookDomPurifyHrefAndSrcSanitizer, basicMarkupHtmlTags } from '../../../../base/browser/dom.js';
 import { sanitize as sanitize$1 } from '../../../../base/browser/dompurify/dompurify.js';
 import { allowedMarkdownAttr } from '../../../../base/browser/markdownRenderer.js';
-import marked_1 from '../../../../../../../external/vscode-marked/lib/marked.esm.js';
+import { Marked } from 'marked';
 import { Schemas } from '../../../../base/common/network.js';
-import { tokenizeToString } from '../../../../editor/common/languages/textToHtmlTokenizer.js';
 import { escape } from '../../../../base/common/strings.js';
+import { tokenizeToString } from '../../../../editor/common/languages/textToHtmlTokenizer.js';
 const DEFAULT_MARKDOWN_STYLES = `
 body {
 	padding: 10px 20px;
@@ -172,34 +172,104 @@ function sanitize(documentContent, allowUnknownProtocols) {
     }
 }
 async function renderMarkdownDocument(text, extensionService, languageService, options) {
-    const highlight = (code, lang, callback) => {
-        if (!callback) {
-            return code;
-        }
-        if (typeof lang !== 'string') {
-            callback(null, escape(code));
-            return '';
-        }
-        extensionService.whenInstalledExtensionsRegistered().then(async () => {
+    const m = new Marked(MarkedHighlight.markedHighlight({
+        async: true,
+        async highlight(code, lang) {
+            if (typeof lang !== 'string') {
+                return escape(code);
+            }
+            await extensionService.whenInstalledExtensionsRegistered();
             if (options?.token?.isCancellationRequested) {
-                callback(null, '');
-                return;
+                return '';
             }
             const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
-            const html = await tokenizeToString(languageService, code, languageId);
-            callback(null, html);
-        });
-        return '';
+            return tokenizeToString(languageService, code, languageId);
+        }
+    }));
+    const raw = await m.parse(text, { renderer: options?.renderer, async: true });
+    if (options?.shouldSanitize ?? true) {
+        return sanitize(raw, options?.allowUnknownProtocols ?? false);
+    }
+    else {
+        return raw;
+    }
+}
+var MarkedHighlight;
+( (function(MarkedHighlight) {
+    function markedHighlight(options) {
+        if (typeof options === 'function') {
+            options = {
+                highlight: options,
+            };
+        }
+        if (!options || typeof options.highlight !== 'function') {
+            throw ( new Error('Must provide highlight function'));
+        }
+        return {
+            async: !!options.async,
+            walkTokens(token) {
+                if (token.type !== 'code') {
+                    return;
+                }
+                const lang = getLang(token.lang);
+                if (options.async) {
+                    return Promise.resolve(options.highlight(token.text, lang, token.lang || '')).then(updateToken(token));
+                }
+                const code = options.highlight(token.text, lang, token.lang || '');
+                if (code instanceof Promise) {
+                    throw ( new Error(
+                        'markedHighlight is not set to async but the highlight function is async. Set the async option to true on markedHighlight to await the async highlight function.'
+                    ));
+                }
+                updateToken(token)(code);
+            },
+            renderer: {
+                code({ text, lang, escaped }) {
+                    const classAttr = lang
+                        ? ` class="language-${escape(lang)}"`
+                        : '';
+                    text = text.replace(/\n$/, '');
+                    return `<pre><code${classAttr}>${escaped ? text : escape(text, true)}\n</code></pre>`;
+                },
+            },
+        };
+    }
+    MarkedHighlight.markedHighlight = markedHighlight;
+    function getLang(lang) {
+        return (lang || '').match(/\S*/)[0];
+    }
+    function updateToken(token) {
+        return (code) => {
+            if (typeof code === 'string' && code !== token.text) {
+                token.escaped = true;
+                token.text = code;
+            }
+        };
+    }
+    const escapeTest = /[&<>"']/;
+    const escapeReplace = ( new RegExp(escapeTest.source, 'g'));
+    const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
+    const escapeReplaceNoEncode = ( new RegExp(escapeTestNoEncode.source, 'g'));
+    const escapeReplacement = {
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        [`'`]: '&#39;',
     };
-    return ( new Promise((resolve, reject) => {
-        marked_1(text, { highlight, renderer: options?.renderer }, (err, value) => err ? reject(err) : resolve(value));
-    })).then(raw => {
-        if (options?.shouldSanitize ?? true) {
-            return sanitize(raw, options?.allowUnknownProtocols ?? false);
+    const getEscapeReplacement = (ch) => escapeReplacement[ch];
+    function escape(html, encode) {
+        if (encode) {
+            if (escapeTest.test(html)) {
+                return html.replace(escapeReplace, getEscapeReplacement);
+            }
         }
         else {
-            return raw;
+            if (escapeTestNoEncode.test(html)) {
+                return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+            }
         }
-    });
-}
+        return html;
+    }
+})(MarkedHighlight || (MarkedHighlight = {})));
 export { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -73,7 +73,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localize(7873, "Merging: {0}", super.getName()));
+        return ( localize(8025, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -108,12 +108,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                10663,
+                10701,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10664,
+                10702,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -121,12 +121,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(10665, "&&Save With Conflicts")) :
-                        ( localize(10666, "&&Save")),
+                        ( localize(10703, "&&Save With Conflicts")) :
+                        ( localize(10704, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localize(10667, "Do&&n't Save")),
+                    label: ( localize(10705, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ];
@@ -136,16 +136,16 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    10668,
+                    10706,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    10669,
+                    10707,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(10670, "The merge results will be lost if you don't save them."))
-                        : ( localize(10671, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10708, "The merge results will be lost if you don't save them."))
+                        : ( localize(10709, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -170,12 +170,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10672, "Do you want to accept the merge result?")),
+                message: ( localize(10710, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10673,
+                    10711,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10674, '&&Accept Merge'))
+                primaryButton: ( localize(10712, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -200,7 +200,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10675, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10713, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -310,12 +310,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                10676,
+                10714,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10677,
+                10715,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -325,25 +325,25 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        10678,
+                        10716,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        10679,
+                        10717,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(10680, "Your changes will be lost if you don't save them."))
-                        : ( localize(10681, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10718, "Your changes will be lost if you don't save them."))
+                        : ( localize(10719, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(10682, '&&Save with Conflicts'))
-                            : ( localize(10683, '&&Save')),
+                            ? ( localize(10720, '&&Save with Conflicts'))
+                            : ( localize(10721, '&&Save')),
                         run: () => ConfirmResult.SAVE
                     },
                     {
-                        label: ( localize(10684, "Do&&n't Save")),
+                        label: ( localize(10722, "Do&&n't Save")),
                         run: () => ConfirmResult.DONT_SAVE
                     }
                 ],
@@ -356,21 +356,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(10685, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(10723, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    10686,
+                    10724,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(10687, "The files contain unhandled conflicts."))
-                        : ( localize(10688, "The file contains unhandled conflicts."))
+                        ? ( localize(10725, "The files contain unhandled conflicts."))
+                        : ( localize(10726, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(10689, '&&Close with Conflicts'))
-                    : ( localize(10690, '&&Close')),
-                checkbox: { label: ( localize(10691, "Do not ask me again")) }
+                    ? ( localize(10727, '&&Close with Conflicts'))
+                    : ( localize(10728, '&&Close')),
+                checkbox: { label: ( localize(10729, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -385,7 +385,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localize(11380, "Set Input Handled")),
+            label: ( localize(11461, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -600,7 +600,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localize(11381, 'Undo Mark As Handled'));
+        this.label = ( localize(11462, 'Undo Mark As Handled'));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {