From fb2b7dc996c576aa4e3484ac7cb3a5db4e11e359 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Wed, 22 May 2024 14:53:24 +0200
Subject: [PATCH] [Console] Fix merge conflict issues

---
 .../containers/editor/monaco/monaco_editor.tsx      | 13 ++++++++++---
 .../monaco/monaco_editor_actions_provider.test.ts   |  5 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
index d733ad2499e785..b54e6fa900b6e7 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
@@ -70,7 +70,9 @@ export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
 
   const editorDidMountCallback = useCallback(
     (editor: monaco.editor.IStandaloneCodeEditor) => {
-      actionsProvider.current = new MonacoEditorActionsProvider(editor, setEditorActionsCss);
+      const provider = new MonacoEditorActionsProvider(editor, setEditorActionsCss);
+      setInputEditor(provider);
+      actionsProvider.current = provider;
       setupResizeChecker(divRef.current!, editor);
       registerKeyboardCommands({
         editor,
@@ -81,9 +83,14 @@ export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
           await actionsProvider.current?.moveToPreviousRequestEdge(),
         moveToNextRequestEdge: async () => await actionsProvider.current?.moveToNextRequestEdge(),
       });
-      setInputEditor(provider);
     },
-    [getDocumenationLink, registerKeyboardCommands, sendRequestsCallback, setupResizeChecker]
+    [
+      getDocumenationLink,
+      registerKeyboardCommands,
+      sendRequestsCallback,
+      setupResizeChecker,
+      setInputEditor,
+    ]
   );
 
   const editorWillUnmountCallback = useCallback(() => {
diff --git a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.test.ts b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.test.ts
index f87763f29ede84..a63f13265cadc2 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.test.ts
+++ b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.test.ts
@@ -213,7 +213,7 @@ describe('Editor actions provider', () => {
       expect((endpoints as string[]).sort()).toEqual(['_cat', '_search']);
     });
   });
-  
+
   describe('move to next/previous request edge', () => {
     beforeEach(() => {
       /* The editor has the following text:
@@ -402,7 +402,7 @@ describe('Editor actions provider', () => {
       });
     });
   });
-  
+
     describe('restoreRequestFromHistory', () => {
     const testHistoryRequest = 'GET _alias';
     beforeEach(() => {
@@ -559,4 +559,3 @@ describe('Editor actions provider', () => {
     });
   });
 });
-});