@codingame/monaco-vscode-api 17.2.1 → 18.0.1

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -18,17 +18,17 @@ const createCodeActionsAutoSave = (description) => {
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
             ( localize(
-            5111,
+            5231,
             'Triggers Code Actions on explicit saves and auto saves triggered by window or focus changes.'
         )),
-            ( localize(5112, 'Triggers Code Actions only when explicitly saved')),
-            ( localize(5113, 'Never triggers Code Actions on save')),
+            ( localize(5232, 'Triggers Code Actions only when explicitly saved')),
+            ( localize(5233, 'Never triggers Code Actions on save')),
             ( localize(
-            5114,
+            5234,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
         )),
             ( localize(
-            5115,
+            5235,
             'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
         ))
         ],
@@ -41,14 +41,14 @@ const createNotebookCodeActionsAutoSave = (description) => {
         type: ['string', 'boolean'],
         enum: ['explicit', 'never', true, false],
         enumDescriptions: [
-            ( localize(5116, 'Triggers Code Actions only when explicitly saved.')),
-            ( localize(5117, 'Never triggers Code Actions on save.')),
+            ( localize(5236, 'Triggers Code Actions only when explicitly saved.')),
+            ( localize(5237, 'Never triggers Code Actions on save.')),
             ( localize(
-            5118,
+            5238,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
         )),
             ( localize(
-            5119,
+            5239,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
         ))
         ],
@@ -70,7 +70,7 @@ const codeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        5120,
+        5240,
         'Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. When {0} is set to `afterDelay`, Code Actions will only be run when the file is saved explicitly. Example: `"source.organizeImports": "explicit" `',
         '`#files.autoSave#`'
     )),
@@ -102,7 +102,7 @@ const notebookCodeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        5121,
+        5241,
         'Run a series of Code Actions for a notebook on save. Code Actions must be specified and the editor must not be shutting down. When {0} is set to `afterDelay`, Code Actions will only be run when the file is saved explicitly. Example: `"notebook.source.organizeImports": "explicit"`',
         '`#files.autoSave#`'
     )),
