@codingame/monaco-vscode-api 17.2.0 → 18.0.0

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js

@@ -22,7 +22,7 @@ import { ProgressLocation } from '../../../../platform/progress/common/progress.
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { ClipboardEventUtils } from '../../../browser/controller/editContext/clipboardUtils.js';
-import { toVSDataTransfer, toExternalVSDataTransfer } from '../../../browser/dnd.js';
+import { toVSDataTransfer, toExternalVSDataTransfer } from '../../../browser/dataTransfer.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.service.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
@@ -39,7 +39,7 @@ import { PostEditWidgetManager } from './postEditWidget.js';
 var CopyPasteController_1;
 const changePasteTypeCommandId = 'editor.changePasteType';
 const pasteAsPreferenceConfig = 'editor.pasteAs.preferences';
-const pasteWidgetVisibleCtx = ( new RawContextKey('pasteWidgetVisible', false, ( localize(980, "Whether the paste widget is showing"))));
+const pasteWidgetVisibleCtx = ( new RawContextKey('pasteWidgetVisible', false, ( localize(983, "Whether the paste widget is showing"))));
 const vscodeClipboardMime = 'application/vnd.code.copymetadata';
 let CopyPasteController = class CopyPasteController extends Disposable {
     static { CopyPasteController_1 = this; }
@@ -65,16 +65,16 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         this._register(addDisposableListener(container, 'cut', e => this.handleCopy(e)));
         this._register(addDisposableListener(container, 'paste', e => this.handlePaste(e), true));
         this._pasteProgressManager = this._register(( new InlineProgressManager('pasteIntoEditor', editor, instantiationService)));
-        this._postPasteWidgetManager = this._register(instantiationService.createInstance(PostEditWidgetManager, 'pasteIntoEditor', editor, pasteWidgetVisibleCtx, { id: changePasteTypeCommandId, label: ( localize(981, "Show paste options...")) }, () => CopyPasteController_1._configureDefaultAction ? [CopyPasteController_1._configureDefaultAction] : []));
+        this._postPasteWidgetManager = this._register(instantiationService.createInstance(PostEditWidgetManager, 'pasteIntoEditor', editor, pasteWidgetVisibleCtx, { id: changePasteTypeCommandId, label: ( localize(984, "Show paste options...")) }, () => CopyPasteController_1._configureDefaultAction ? [CopyPasteController_1._configureDefaultAction] : []));
     }
     changePasteType() {
         this._postPasteWidgetManager.tryShowSelector();
     }
