Skip to content

Commit

Permalink
Fix merge conflict errors
Browse files Browse the repository at this point in the history
  • Loading branch information
yuliacech committed Apr 2, 2024
1 parent b61d6df commit f1384bd
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,18 @@ 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;
}

export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
const {
services: {
notifications, esHostService,
},
services: { notifications, esHostService },
} = useServicesContext();
const { toasts } = notifications;
const { settings } = useEditorReadContext();
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

0 comments on commit f1384bd

Please sign in to comment.