Revert "[Console] Fix bool filter autocompletions and refactor (#60361)"

This reverts commit 0d23c51.

src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts

@@ -18,17 +18,9 @@
  */
 
 import ace from 'brace';
-import { Editor as IAceEditor, IEditSession as IAceEditSession } from 'brace';
+import { Editor as IAceEditor } from 'brace';
 import $ from 'jquery';
-import {
-  CoreEditor,
-  Position,
-  Range,
-  Token,
-  TokensProvider,
-  EditorEvent,
-  AutoCompleterFunction,
-} from '../../../types';
+import { CoreEditor, Position, Range, Token, TokensProvider, EditorEvent } from '../../../types';
 import { AceTokensProvider } from '../../../lib/ace_token_provider';
 import * as curl from '../sense_editor/curl';
 import smartResize from './smart_resize';
@@ -362,48 +354,4 @@ export class LegacyCoreEditor implements CoreEditor {
       }
     }
   }
-
-  registerAutocompleter(getCompletions: AutoCompleterFunction): void {
-    // Hook into Ace
-
-    // disable standard context based autocompletion.
-    // @ts-ignore
-    ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function(
-      require: any,
-      exports: any
-    ) {
-      exports.getCompletions = function(
-        innerEditor: any,
-        session: any,
-        pos: any,
-        prefix: any,
-        callback: any
-      ) {
-        callback(null, []);
-      };
-    });
-
-    const langTools = ace.acequire('ace/ext/language_tools');
-
-    langTools.setCompleters([
-      {
-        identifierRegexps: [
-          /[a-zA-Z_0-9\.\$\-\u00A2-\uFFFF]/, // adds support for dot character
-        ],
-        getCompletions: (
-          DO_NOT_USE_1: IAceEditor,
-          DO_NOT_USE_2: IAceEditSession,
-          pos: { row: number; column: number },
-          prefix: string,
-          callback: (...args: any[]) => void
-        ) => {
-          const position: Position = {
-            lineNumber: pos.row + 1,
-            column: pos.column + 1,
-          };
-          getCompletions(position, prefix, callback);
-        },
-      },
-    ]);
-  }
 }

src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js