-    pasteAs(preferred) {
+    async pasteAs(preferred) {
         this._editor.focus();
         try {
             this._pasteAsActionContext = { preferred };
-            this._commandService.executeCommand('editor.action.clipboardPasteAction');
+            await this._commandService.executeCommand('editor.action.clipboardPasteAction');
         }
         finally {
             this._pasteAsActionContext = undefined;
@@ -210,9 +210,9 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         const kindLabel = 'only' in preference
             ? preference.only.value
             : 'preferences' in preference
-                ? (preference.preferences.length ? ( preference.preferences.map(preference => preference.value)).join(', ') : ( localize(982, "empty")))
+                ? (preference.preferences.length ? ( preference.preferences.map(preference => preference.value)).join(', ') : ( localize(985, "empty")))
                 : preference.providerId;
-        MessageController.get(this._editor)?.showMessage(( localize(983, "No paste edits for '{0}' found", kindLabel)), selections[0].getStartPosition());
+        MessageController.get(this._editor)?.showMessage(( localize(986, "No paste edits for '{0}' found", kindLabel)), selections[0].getStartPosition());
     }
     doPasteInline(allProviders, selections, dataTransfer, metadata, clipboardEvent) {
         const editor = this._editor;
@@ -264,7 +264,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                         }
                         const resolveP = edit.provider.resolveDocumentPasteEdit(edit, resolveToken);
                         const showP = ( new DeferredPromise());
-                        const resolved = await this._pasteProgressManager.showWhile(selections[0].getEndPosition(), ( localize(984, "Resolving paste edit for '{0}'. Click to cancel", edit.title)), raceCancellation(Promise.race([showP.p, resolveP]), resolveToken), {
+                        const resolved = await this._pasteProgressManager.showWhile(selections[0].getEndPosition(), ( localize(987, "Resolving paste edit for '{0}'. Click to cancel", edit.title)), raceCancellation(Promise.race([showP.p, resolveP]), resolveToken), {
                             cancel: () => showP.cancel()
                         }, 0);
                         if (resolved) {
@@ -283,7 +283,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                 }
             }
         });
-        this._pasteProgressManager.showWhile(selections[0].getEndPosition(), ( localize(985, "Running paste handlers. Click to cancel and do basic paste")), p, {
+        this._pasteProgressManager.showWhile(selections[0].getEndPosition(), ( localize(988, "Running paste handlers. Click to cancel and do basic paste")), p, {
             cancel: async () => {
                 try {
                     p.cancel();
@@ -361,7 +361,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                 else {
                     const configureDefaultItem = {
                         id: 'editor.pasteAs.default',
-                        label: ( localize(986, "Configure default paste action")),
+                        label: ( localize(989, "Configure default paste action")),
                         edit: undefined,
                     };
                     const selected = await this._quickInputService.pick([
@@ -378,7 +378,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                             }
                         ] : [])
                     ], {
-                        placeHolder: ( localize(987, "Select Paste Action")),
+                        placeHolder: ( localize(990, "Select Paste Action")),
                     });
                     if (selected === configureDefaultItem) {
                         CopyPasteController_1._configureDefaultAction?.run();
@@ -401,7 +401,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         });
         this._progressService.withProgress({
             location: ProgressLocation.Window,
-            title: ( localize(988, "Running paste handlers")),
+            title: ( localize(991, "Running paste handlers")),
         }, () => p);
     }
     setCopyMetadata(dataTransfer, metadata) {

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js

@@ -60,7 +60,7 @@ class DefaultTextPasteOrDropEditProvider extends SimplePasteAndDropProvider {
         const insertText = await textEntry.asString();
         return {
             handledMimeType: Mimes.text,
-            title: ( localize(989, "Insert Plain Text")),
+            title: ( localize(992, "Insert Plain Text")),
             insertText,
             kind: this.kind,
         };
@@ -92,13 +92,13 @@ class PathProvider extends SimplePasteAndDropProvider {
         let label;
         if (uriCount > 0) {
             label = entries.length > 1
-                ? ( localize(990, "Insert Uris"))
-                : ( localize(991, "Insert Uri"));
+                ? ( localize(993, "Insert Uris"))
+                : ( localize(994, "Insert Uri"));
         }
         else {
             label = entries.length > 1
-                ? ( localize(992, "Insert Paths"))
-                : ( localize(993, "Insert Path"));
+                ? ( localize(995, "Insert Paths"))
+                : ( localize(996, "Insert Path"));
         }
         return {
             handledMimeType: Mimes.uriList,
@@ -131,8 +131,8 @@ let RelativePathProvider = class RelativePathProvider extends SimplePasteAndDrop
             handledMimeType: Mimes.uriList,
             insertText: relativeUris.join(' '),
             title: entries.length > 1
-                ? ( localize(994, "Insert Relative Paths"))
-                : ( localize(995, "Insert Relative Path")),
+                ? ( localize(997, "Insert Relative Paths"))
+                : ( localize(998, "Insert Relative Path")),
             kind: this.kind,
         };
     }
@@ -162,7 +162,7 @@ class PasteHtmlProvider {
             edits: [{
                     insertText: htmlText,
                     yieldTo: this._yieldTo,
-                    title: ( localize(996, 'Insert HTML')),
+                    title: ( localize(999, 'Insert HTML')),
                     kind: this.kind,
                 }],
         };

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js

@@ -11,7 +11,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { toExternalVSDataTransfer } from '../../../browser/dnd.js';
+import { toExternalVSDataTransfer } from '../../../browser/dataTransfer.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
@@ -25,7 +25,7 @@ import { PostEditWidgetManager } from './postEditWidget.js';
 var DropIntoEditorController_1;
 const dropAsPreferenceConfig = 'editor.dropIntoEditor.preferences';
 const changeDropTypeCommandId = 'editor.changeDropType';
-const dropWidgetVisibleCtx = ( new RawContextKey('dropWidgetVisible', false, ( localize(997, "Whether the drop widget is showing"))));
+const dropWidgetVisibleCtx = ( new RawContextKey('dropWidgetVisible', false, ( localize(1000, "Whether the drop widget is showing"))));
 let DropIntoEditorController = class DropIntoEditorController extends Disposable {
     static { DropIntoEditorController_1 = this; }
     static { this.ID = 'editor.contrib.dropIntoEditorController'; }
@@ -42,7 +42,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
         this._treeViewsDragAndDropService = _treeViewsDragAndDropService;
         this.treeItemsTransfer = LocalSelectionTransfer.getInstance();
         this._dropProgressManager = this._register(instantiationService.createInstance(InlineProgressManager, 'dropIntoEditor', editor));
-        this._postDropWidgetManager = this._register(instantiationService.createInstance(PostEditWidgetManager, 'dropIntoEditor', editor, dropWidgetVisibleCtx, { id: changeDropTypeCommandId, label: ( localize(998, "Show drop options...")) }, () => DropIntoEditorController_1._configureDefaultAction ? [DropIntoEditorController_1._configureDefaultAction] : []));
+        this._postDropWidgetManager = this._register(instantiationService.createInstance(PostEditWidgetManager, 'dropIntoEditor', editor, dropWidgetVisibleCtx, { id: changeDropTypeCommandId, label: ( localize(1001, "Show drop options...")) }, () => DropIntoEditorController_1._configureDefaultAction ? [DropIntoEditorController_1._configureDefaultAction] : []));
         this._register(editor.onDropIntoEditor(e => this.onDropIntoEditor(editor, e.position, e.event)));
     }
     clearWidgets() {
@@ -95,7 +95,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
                 }
             }
         });
-        this._dropProgressManager.showWhile(position, ( localize(999, "Running drop handlers. Click to cancel")), p, { cancel: () => p.cancel() });
+        this._dropProgressManager.showWhile(position, ( localize(1002, "Running drop handlers. Click to cancel")), p, { cancel: () => p.cancel() });
         DropIntoEditorController_1._currentDropOperation = p;
     }
     async getDropEdits(providers, model, position, dataTransfer, token) {

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js

@@ -162,7 +162,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
             resolvedEdit = await raceCancellationError(resolve(edit, editorStateCts.token), editorStateCts.token);
         }
         catch (e) {
-            return handleError(e, ( localize(1000, "Error resolving edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
+            return handleError(e, ( localize(1003, "Error resolving edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
         }
         finally {
             editorStateCts.dispose();
@@ -184,7 +184,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
             editRange = model.getDecorationRange(editTrackingDecoration[0]);
         }
         catch (e) {
-            return handleError(e, ( localize(1001, "Error applying edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
+            return handleError(e, ( localize(1004, "Error applying edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
         }
         finally {
             model.deltaDecorations(editTrackingDecoration, []);

package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js

@@ -11,7 +11,7 @@ import { localize } from '../../../../nls.js';
 import { IEditorCancellationTokens } from './keybindingCancellation.service.js';
 
 const ctxCancellableOperation = ( new RawContextKey('cancellableOperation', false, ( localize(
-    1002,
+    1005,
     'Whether the editor runs a cancellable operation, e.g. like \'Peek References\''
 ))));
 class EditorCancellationTokens {

package/vscode/src/vs/editor/contrib/find/browser/findController.js

@@ -309,7 +309,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     replaceAll() {
         if (this._model) {
             if (this._editor.getModel()?.isTooLargeForHeapOperation()) {
-                this._notificationService.warn(( localize(1003, "The file is too large to perform a replace all operation.")));
+                this._notificationService.warn(( localize(1006, "The file is too large to perform a replace all operation.")));
                 return false;
             }
             this._model.replaceAll();
@@ -431,7 +431,7 @@ FindController = ( __decorate([
 ], FindController));
 const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindAction,
-    label: ( localize2(1004, "Find")),
+    label: ( localize2(1007, "Find")),
     precondition: ( ContextKeyExpr.or(EditorContextKeys.focus, ( ContextKeyExpr.has('editorIsOpen')))),
     kbOpts: {
         kbExpr: null,
@@ -441,7 +441,7 @@ const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1005, "&&Find")),
+        title: ( localize(1008, "&&Find")),
         order: 1
     }
 })));
@@ -482,7 +482,7 @@ class StartFindWithArgsAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithArgs,
-            label: ( localize2(1006, "Find with Arguments")),
+            label: ( localize2(1009, "Find with Arguments")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -522,7 +522,7 @@ class StartFindWithSelectionAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithSelection,
-            label: ( localize2(1007, "Find with Selection")),
+            label: ( localize2(1010, "Find with Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -573,7 +573,7 @@ class NextMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextMatchFindAction,
-            label: ( localize2(1008, "Find Next")),
+            label: ( localize2(1011, "Find Next")),
             precondition: undefined,
             kbOpts: [{
                     kbExpr: EditorContextKeys.focus,
@@ -600,7 +600,7 @@ class PreviousMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousMatchFindAction,
-            label: ( localize2(1009, "Find Previous")),
+            label: ( localize2(1012, "Find Previous")),
             precondition: undefined,
             kbOpts: [{
                     kbExpr: EditorContextKeys.focus,
@@ -623,7 +623,7 @@ class MoveToMatchFindAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.GoToMatchFindAction,
-            label: ( localize2(1010, "Go to Match...")),
+            label: ( localize2(1013, "Go to Match...")),
             precondition: CONTEXT_FIND_WIDGET_VISIBLE
         });
         this._highlightDecorations = [];
@@ -638,7 +638,7 @@ class MoveToMatchFindAction extends EditorAction {
             const notificationService = accessor.get(INotificationService);
             notificationService.notify({
                 severity: Severity$1.Warning,
-                message: ( localize(1011, "No matches. Try searching for something else."))
+                message: ( localize(1014, "No matches. Try searching for something else."))
             });
             return;
         }
@@ -646,7 +646,7 @@ class MoveToMatchFindAction extends EditorAction {
         const disposables = ( new DisposableStore());
         const inputBox = disposables.add(quickInputService.createInputBox());
         inputBox.placeholder = ( localize(
-            1012,
+            1015,
             "Type a number to go to a specific match (between 1 and {0})",
             matchesCount
         ));
@@ -676,7 +676,7 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1013,
+                    1016,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -694,7 +694,7 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1013,
+                    1016,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -765,7 +765,7 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextSelectionMatchFindAction,
-            label: ( localize2(1014, "Find Next Selection")),
+            label: ( localize2(1017, "Find Next Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
@@ -782,7 +782,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousSelectionMatchFindAction,
-            label: ( localize2(1015, "Find Previous Selection")),
+            label: ( localize2(1018, "Find Previous Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
@@ -797,7 +797,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 }
 const StartFindReplaceAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindReplaceAction,
-    label: ( localize2(1016, "Replace")),
+    label: ( localize2(1019, "Replace")),
     precondition: ( ContextKeyExpr.or(EditorContextKeys.focus, ( ContextKeyExpr.has('editorIsOpen')))),
     kbOpts: {
         kbExpr: null,
@@ -808,7 +808,7 @@ const StartFindReplaceAction = registerMultiEditorAction(( new MultiEditorAction
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1017, "&&Replace")),
+        title: ( localize(1020, "&&Replace")),
         order: 2
     }
 })));

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -41,32 +41,32 @@ import { defaultToggleStyles, defaultInputBoxStyles } from '../../../../platform
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
 registerCss(findWidget);
-const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(1018, 'Icon to indicate that the editor find widget is collapsed.')));
-const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(1019, 'Icon to indicate that the editor find widget is expanded.')));
-const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(1020, 'Icon for \'Find in Selection\' in the editor find widget.')));
-const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(1021, 'Icon for \'Replace\' in the editor find widget.')));
-const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(1022, 'Icon for \'Replace All\' in the editor find widget.')));
-const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(1023, 'Icon for \'Find Previous\' in the editor find widget.')));
-const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(1024, 'Icon for \'Find Next\' in the editor find widget.')));
-const NLS_FIND_DIALOG_LABEL = ( localize(1025, "Find / Replace"));
-const NLS_FIND_INPUT_LABEL = ( localize(1026, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1027, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1028, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1029, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1030, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(1031, "Close"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(1032, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1033, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(1034, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1035, "Replace All"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1036, "Toggle Replace"));
+const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(1021, 'Icon to indicate that the editor find widget is collapsed.')));
+const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(1022, 'Icon to indicate that the editor find widget is expanded.')));
+const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(1023, 'Icon for \'Find in Selection\' in the editor find widget.')));
+const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(1024, 'Icon for \'Replace\' in the editor find widget.')));
+const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(1025, 'Icon for \'Replace All\' in the editor find widget.')));
+const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(1026, 'Icon for \'Find Previous\' in the editor find widget.')));
+const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(1027, 'Icon for \'Find Next\' in the editor find widget.')));
+const NLS_FIND_DIALOG_LABEL = ( localize(1028, "Find / Replace"));
+const NLS_FIND_INPUT_LABEL = ( localize(1029, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1030, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1031, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1032, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1033, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(1034, "Close"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(1035, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1036, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(1037, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1038, "Replace All"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1039, "Toggle Replace"));
 const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localize(
-    1037,
+    1040,
     "Only the first {0} results are highlighted, but all find operations work on the entire text.",
     MATCHES_LIMIT
 ));
-const NLS_MATCHES_LOCATION = ( localize(1038, "{0} of {1}"));
-const NLS_NO_RESULTS = ( localize(1039, "No results"));
+const NLS_MATCHES_LOCATION = ( localize(1041, "{0} of {1}"));
+const NLS_NO_RESULTS = ( localize(1042, "No results"));
 const FIND_WIDGET_INITIAL_WIDTH = 419;
 const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
@@ -336,12 +336,12 @@ class FindWidget extends Widget {
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(1040, "{0} found", label))
-                : ( localize(1041, "{0} found for '{1}'", label, searchString));
+                ? ( localize(1043, "{0} found", label))
+                : ( localize(1044, "{0} found for '{1}'", label, searchString));
         }
         if (currentMatch) {
             const ariaLabel = ( localize(
-                1042,
+                1045,
                 "{0} found for '{1}', at {2}",
                 label,
                 searchString,
@@ -354,7 +354,7 @@ class FindWidget extends Widget {
             }
             return ariaLabel;
         }
-        return localize(1043, "{0} found for '{1}'", label, searchString);
+        return localize(1046, "{0} found for '{1}'", label, searchString);
     }
     _updateToggleSelectionFindButton() {
         const selection = this._codeEditor.getSelection();
@@ -758,9 +758,14 @@ class FindWidget extends Widget {
         this._findInput.setRegex(!!this._state.isRegex);
         this._findInput.setCaseSensitive(!!this._state.matchCase);
         this._findInput.setWholeWords(!!this._state.wholeWord);
-        this._register(this._findInput.onKeyDown((e) => this._onFindInputKeyDown(e)));
+        this._register(this._findInput.onKeyDown((e) => {
+            if (e.equals(KeyCode.Enter) && !this._codeEditor.getOption(EditorOption.find).findOnType) {
+                this._state.change({ searchString: this._findInput.getValue() }, true);
+            }
+            this._onFindInputKeyDown(e);
+        }));
         this._register(this._findInput.inputBox.onDidChange(() => {
-            if (this._ignoreChangeEvent) {
+            if (this._ignoreChangeEvent || !this._codeEditor.getOption(EditorOption.find).findOnType) {
                 return;
             }
             this._state.change({ searchString: this._findInput.getValue() }, true);

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

@@ -510,7 +510,7 @@ class UnfoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfold',
-            label: ( localize2(1044, "Unfold")),
+            label: ( localize2(1047, "Unfold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -571,7 +571,7 @@ class UnFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldRecursively',
-            label: ( localize2(1045, "Unfold Recursively")),
+            label: ( localize2(1048, "Unfold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -588,7 +588,7 @@ class FoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.fold',
-            label: ( localize2(1046, "Fold")),
+            label: ( localize2(1049, "Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -654,7 +654,7 @@ class ToggleFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFold',
-            label: ( localize2(1047, "Toggle Fold")),
+            label: ( localize2(1050, "Toggle Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -672,7 +672,7 @@ class FoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldRecursively',
-            label: ( localize2(1048, "Fold Recursively")),
+            label: ( localize2(1051, "Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -690,7 +690,7 @@ class ToggleFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFoldRecursively',
-            label: ( localize2(1049, "Toggle Fold Recursively")),
+            label: ( localize2(1052, "Toggle Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -708,7 +708,7 @@ class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllBlockComments',
-            label: ( localize2(1050, "Fold All Block Comments")),
+            label: ( localize2(1053, "Fold All Block Comments")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -738,7 +738,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllMarkerRegions',
-            label: ( localize2(1051, "Fold All Regions")),
+            label: ( localize2(1054, "Fold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -768,7 +768,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllMarkerRegions',
-            label: ( localize2(1052, "Unfold All Regions")),
+            label: ( localize2(1055, "Unfold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -798,7 +798,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllExcept',
-            label: ( localize2(1053, "Fold All Except Selected")),
+            label: ( localize2(1056, "Fold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -816,7 +816,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllExcept',
-            label: ( localize2(1054, "Unfold All Except Selected")),
+            label: ( localize2(1057, "Unfold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -834,7 +834,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAll',
-            label: ( localize2(1055, "Fold All")),
+            label: ( localize2(1058, "Fold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -851,7 +851,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAll',
-            label: ( localize2(1056, "Unfold All")),
+            label: ( localize2(1059, "Unfold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -878,7 +878,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoParentFold',
-            label: ( localize2(1057, "Go to Parent Fold")),
+            label: ( localize2(1060, "Go to Parent Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -905,7 +905,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoPreviousFold',
-            label: ( localize2(1058, "Go to Previous Folding Range")),
+            label: ( localize2(1061, "Go to Previous Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -932,7 +932,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoNextFold',
-            label: ( localize2(1059, "Go to Next Folding Range")),
+            label: ( localize2(1062, "Go to Next Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -959,7 +959,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.createFoldingRangeFromSelection',
-            label: ( localize2(1060, "Create Folding Range from Selection")),
+            label: ( localize2(1063, "Create Folding Range from Selection")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1007,7 +1007,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.removeManualFoldingRanges',
-            label: ( localize2(1061, "Remove Manual Folding Ranges")),
+            label: ( localize2(1064, "Remove Manual Folding Ranges")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1033,7 +1033,7 @@ class ToggleImportFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleImportFold',
-            label: ( localize2(1062, "Toggle Import Fold")),
+            label: ( localize2(1065, "Toggle Import Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1076,7 +1076,7 @@ registerEditorAction(ToggleImportFoldAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(( new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: ( localize2(1063, "Fold Level {0}", i)),
+        label: ( localize2(1066, "Fold Level {0}", i)),
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {
             kbExpr: EditorContextKeys.editorTextFocus,