[TSVB] Replaces EuiCodeEditor 👉 Monaco editor

packages/kbn-monaco/src/esql/index.ts

@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { LangModule as LangModuleType } from '../types';
 import { ID } from './constants';
 import { lexerRules } from './lexer_rules';
 
-export const EsqlLang = { ID, lexerRules };
+export const EsqlLang = { ID, lexerRules } as LangModuleType;

packages/kbn-monaco/src/helpers.ts

@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+import { monaco } from './monaco_imports';
+import { LangModule as LangModuleType } from './types';
+
+function registerLanguage(language: LangModuleType) {
+  const { ID, lexerRules, languageConfiguration } = language;
+
+  monaco.languages.register({ id: ID });
+  monaco.languages.setMonarchTokensProvider(ID, lexerRules);
+  if (languageConfiguration) {
+    monaco.languages.setLanguageConfiguration(ID, languageConfiguration);
+  }
+}
+
+export { registerLanguage };

packages/kbn-monaco/src/index.ts

@@ -12,7 +12,13 @@ import './register_globals';
 export { monaco } from './monaco_imports';
 export { XJsonLang } from './xjson';
 export { PainlessLang, PainlessContext, PainlessAutocompleteField } from './painless';
-
 /* eslint-disable-next-line @kbn/eslint/module_migration */
 import * as BarePluginApi from 'monaco-editor/esm/vs/editor/editor.api';
-export { BarePluginApi };
+
+import { registerLanguage } from './helpers';
+import {
+  LangModule as LangModuleType,
+  CompleteLangModule as CompleteLangModuleType,
+} from './types';
+
+export { BarePluginApi, registerLanguage, LangModuleType, CompleteLangModuleType };

packages/kbn-monaco/src/painless/index.ts

@@ -9,13 +9,14 @@
 import { ID } from './constants';
 import { lexerRules, languageConfiguration } from './lexer_rules';
 import { getSuggestionProvider, getSyntaxErrors } from './language';
+import { CompleteLangModule as CompleteLangModuleType } from '../types';
 
 export const PainlessLang = {
   ID,
   getSuggestionProvider,
   lexerRules,
   languageConfiguration,
   getSyntaxErrors,
-};
+} as CompleteLangModuleType;
 
 export { PainlessContext, PainlessAutocompleteField } from './types';

packages/kbn-monaco/src/register_globals.ts

@@ -10,6 +10,8 @@ import { XJsonLang } from './xjson';
 import { PainlessLang } from './painless';
 import { EsqlLang } from './esql';
 import { monaco } from './monaco_imports';
+import { registerLanguage } from './helpers';
+
 // @ts-ignore
 import xJsonWorkerSrc from '!!raw-loader!../../target_web/xjson.editor.worker.js';
 // @ts-ignore
@@ -20,14 +22,9 @@ import painlessWorkerSrc from '!!raw-loader!../../target_web/painless.editor.wor
 /**
  * Register languages and lexer rules
  */