@@ -84,90 +84,93 @@ describe('Integration', () => {
         changeListener: function() {},
       }; // mimic auto complete
 
-      senseEditor.autocomplete._test.getCompletions(senseEditor, null, cursor, '', function(
-        err,
-        terms
-      ) {
-        if (testToRun.assertThrows) {
-          done();
-          return;
-        }
+      senseEditor.autocomplete._test.getCompletions(
+        senseEditor,
+        null,
+        { row: cursor.lineNumber - 1, column: cursor.column - 1 },
+        '',
+        function(err, terms) {
+          if (testToRun.assertThrows) {
+            done();
+            return;
+          }
 
-        if (err) {
-          throw err;
-        }
+          if (err) {
+            throw err;
+          }
 
-        if (testToRun.no_context) {
-          expect(!terms || terms.length === 0).toBeTruthy();
-        } else {
-          expect(terms).not.toBeNull();
-          expect(terms.length).toBeGreaterThan(0);
-        }
+          if (testToRun.no_context) {
+            expect(!terms || terms.length === 0).toBeTruthy();
+          } else {
+            expect(terms).not.toBeNull();
+            expect(terms.length).toBeGreaterThan(0);
+          }
 
-        if (!terms || terms.length === 0) {
-          done();
-          return;
-        }
+          if (!terms || terms.length === 0) {
+            done();
+            return;
+          }
 
-        if (testToRun.autoCompleteSet) {
-          const expectedTerms = _.map(testToRun.autoCompleteSet, function(t) {
-            if (typeof t !== 'object') {
-              t = { name: t };
-            }
-            return t;
-          });
-          if (terms.length !== expectedTerms.length) {
-            expect(_.pluck(terms, 'name')).toEqual(_.pluck(expectedTerms, 'name'));
-          } else {
-            const filteredActualTerms = _.map(terms, function(actualTerm, i) {
-              const expectedTerm = expectedTerms[i];
-              const filteredTerm = {};
-              _.each(expectedTerm, function(v, p) {
-                filteredTerm[p] = actualTerm[p];
-              });
-              return filteredTerm;
+          if (testToRun.autoCompleteSet) {
+            const expectedTerms = _.map(testToRun.autoCompleteSet, function(t) {
+              if (typeof t !== 'object') {
+                t = { name: t };
+              }
+              return t;
             });
-            expect(filteredActualTerms).toEqual(expectedTerms);
+            if (terms.length !== expectedTerms.length) {
+              expect(_.pluck(terms, 'name')).toEqual(_.pluck(expectedTerms, 'name'));
+            } else {
+              const filteredActualTerms = _.map(terms, function(actualTerm, i) {
+                const expectedTerm = expectedTerms[i];
+                const filteredTerm = {};
+                _.each(expectedTerm, function(v, p) {
+                  filteredTerm[p] = actualTerm[p];
+                });
+                return filteredTerm;
+              });
+              expect(filteredActualTerms).toEqual(expectedTerms);
+            }
           }
-        }
 
-        const context = terms[0].context;
-        const {
-          cursor: { lineNumber, column },
-        } = testToRun;
-        senseEditor.autocomplete._test.addReplacementInfoToContext(
-          context,
-          { lineNumber, column },
-          terms[0].value
-        );
+          const context = terms[0].context;
+          const {
+            cursor: { lineNumber, column },
+          } = testToRun;
+          senseEditor.autocomplete._test.addReplacementInfoToContext(
+            context,
+            { lineNumber, column },
+            terms[0].value
+          );
 
-        function ac(prop, propTest) {
-          if (typeof testToRun[prop] !== 'undefined') {
-            if (propTest) {
-              propTest(context[prop], testToRun[prop], prop);
-            } else {
-              expect(context[prop]).toEqual(testToRun[prop]);
+          function ac(prop, propTest) {
+            if (typeof testToRun[prop] !== 'undefined') {
+              if (propTest) {
+                propTest(context[prop], testToRun[prop], prop);
+              } else {
+                expect(context[prop]).toEqual(testToRun[prop]);
+              }
             }
           }
-        }
 
-        function posCompare(actual, expected) {
-          expect(actual.lineNumber).toEqual(expected.lineNumber + lineOffset);
-          expect(actual.column).toEqual(expected.column);
-        }
+          function posCompare(actual, expected) {
+            expect(actual.lineNumber).toEqual(expected.lineNumber + lineOffset);
+            expect(actual.column).toEqual(expected.column);
+          }
 
-        function rangeCompare(actual, expected, name) {
-          posCompare(actual.start, expected.start, name + '.start');
-          posCompare(actual.end, expected.end, name + '.end');
-        }
+          function rangeCompare(actual, expected, name) {
+            posCompare(actual.start, expected.start, name + '.start');
+            posCompare(actual.end, expected.end, name + '.end');
+          }
 
-        ac('prefixToAdd');
-        ac('suffixToAdd');
-        ac('addTemplate');
-        ac('textBoxPosition', posCompare);
-        ac('rangeToReplace', rangeCompare);
-        done();
-      });
+          ac('prefixToAdd');
+          ac('suffixToAdd');
+          ac('addTemplate');
+          ac('textBoxPosition', posCompare);
+          ac('rangeToReplace', rangeCompare);
+          done();
+        }
+      );
     });
   }
 

src/plugins/console/public/application/models/sense_editor/sense_editor.ts

@@ -44,7 +44,6 @@ export class SenseEditor {
       coreEditor,
       parser: this.parser,
     });
-    this.coreEditor.registerAutocompleter(this.autocomplete.getCompletions);
     this.coreEditor.on(
       'tokenizerUpdate',
       this.highlightCurrentRequestsAndUpdateActionBar.bind(this)

src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js → src/plugins/console/public/lib/autocomplete/__tests__/url_autocomplete.test.js

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import '../../../application/models/sense_editor/sense_editor.test.mocks';
 
 const _ = require('lodash');
 import {

src/plugins/console/public/lib/autocomplete/__jest__/url_params.test.js → src/plugins/console/public/lib/autocomplete/__tests__/url_params.test.js

@@ -16,6 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import '../../../application/models/sense_editor/sense_editor.test.mocks';
+import 'brace';
+import 'brace/mode/javascript';
+import 'brace/mode/json';
 const _ = require('lodash');
 import { UrlParams } from '../../autocomplete/url_params';
 import { populateContext } from '../../autocomplete/engine';

src/plugins/console/public/lib/autocomplete/autocomplete.ts

@@ -18,9 +18,9 @@
  */
 
 import _ from 'lodash';
+import ace, { Editor as AceEditor, IEditSession } from 'brace';
 import { i18n } from '@kbn/i18n';
 
-// TODO: All of these imports need to be moved to the core editor so that it can inject components from there.
 import {
   getTopLevelUrlCompleteComponents,
   getEndpointBodyCompleteComponents,
@@ -39,7 +39,7 @@ import { createTokenIterator } from '../../application/factories';
 
 import { Position, Token, Range, CoreEditor } from '../../types';
 
-let lastEvaluatedToken: any = null;
+let LAST_EVALUATED_TOKEN: any = null;
 
 function isUrlParamsToken(token: any) {
   switch ((token || {}).type) {
@@ -889,7 +889,7 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
 
     if (!currentToken) {
       if (pos.lineNumber === 1) {
-        lastEvaluatedToken = null;
+        LAST_EVALUATED_TOKEN = null;
         return;
       }
       currentToken = { position: { column: 0, lineNumber: 0 }, value: '', type: '' }; // empty row
@@ -902,26 +902,26 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
       if (parser.isEmptyToken(nextToken)) {
         // Empty line, or we're not on the edge of current token. Save the current position as base
         currentToken.position.column = pos.column;
-        lastEvaluatedToken = currentToken;
+        LAST_EVALUATED_TOKEN = currentToken;
       } else {
         nextToken.position.lineNumber = pos.lineNumber;
-        lastEvaluatedToken = nextToken;
+        LAST_EVALUATED_TOKEN = nextToken;
       }
       return;
     }
 
-    if (!lastEvaluatedToken) {
-      lastEvaluatedToken = currentToken;
+    if (!LAST_EVALUATED_TOKEN) {
+      LAST_EVALUATED_TOKEN = currentToken;
       return; // wait for the next typing.
     }
 
     if (
-      lastEvaluatedToken.position.column !== currentToken.position.column ||
-      lastEvaluatedToken.position.lineNumber !== currentToken.position.lineNumber ||
-      lastEvaluatedToken.value === currentToken.value
+      LAST_EVALUATED_TOKEN.position.column !== currentToken.position.column ||
+      LAST_EVALUATED_TOKEN.position.lineNumber !== currentToken.position.lineNumber ||
+      LAST_EVALUATED_TOKEN.value === currentToken.value
     ) {
       // not on the same place or nothing changed, cache and wait for the next time
-      lastEvaluatedToken = currentToken;
+      LAST_EVALUATED_TOKEN = currentToken;
       return;
     }
 
@@ -935,7 +935,7 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
         return;
     }
 
-    lastEvaluatedToken = currentToken;
+    LAST_EVALUATED_TOKEN = currentToken;
     editor.execCommand('startAutocomplete');
   },
   100);
@@ -947,7 +947,17 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     }
   }
 
-  function getCompletions(position: Position, prefix: string, callback: (...args: any[]) => void) {
+  function getCompletions(
+    DO_NOT_USE: AceEditor,
+    DO_NOT_USE_SESSION: IEditSession,
+    pos: { row: number; column: number },
+    prefix: string,
+    callback: (...args: any[]) => void
+  ) {
+    const position: Position = {
+      lineNumber: pos.row + 1,
+      column: pos.column + 1,
+    };
     try {
       const context = getAutoCompleteContext(editor, position);
       if (!context) {
@@ -1018,12 +1028,39 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
 
   editor.on('changeSelection', editorChangeListener);
 
+  // Hook into Ace
+
+  // disable standard context based autocompletion.
+  // @ts-ignore
+  ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function(
+    require: any,
+    exports: any
+  ) {
+    exports.getCompletions = function(
+      innerEditor: any,
+      session: any,
+      pos: any,
+      prefix: any,
+      callback: any
+    ) {
+      callback(null, []);
+    };
+  });
+
+  const langTools = ace.acequire('ace/ext/language_tools');
+
+  langTools.setCompleters([
+    {
+      identifierRegexps: [
+        /[a-zA-Z_0-9\.\$\-\u00A2-\uFFFF]/, // adds support for dot character
+      ],
+      getCompletions,
+    },
+  ]);
+
   return {
-    getCompletions,
-    // TODO: This needs to be cleaned up
     _test: {
-      getCompletions: (_editor: any, _editSession: any, pos: any, prefix: any, callback: any) =>
-        getCompletions(pos, prefix, callback),
+      getCompletions,
       addReplacementInfoToContext,
       addChangeListener: () => editor.on('changeSelection', editorChangeListener),
       removeChangeListener: () => editor.off('changeSelection', editorChangeListener),