@@ -150,12 +150,12 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
         for (const codeActionKind of allProvidedKinds) {
             if (CodeActionKind.Source.contains(codeActionKind) && !properties[codeActionKind.value]) {
                 properties[codeActionKind.value] = createCodeActionsAutoSave(( localize(
-                    5122,
+                    5242,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind.value
                 )));
                 notebookProperties[codeActionKind.value] = createNotebookCodeActionsAutoSave(( localize(
-                    5122,
+                    5242,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind.value
                 )));

package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js

@@ -31,12 +31,12 @@ import { isWindows } from '../../../../../base/common/platform.js';
 var EditorDictation_1;
 registerCss(editorDictation);
 const EDITOR_DICTATION_IN_PROGRESS = ( new RawContextKey('editorDictation.inProgress', false));
-const VOICE_CATEGORY = ( localize2(5125, "Voice"));
+const VOICE_CATEGORY = ( localize2(5245, "Voice"));
 class EditorDictationStartAction extends EditorAction2 {
     constructor() {
         super({
             id: 'workbench.action.editorDictation.start',
-            title: ( localize2(5126, "Start Dictation in Editor")),
+            title: ( localize2(5246, "Start Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: ( ContextKeyExpr.and(HasSpeechProvider, ( SpeechToTextInProgress.toNegated()), (
             EditorContextKeys.readOnly.toNegated()))),
@@ -73,7 +73,7 @@ class EditorDictationStopAction extends EditorAction2 {
     constructor() {
         super({
             id: EditorDictationStopAction.ID,
-            title: ( localize2(5127, "Stop Dictation in Editor")),
+            title: ( localize2(5247, "Stop Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: EDITOR_DICTATION_IN_PROGRESS,
             f1: true,
@@ -98,7 +98,7 @@ class DictationWidget extends Disposable {
         const stopActionKeybinding = keybindingService.lookupKeybinding(EditorDictationStopAction.ID)?.getLabel();
         actionBar.push(toAction({
             id: EditorDictationStopAction.ID,
-            label: stopActionKeybinding ? ( localize(5128, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(5129, "Stop Dictation")),
+            label: stopActionKeybinding ? ( localize(5248, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(5249, "Stop Dictation")),
             class: ThemeIcon.asClassName(Codicon.micFilled),
             run: () => EditorDictation.get(editor)?.stop()
         }), { icon: true, label: false, keybinding: stopActionKeybinding });
@@ -125,7 +125,8 @@ class DictationWidget extends Disposable {
         };
     }
     beforeRender() {
-        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+        const position = this.editor.getPosition();
+        const lineHeight = position ? this.editor.getLineHeightForPosition(position) : this.editor.getOption(EditorOption.lineHeight);
         const width = this.editor.getLayoutInfo().contentWidth * 0.7;
         this.domNode.style.setProperty('--vscode-editor-dictation-widget-height', `${lineHeight}px`);
         this.domNode.style.setProperty('--vscode-editor-dictation-widget-width', `${width}px`);

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js

@@ -31,19 +31,19 @@ class DiffEditorAccessibilityHelp {
             return;
         }
         const switchSides = ( localize(
-            5130,
+            5250,
             "Run the command Diff Editor: Switch Side{0} to toggle between the original and modified editors.",
             '<keybinding:diffEditor.switchSide>'
         ));
         const diffEditorActiveAnnouncement = ( localize(
-            5131,
+            5251,
             "The setting, accessibility.verbosity.diffEditorActive, controls if a diff editor announcement is made when it becomes the active editor."
         ));
         const keys = ['accessibility.signals.diffLineDeleted', 'accessibility.signals.diffLineInserted', 'accessibility.signals.diffLineModified'];
         const content = [
-            ( localize(5132, "You are in a diff editor.")),
+            ( localize(5252, "You are in a diff editor.")),
             ( localize(
-            5133,
+            5253,
             "View the next{0} or previous{1} diff in diff review mode, which is optimized for screen readers.",
             '<keybinding:' + AccessibleDiffViewerNext.id + '>',
             '<keybinding:' + AccessibleDiffViewerPrev.id + '>'
@@ -51,7 +51,7 @@ class DiffEditorAccessibilityHelp {
             switchSides,
             diffEditorActiveAnnouncement,
             ( localize(
-            5134,
+            5254,
             "To control which accessibility signals should be played, the following settings can be configured: {0}.",
             keys.join(', ')
         )),

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -15,8 +15,8 @@ import { FloatingEditorClickWidget } from '../../../browser/codeeditor.js';
 import { Extensions } from '../../../common/configuration.js';
 import { DiffEditorAccessibilityHelp } from './diffEditorAccessibilityHelp.js';
 import Severity$1 from '../../../../base/common/severity.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { autorunWithStore } from '../../../../base/common/observableInternal/reactions/autorun.js';
 
 let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Disposable {
     static { this.ID = 'editor.contrib.diffEditorHelper'; }
@@ -32,7 +32,7 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
             const onlyWhiteSpaceChange = ( computationResult.map(r => r && !r.identical && r.changes2.length === 0));
             this._register(autorunWithStore((reader, store) => {
                 if (onlyWhiteSpaceChange.read(reader)) {
-                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localize(5135, "Show Whitespace Differences")), null));
+                    const helperWidget = store.add(this._instantiationService.createInstance(FloatingEditorClickWidget, this._diffEditor.getModifiedEditor(), ( localize(5255, "Show Whitespace Differences")), null));
                     store.add(helperWidget.onClick(() => {
                         this._textResourceConfigurationService.updateValue(this._diffEditor.getModel().modified.uri, 'diffEditor.ignoreTrimWhitespace', false);
                     }));
@@ -43,11 +43,11 @@ let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Di
                 const diffComputationResult = this._diffEditor.getDiffComputationResult();
                 if (diffComputationResult && diffComputationResult.quitEarly) {
                     this._notificationService.prompt(Severity$1.Warning, ( localize(
-                        5136,
+                        5256,
                         "The diff algorithm was stopped early (after {0} ms.)",
                         this._diffEditor.maxComputationTime
                     )), [{
-                            label: ( localize(5137, "Remove Limit")),
+                            label: ( localize(5257, "Remove Limit")),
                             run: () => {
                                 this._textResourceConfigurationService.updateValue(this._diffEditor.getModel().modified.uri, 'diffEditor.maxComputationTime', 0);
                             }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js

@@ -26,16 +26,16 @@ let LargeFileOptimizationsWarner = class LargeFileOptimizationsWarner extends Di
         }
         if (model.isTooLargeForTokenization()) {
             const message = ( localize(
-                5156,
+                5276,
                 "{0}: tokenization, wrapping, folding, codelens, word highlighting and sticky scroll have been turned off for this large file in order to reduce memory usage and avoid freezing or crashing.",
                 basename(model.uri.path)
             ));
             this._notificationService.prompt(Severity$1.Info, message, [
                 {
-                    label: ( localize(5157, "Forcefully Enable Features")),
+                    label: ( localize(5277, "Forcefully Enable Features")),
                     run: () => {
                         this._configurationService.updateValue(`editor.largeFileOptimizations`, false).then(() => {
-                            this._notificationService.info(( localize(5158, "Please reopen file in order for this setting to take effect.")));
+                            this._notificationService.info(( localize(5278, "Please reopen file in order for this setting to take effect.")));
                         }, (err) => {
                             this._notificationService.error(err);
                         });

package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js

@@ -192,7 +192,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         const nestedProgress = ( new Progress(provider => {
             progress.report({
                 message: ( localize(
-                    5173,
+                    5293,
                     "Running '{0}' Formatter ([configure]({1})).",
                     provider.displayName || provider.extensionId && provider.extensionId.value || '???',
                     'command:workbench.action.openSettings?%5B%22editor.formatOnSave%22%5D'
@@ -301,7 +301,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             : ( ( Object.keys(setting))
                 .filter(x => setting[x] === 'never' || false)
                 .map(x => ( new HierarchicalKind(x))));
-        progress.report({ message: ( localize(5174, "Quick Fixes")) });
+        progress.report({ message: ( localize(5294, "Quick Fixes")) });
         const filteredSaveList = Array.isArray(setting) ? codeActionsOnSave : codeActionsOnSave.filter(x => setting[x.value] === 'always' || ((setting[x.value] === 'explicit' || setting[x.value] === true) && context.reason === SaveReason.EXPLICIT));
         await this.applyOnSaveActions(textEditorModel, filteredSaveList, excludedActions, progress, token);
     }
@@ -319,7 +319,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             _report() {
                 progress.report({
                     message: ( localize(
-                        5175,
+                        5295,
                         "Getting code actions from {0} ([configure]({1})).",
                         ( [...this._names].map(name => `'${name}'`)).join(', '),
                         'command:workbench.action.openSettings?%5B%22editor.codeActionsOnSave%22%5D'
@@ -341,7 +341,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             }
             try {
                 for (const action of actionsToRun.validActions) {
-                    progress.report({ message: ( localize(5176, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(5296, "Applying code action '{0}'.", action.action.title)) });
                     await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js

@@ -11,8 +11,8 @@ class ToggleMinimapAction extends Action2 {
         super({
             id: ToggleMinimapAction.ID,
             title: {
-                ...( localize2(5177, "Toggle Minimap")),
-                mnemonicTitle: ( localize(5178, "&&Minimap")),
+                ...( localize2(5297, "Toggle Minimap")),
+                mnemonicTitle: ( localize(5298, "&&Minimap")),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js

@@ -17,7 +17,7 @@ class ToggleMultiCursorModifierAction extends Action2 {
     constructor() {
         super({
             id: ToggleMultiCursorModifierAction.ID,
-            title: ( localize2(5179, 'Toggle Multi-Cursor Modifier')),
+            title: ( localize2(5299, 'Toggle Multi-Cursor Modifier')),
             f1: true
         });
     }
@@ -57,7 +57,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     group: '4_config',
     command: {
         id: ToggleMultiCursorModifierAction.ID,
-        title: ( localize(5180, "Switch to Alt+Click for Multi-Cursor"))
+        title: ( localize(5300, "Switch to Alt+Click for Multi-Cursor"))
     },
     when: ( multiCursorModifier.isEqualTo('ctrlCmd')),
     order: 1
@@ -67,8 +67,8 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     command: {
         id: ToggleMultiCursorModifierAction.ID,
         title: (isMacintosh
-            ? ( localize(5181, "Switch to Cmd+Click for Multi-Cursor"))
-            : ( localize(5182, "Switch to Ctrl+Click for Multi-Cursor")))
+            ? ( localize(5301, "Switch to Cmd+Click for Multi-Cursor"))
+            : ( localize(5302, "Switch to Ctrl+Click for Multi-Cursor")))
     },
     when: ( multiCursorModifier.isEqualTo('altKey')),
     order: 1

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js

@@ -11,8 +11,8 @@ class ToggleRenderControlCharacterAction extends Action2 {
         super({
             id: ToggleRenderControlCharacterAction.ID,
             title: {
-                ...( localize2(5183, "Toggle Control Characters")),
-                mnemonicTitle: ( localize(5184, "Render &&Control Characters")),
+                ...( localize2(5303, "Toggle Control Characters")),
+                mnemonicTitle: ( localize(5304, "Render &&Control Characters")),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js

@@ -11,8 +11,8 @@ class ToggleRenderWhitespaceAction extends Action2 {
         super({
             id: ToggleRenderWhitespaceAction.ID,
             title: {
-                ...( localize2(5185, "Toggle Render Whitespace")),
-                mnemonicTitle: ( localize(5186, "&&Render Whitespace")),
+                ...( localize2(5305, "Toggle Render Whitespace")),
+                mnemonicTitle: ( localize(5306, "&&Render Whitespace")),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -24,7 +24,7 @@ const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
 const isDominatedByLongLinesKey = 'isDominatedByLongLines';
 const CAN_TOGGLE_WORD_WRAP = ( new RawContextKey('canToggleWordWrap', false, true));
-const EDITOR_WORD_WRAP = ( new RawContextKey('editorWordWrap', false, ( localize(5187, 'Whether the editor is currently using word wrapping.'))));
+const EDITOR_WORD_WRAP = ( new RawContextKey('editorWordWrap', false, ( localize(5307, 'Whether the editor is currently using word wrapping.'))));
 function writeTransientState(model, state, codeEditorService) {
     codeEditorService.setTransientModelProperty(model, transientWordWrapState, state);
 }
@@ -36,7 +36,7 @@ class ToggleWordWrapAction extends EditorAction {
     constructor() {
         super({
             id: TOGGLE_WORD_WRAP_ID,
-            label: ( localize2(5188, "View: Toggle Word Wrap")),
+            label: ( localize2(5308, "View: Toggle Word Wrap")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -242,7 +242,7 @@ registerEditorAction(ToggleWordWrapAction);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(5189, "Disable wrapping for this file")),
+        title: ( localize(5309, "Disable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -252,7 +252,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(5190, "Enable wrapping for this file")),
+        title: ( localize(5310, "Enable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -262,7 +262,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(5191, "&&Word Wrap")),
+        title: ( localize(5311, "&&Word Wrap")),
         toggled: EDITOR_WORD_WRAP,
         precondition: CAN_TOGGLE_WORD_WRAP
     },

package/vscode/src/vs/workbench/contrib/comments/browser/commentService.service.d.ts

@@ -3,7 +3,7 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
 import { Range, IRange } from "../../../../editor/common/core/range.js";
 import { CommentThread, CommentingRanges, CommentThreadChangedEvent, CommentingRangeResourceHint, Comment, CommentReaction, PendingCommentThread } from "../../../../editor/common/languages.js";
-import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { ICommentThreadChangedEvent } from "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common/vscode/vs/workbench/contrib/comments/common/commentModel";
 import { CommentMenus } from "@codingame/monaco-vscode-comments-service-override/vscode/vs/workbench/contrib/comments/browser/commentMenus";
 import { IResourceCommentThreadEvent, IWorkspaceCommentThreadsEvent, INotebookCommentThreadChangedEvent, ICommentController, ICommentInfo, INotebookCommentInfo, IContinueOnCommentProvider } from "@codingame/monaco-vscode-comments-service-override/vscode/vs/workbench/contrib/comments/browser/commentService";

package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js

@@ -13,52 +13,52 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 var CommentAccessibilityHelpNLS;
 (function (CommentAccessibilityHelpNLS) {
     CommentAccessibilityHelpNLS.intro = ( localize(
-        5311,
+        5431,
         "The editor contains commentable range(s). Some useful commands include:"
     ));
     CommentAccessibilityHelpNLS.tabFocus = ( localize(
-        5312,
+        5432,
         "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus{0}.",
         `<keybinding:${ToggleTabFocusModeAction.ID}>`
     ));
-    CommentAccessibilityHelpNLS.commentCommands = ( localize(5313, "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( localize(5314, "- Dismiss Comment (Escape)"));
+    CommentAccessibilityHelpNLS.commentCommands = ( localize(5433, "Some useful comment commands include:"));
+    CommentAccessibilityHelpNLS.escape = ( localize(5434, "- Dismiss Comment (Escape)"));
     CommentAccessibilityHelpNLS.nextRange = ( localize(
-        5315,
+        5435,
         "- Go to Next Commenting Range{0}.",
         `<keybinding:${CommentCommandId.NextRange}>`
     ));
     CommentAccessibilityHelpNLS.previousRange = ( localize(
-        5316,
+        5436,
         "- Go to Previous Commenting Range{0}.",
         `<keybinding:${CommentCommandId.PreviousRange}>`
     ));
     CommentAccessibilityHelpNLS.nextCommentThread = ( localize(
-        5317,
+        5437,
         "- Go to Next Comment Thread{0}.",
         `<keybinding:${CommentCommandId.NextThread}>`
     ));
     CommentAccessibilityHelpNLS.previousCommentThread = ( localize(
-        5318,
+        5438,
         "- Go to Previous Comment Thread{0}.",
         `<keybinding:${CommentCommandId.PreviousThread}>`
     ));
     CommentAccessibilityHelpNLS.nextCommentedRange = ( localize(
-        5319,
+        5439,
         "- Go to Next Commented Range{0}.",
         `<keybinding:${CommentCommandId.NextCommentedRange}>`
     ));
     CommentAccessibilityHelpNLS.previousCommentedRange = ( localize(
-        5320,
+        5440,
         "- Go to Previous Commented Range{0}.",
         `<keybinding:${CommentCommandId.PreviousCommentedRange}>`
     ));
     CommentAccessibilityHelpNLS.addComment = ( localize(
-        5321,
+        5441,
         "- Add Comment on Current Selection{0}.",
         `<keybinding:${CommentCommandId.Add}>`
     ));
-    CommentAccessibilityHelpNLS.submitComment = ( localize(5322, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
+    CommentAccessibilityHelpNLS.submitComment = ( localize(5442, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}));
 class CommentsAccessibilityHelpProvider extends Disposable {
     constructor() {

package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js

@@ -5,20 +5,20 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 var CommentContextKeys;
 (function (CommentContextKeys) {
     CommentContextKeys.activeCursorHasCommentingRange = ( new RawContextKey('activeCursorHasCommentingRange', false, {
-        description: ( localize(5388, "Whether the position at the active cursor has a commenting range")),
+        description: ( localize(5508, "Whether the position at the active cursor has a commenting range")),
         type: 'boolean'
     }));
     CommentContextKeys.activeCursorHasComment = ( new RawContextKey('activeCursorHasComment', false, {
-        description: ( localize(5389, "Whether the position at the active cursor has a comment")),
+        description: ( localize(5509, "Whether the position at the active cursor has a comment")),
         type: 'boolean'
     }));
     CommentContextKeys.activeEditorHasCommentingRange = ( new RawContextKey('activeEditorHasCommentingRange', false, {
-        description: ( localize(5390, "Whether the active editor has a commenting range")),
+        description: ( localize(5510, "Whether the active editor has a commenting range")),
         type: 'boolean'
     }));
     CommentContextKeys.WorkspaceHasCommenting = ( new RawContextKey('workspaceHasCommenting', false, {
         description: ( localize(
-         5391,
+         5511,
          "Whether the open workspace has either comments or commenting ranges."
         )),
         type: 'boolean'
@@ -26,19 +26,19 @@ var CommentContextKeys;
     CommentContextKeys.commentThreadIsEmpty = ( new RawContextKey(
      'commentThreadIsEmpty',
      false,
-     { type: 'boolean', description: ( localize(5392, "Set when the comment thread has no comments")) }
+     { type: 'boolean', description: ( localize(5512, "Set when the comment thread has no comments")) }
     ));
-    CommentContextKeys.commentIsEmpty = ( new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( localize(5393, "Set when the comment has no input")) }));
-    CommentContextKeys.commentContext = ( new RawContextKey('comment', undefined, { type: 'string', description: ( localize(5394, "The context value of the comment")) }));
-    CommentContextKeys.commentThreadContext = ( new RawContextKey('commentThread', undefined, { type: 'string', description: ( localize(5395, "The context value of the comment thread")) }));
+    CommentContextKeys.commentIsEmpty = ( new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( localize(5513, "Set when the comment has no input")) }));
+    CommentContextKeys.commentContext = ( new RawContextKey('comment', undefined, { type: 'string', description: ( localize(5514, "The context value of the comment")) }));
+    CommentContextKeys.commentThreadContext = ( new RawContextKey('commentThread', undefined, { type: 'string', description: ( localize(5515, "The context value of the comment thread")) }));
     CommentContextKeys.commentControllerContext = ( new RawContextKey(
      'commentController',
      undefined,
-     { type: 'string', description: ( localize(5396, "The comment controller id associated with a comment thread")) }
+     { type: 'string', description: ( localize(5516, "The comment controller id associated with a comment thread")) }
     ));
-    CommentContextKeys.commentFocused = ( new RawContextKey('commentFocused', false, { type: 'boolean', description: ( localize(5397, "Set when the comment is focused")) }));
+    CommentContextKeys.commentFocused = ( new RawContextKey('commentFocused', false, { type: 'boolean', description: ( localize(5517, "Set when the comment is focused")) }));
     CommentContextKeys.commentingEnabled = ( new RawContextKey('commentingEnabled', true, {
-        description: ( localize(5398, "Whether commenting functionality is enabled")),
+        description: ( localize(5518, "Whether commenting functionality is enabled")),
         type: 'boolean'
     }));
 })(CommentContextKeys || (CommentContextKeys = {}));

package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js

@@ -63,7 +63,7 @@ class AbstractDebugAdapter {
                         request_seq: request.seq,
                         success: false,
                         command,
-                        message: ( localize(5987, "Timeout after {0} ms for '{1}'", timeout, command))
+                        message: ( localize(6108, "Timeout after {0} ms for '{1}'", timeout, command))
                     };
                     clb(err);
                 }

package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts

@@ -593,6 +593,7 @@ export interface IDebugConfiguration {
         collapseIdenticalLines: boolean;
         historySuggestions: boolean;
         acceptSuggestionOnEnter: "off" | "on";
+        maximumLines: number;
     };
     focusWindowOnBreak: boolean;
     focusEditorOnBreak: boolean;