-monaco.languages.register({ id: XJsonLang.ID });
-monaco.languages.setMonarchTokensProvider(XJsonLang.ID, XJsonLang.lexerRules);
-monaco.languages.setLanguageConfiguration(XJsonLang.ID, XJsonLang.languageConfiguration);
-monaco.languages.register({ id: PainlessLang.ID });
-monaco.languages.setMonarchTokensProvider(PainlessLang.ID, PainlessLang.lexerRules);
-monaco.languages.setLanguageConfiguration(PainlessLang.ID, PainlessLang.languageConfiguration);
-monaco.languages.register({ id: EsqlLang.ID });
-monaco.languages.setMonarchTokensProvider(EsqlLang.ID, EsqlLang.lexerRules);
+registerLanguage(XJsonLang);
+registerLanguage(PainlessLang);
+registerLanguage(EsqlLang);
 
 /**
  * Create web workers by language ID

packages/kbn-monaco/src/types.ts

@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+import { monaco } from './monaco_imports';
+
+export interface LangModule {
+  ID: string;
+  lexerRules: monaco.languages.IMonarchLanguage;
+  languageConfiguration?: monaco.languages.LanguageConfiguration;
+  getSuggestionProvider?: Function;
+  getSyntaxErrors?: Function;
+}
+
+export interface CompleteLangModule extends LangModule {
+  languageConfiguration: monaco.languages.LanguageConfiguration;
+  getSuggestionProvider: Function;
+  getSyntaxErrors: Function;
+}

packages/kbn-monaco/src/xjson/index.ts

@@ -12,5 +12,6 @@
 import './language';
 import { ID } from './constants';
 import { lexerRules, languageConfiguration } from './lexer_rules';
+import { LangModule as LangModuleType } from '../types';
 
-export const XJsonLang = { ID, lexerRules, languageConfiguration };
+export const XJsonLang = { ID, lexerRules, languageConfiguration } as LangModuleType;

src/plugins/kibana_react/public/code_editor/index.tsx

@@ -17,6 +17,9 @@ import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
 import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
 import { useUiSetting } from '../ui_settings';
 import { Props } from './code_editor';
+import './register_languages';
+
+export * from './languages';
 
 const LazyBaseEditor = React.lazy(() => import('./code_editor'));
 

src/plugins/kibana_react/public/url_template_editor/constants.ts → src/plugins/kibana_react/public/code_editor/languages/css/constants.ts

@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export const LANG = 'handlebars_url';
+export const LANG = 'css';

src/plugins/kibana_react/public/code_editor/languages/css/index.ts

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+import { LangModuleType } from '@kbn/monaco';
+import { lexerRules, languageConfiguration } from './language';
+import { LANG } from './constants';
+
+export const Lang: LangModuleType = { ID: LANG, lexerRules, languageConfiguration };

src/plugins/kibana_react/public/code_editor/languages/css/language.ts

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+
+/* eslint-disable @kbn/eslint/module_migration */
+import { conf, language } from 'monaco-editor/esm/vs/basic-languages/css/css';
+
+export { conf as languageConfiguration, language as lexerRules };

src/plugins/kibana_react/public/code_editor/languages/handlebars/constants.ts

@@ -0,0 +1,9 @@
+/*
+ * 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 const LANG = 'handlebars';

src/plugins/kibana_react/public/code_editor/languages/handlebars/index.ts

@@ -0,0 +1,13 @@
+/*
+ * 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.
+ */
+
+import { LangModuleType } from '@kbn/monaco';
+import { languageConfiguration, lexerRules } from './language';
+import { LANG } from './constants';
+
+export const Lang: LangModuleType = { ID: LANG, languageConfiguration, lexerRules };

src/plugins/kibana_react/public/url_template_editor/language.ts → src/plugins/kibana_react/public/code_editor/languages/handlebars/language.ts

@@ -13,7 +13,7 @@
 
 import { monaco } from '@kbn/monaco';
 
