Merge branch 'app/painless' of github.com:elastic/kibana into app-pai…

…nless/doc-links * 'app/painless' of github.com:elastic/kibana: [Painless] Language Service (elastic#60612) i18n # Conflicts: # x-pack/plugins/painless_lab/public/plugin.tsx
jloleysens · Mar 20, 2020 · a0dd19c · a0dd19c
2 parents 5f67bd0 + ec81bf6
commit a0dd19c
Show file tree

Hide file tree

Showing 9 changed files with 246 additions and 204 deletions.
diff --git a/packages/kbn-ui-shared-deps/monaco.ts b/packages/kbn-ui-shared-deps/monaco.ts
@@ -25,6 +25,8 @@ import 'monaco-editor/esm/vs/base/worker/defaultWorkerFactory';
 import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js';
 import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
 
+import 'monaco-editor/esm/vs/editor/contrib/wordOperations/wordOperations.js'; // Needed for word-wise char navigation
+
 import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js'; // Needed for suggestions
 import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js'; // Needed for hover
 import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js'; // Needed for signature

diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
@@ -99,7 +99,7 @@ export const ContextTab: FunctionComponent = () => {
         <EuiFormRow
           label={
             <EuiToolTip
-              content={i18n.translate('xpack.painlessLab.queryFieldLabel', {
+              content={i18n.translate('xpack.painlessLab.queryFieldTooltipText', {
                 defaultMessage:
                   'Use query to specify that that _score will be used to calculate score.',
               })}

diff --git a/x-pack/plugins/painless_lab/public/application/register_painless.ts b/x-pack/plugins/painless_lab/public/application/register_painless.ts
diff --git a/x-pack/plugins/painless_lab/public/index.ts b/x-pack/plugins/painless_lab/public/index.ts
@@ -5,9 +5,8 @@
  */
 
 import './styles/_index.scss';
-import { PluginInitializerContext } from 'src/core/public';
 import { PainlessLabUIPlugin } from './plugin';
 
-export function plugin(ctx: PluginInitializerContext) {
-  return new PainlessLabUIPlugin(ctx);
+export function plugin() {
+  return new PainlessLabUIPlugin();
 }
diff --git a/x-pack/plugins/painless_lab/public/lib/index.ts b/x-pack/plugins/painless_lab/public/lib/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { monacoPainlessLang } from './monaco_painless_lang';