From f1384bdb0cf4d7a52ca074cfe7b478e264ed583b Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Tue, 2 Apr 2024 13:57:19 +0200
Subject: [PATCH] Fix merge conflict errors

---
 .../containers/editor/monaco/monaco_editor.tsx        |  7 ++-----
 .../application/models/monaco_sense_editor/index.ts   | 11 +++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 src/plugins/console/public/application/models/monaco_sense_editor/index.ts

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 06dd1c403401c00..99adc9a93a12edb 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
@@ -12,11 +12,10 @@ import { css } from '@emotion/react';
 import { CONSOLE_LANG_ID, CONSOLE_THEME_ID } from '@kbn/monaco';
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { MonacoSenseEditor } from '../../../models/monaco_core_editor/monaco_sense_editor';
+import { MonacoSenseEditor, initSenseEditor } from '../../../models/monaco_sense_editor';
 import { useSetInitialValue } from './use_set_initial_value';
 import { useServicesContext, useEditorReadContext } from '../../../contexts';
 import { ConsoleMenu } from '../../../components';
-import { initSenseEditor } from '../../../models/monaco_core_editor/init_sense_editor';
 
 export interface EditorProps {
   initialTextValue: string;
@@ -24,9 +23,7 @@ export interface EditorProps {
 
 export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
   const {
-    services: {
-      notifications, esHostService,
-    },
+    services: { notifications, esHostService },
   } = useServicesContext();
   const { toasts } = notifications;
   const { settings } = useEditorReadContext();
diff --git a/src/plugins/console/public/application/models/monaco_sense_editor/index.ts b/src/plugins/console/public/application/models/monaco_sense_editor/index.ts
new file mode 100644
index 000000000000000..9dd939ad1f2107e
--- /dev/null
+++ b/src/plugins/console/public/application/models/monaco_sense_editor/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { initSenseEditor } from './init_sense_editor';
+export { MonacoSenseEditor } from './monaco_sense_editor';
+export { removeTrailingWhitespaces, replaceVariables } from './utils';