-export const conf: monaco.languages.LanguageConfiguration = {
+export const languageConfiguration: monaco.languages.LanguageConfiguration = {
   wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
 
   comments: {
@@ -42,7 +42,7 @@ export const conf: monaco.languages.LanguageConfiguration = {
   ],
 };
 
-export const language: monaco.languages.IMonarchLanguage = {
+export const lexerRules: monaco.languages.IMonarchLanguage = {
   // Set defaultToken to invalid to see what you do not tokenize yet.
   defaultToken: 'invalid',
   tokenPostfix: '',

src/plugins/kibana_react/public/code_editor/languages/index.ts

@@ -0,0 +1,13 @@
+/*
+ * 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.
+ */
+
+import { Lang as CssLang } from './css';
+import { Lang as HandlebarsLang } from './handlebars';
+import { Lang as MarkdownLang } from './markdown';
+
+export { CssLang, HandlebarsLang, MarkdownLang };

src/plugins/kibana_react/public/code_editor/languages/markdown/constants.ts

@@ -0,0 +1,9 @@
+/*
+ * 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 const LANG = 'markdown';

src/plugins/kibana_react/public/code_editor/languages/markdown/index.ts

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+import { LangModuleType } from '@kbn/monaco';
+import { languageConfiguration, lexerRules } from './language';
+import { LANG } from './constants';
+
+export const Lang: LangModuleType = { ID: LANG, languageConfiguration, lexerRules };

src/plugins/kibana_react/public/code_editor/languages/markdown/language.ts

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+
+/* eslint-disable @kbn/eslint/module_migration */
+import { conf, language } from 'monaco-editor/esm/vs/basic-languages/markdown/markdown';
+
+export { conf as languageConfiguration, language as lexerRules };

src/plugins/kibana_react/public/code_editor/register_languages.ts

@@ -0,0 +1,13 @@
+/*
+ * 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.
+ */
+import { registerLanguage } from '@kbn/monaco';
+import { CssLang, HandlebarsLang, MarkdownLang } from './languages';
+
+registerLanguage(CssLang);
+registerLanguage(HandlebarsLang);
+registerLanguage(MarkdownLang);

src/plugins/kibana_react/public/url_template_editor/url_template_editor.tsx

@@ -9,18 +9,10 @@
 import * as React from 'react';
 import { monaco } from '@kbn/monaco';
 import { Props as CodeEditorProps } from '../code_editor/code_editor';
-import { CodeEditor } from '../code_editor';
-import { LANG } from './constants';
-import { language, conf } from './language';
+import { CodeEditor, HandlebarsLang } from '../code_editor';
 
 import './styles.scss';
 
-monaco.languages.register({
-  id: LANG,
-});
-monaco.languages.setMonarchTokensProvider(LANG, language);
-monaco.languages.setLanguageConfiguration(LANG, conf);
-
 export interface UrlTemplateEditorVariable {
   label: string;
   title?: string;
@@ -74,7 +66,7 @@ export const UrlTemplateEditor: React.FC<UrlTemplateEditorProps> = ({
       return;
     }
 
-    const { dispose } = monaco.languages.registerCompletionItemProvider(LANG, {
+    const { dispose } = monaco.languages.registerCompletionItemProvider(HandlebarsLang.ID, {
       triggerCharacters: ['{', '/', '?', '&', '='],
       provideCompletionItems(model, position, context, token) {
         const { lineNumber } = position;
@@ -132,7 +124,7 @@ export const UrlTemplateEditor: React.FC<UrlTemplateEditorProps> = ({
   return (
     <div className={'urlTemplateEditor__container'} onKeyDown={handleKeyDown}>
       <Editor
-        languageId={LANG}
+        languageId={HandlebarsLang.ID}
         height={height}
         value={value}
         onChange={onChange}

src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js

@@ -15,10 +15,9 @@ import React, { Component } from 'react';
 import { createTickFormatter } from './lib/tick_formatter';
 import { convertSeriesToVars } from './lib/convert_series_to_vars';
 import _ from 'lodash';
-import 'brace/mode/markdown';
-import 'brace/theme/github';
+import { CodeEditor, MarkdownLang } from '../../../../kibana_react/public';
 
-import { EuiText, EuiCodeBlock, EuiSpacer, EuiTitle, EuiCodeEditor } from '@elastic/eui';
+import { EuiText, EuiCodeBlock, EuiSpacer, EuiTitle } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
@@ -101,14 +100,13 @@ export class MarkdownEditor extends Component {
     return (
       <div className="tvbMarkdownEditor">
         <div className="tvbMarkdownEditor__editor">
-          <EuiCodeEditor
-            onLoad={this.handleOnLoad}
-            mode="markdown"
-            theme="github"
-            width="100%"
-            height="100%"
-            name={`ace-${model.id}`}
-            setOptions={{ wrap: true, fontSize: '14px' }}
+          <CodeEditor
+            editorDidMount={this.handleOnLoad}
+            languageId={MarkdownLang.ID}
+            options={{
+              fontSize: '14px',
+              wordWrap: 'on',
+            }}
             value={model.markdown}
             onChange={this.handleChange}
           />

src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.tsx

@@ -20,7 +20,6 @@ import {
   EuiSpacer,
   EuiTitle,
   EuiHorizontalRule,
-  EuiCodeEditor,
 } from '@elastic/eui';
 // @ts-expect-error
 import less from 'less/lib/less-browser';
@@ -43,6 +42,7 @@ import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
 import { VisDataContext } from '../../contexts/vis_data_context';
 import { PanelConfigProps, PANEL_CONFIG_TABS } from './types';
 import { TimeseriesVisParams } from '../../../types';
+import { CodeEditor, CssLang } from '../../../../../kibana_react/public';
 
 const lessC = less(window, { env: 'production' });
 
@@ -281,12 +281,10 @@ export class MarkdownPanelConfig extends Component<
               </span>
             </EuiTitle>
             <EuiSpacer size="s" />
-            <EuiCodeEditor
-              mode="less"
-              theme="github"
-              width="100%"
-              name={`ace-css-${model.id}`}
-              setOptions={{ fontSize: '14px' }}
+            <CodeEditor
+              height="500px"
+              languageId={CssLang.ID}
+              options={{ fontSize: 14 }}
               value={model.markdown_less ?? ''}
               onChange={this.handleCSSChange}
             />