Refactor moved get hints function to a util and removed unnecessary changes

Author: sanjai0py

packages/bruno-app/src/components/CodeEditor/index.js

@@ -8,18 +8,16 @@
 import React from 'react';
 import { isEqual, escapeRegExp } from 'lodash';
 import { defineCodeMirrorBrunoVariablesMode } from 'utils/common/codemirror';
+import { getMockDataHints } from 'utils/codemirror/mock-data-hints';
 import StyledWrapper from './StyledWrapper';
 import * as jsonlint from '@prantlf/jsonlint';
 import { JSHINT } from 'jshint';
 import stripJsonComments from 'strip-json-comments';
 import { getAllVariables } from 'utils/collections';
 
-import { mockDataFunctions } from '@usebruno/common';
-
 let CodeMirror;
 const SERVER_RENDERED = typeof window === 'undefined' || global['PREVENT_CODEMIRROR_RENDER'] === true;
 const TAB_SIZE = 2;
-const MOCK_FUNCTION_SUGGESTIONS = Object.keys(mockDataFunctions).map(key => `$${key}`);
 
 if (!SERVER_RENDERED) {
   CodeMirror = require('codemirror');
@@ -91,7 +89,7 @@ if (!SERVER_RENDERED) {
     'bru.runner.stopExecution()'
   ];
 
-  CodeMirror.registerHelper('hint', 'brunoJS', (editor, _options) => {
+  CodeMirror.registerHelper('hint', 'brunoJS', (editor, options) => {
     const cursor = editor.getCursor();
     const currentLine = editor.getLine(cursor.line);
     let startBru = cursor.ch;
@@ -307,30 +305,8 @@ export default class CodeEditor extends React.Component {
       });
     }
 
-    const getHints = (cm) => {
-      const cursor = cm.getCursor();
-      const currentString = cm.getRange({ line: cursor.line, ch: 0 }, cursor);
-    
-      const match = currentString.match(/\{\{\$(\w*)$/);
-      if (!match) return null;
-        
-      const wordMatch = match[1];
-      if (!wordMatch) return null;
-    
-      const suggestions = MOCK_FUNCTION_SUGGESTIONS.filter(name => name.startsWith(`$${wordMatch}`));
-      if (!suggestions.length) return null;
-    
-      const startPos = { line: cursor.line, ch: currentString.lastIndexOf('{{$') + 2 }; // +2 accounts for `{{
-    
-      return {
-        list: suggestions,
-        from: startPos,
-        to: cm.getCursor(),
-      };
-    };
-
     editor.on('inputRead', function (cm, event) {
-      const hints = getHints(cm);
+      const hints = getMockDataHints(cm);
       if (!hints) {
         return;
       }

packages/bruno-app/src/components/SingleLineEditor/index.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import isEqual from 'lodash/isEqual';
 import { getAllVariables } from 'utils/collections';
 import { defineCodeMirrorBrunoVariablesMode, MaskedEditor } from 'utils/common/codemirror';
+import { getMockDataHints } from 'utils/codemirror/mock-data-hints';
 import StyledWrapper from './StyledWrapper';
 import { IconEye, IconEyeOff } from '@tabler/icons';
 
@@ -89,30 +90,8 @@ class SingleLineEditor extends Component {
       });
     }
 
-    const getHints = (cm) => {
-      const cursor = cm.getCursor();
-      const currentString = cm.getRange({ line: cursor.line, ch: 0 }, cursor);
-
-      const match = currentString.match(/\{\{\$(\w*)$/);
-      if (!match) return null;
-
-      const wordMatch = match[1];
-      if (!wordMatch) return null;
-
-      const suggestions = MOCK_FUNCTION_SUGGESTIONS.filter(name => name.startsWith(`$${wordMatch}`));
-      if (!suggestions.length) return null;
-
-      const startPos = { line: cursor.line, ch: currentString.lastIndexOf('{{$') + 2 }; // +2 accounts for `{{`
-
-      return {
-        list: suggestions,
-        from: startPos,
-        to: cm.getCursor(),
-      };
-    };
-
     this.editor.on('inputRead', function (cm, event) {
-      const hints = getHints(cm);
+      const hints = getMockDataHints(cm);
       if (!hints) {
         return;
       }

packages/bruno-app/src/utils/codemirror/mock-data-hints.js

@@ -0,0 +1,25 @@
+import { mockDataFunctions } from '@usebruno/common';
+
+const MOCK_FUNCTION_SUGGESTIONS = Object.keys(mockDataFunctions).map(key => `$${key}`);
+
+export const getMockDataHints = (cm) => {
+  const cursor = cm.getCursor();
+  const currentString = cm.getRange({ line: cursor.line, ch: 0 }, cursor);
+
+  const match = currentString.match(/\{\{\$(\w*)$/);
+  if (!match) return null;
+
+  const wordMatch = match[1];
+  if (!wordMatch) return null;
+
+  const suggestions = MOCK_FUNCTION_SUGGESTIONS.filter(name => name.startsWith(`$${wordMatch}`));
+  if (!suggestions.length) return null;
+
+  const startPos = { line: cursor.line, ch: currentString.lastIndexOf('{{$') + 2 }; // +2 accounts for `{{`
+
+  return {
+    list: suggestions,
+    from: startPos,
+    to: cm.getCursor(),
+  };
+};

packages/bruno-common/src/index.ts

@@ -1,4 +1,2 @@
-import { mockDataFunctions } from './utils/faker-functions';
-
-export { mockDataFunctions };
+export { mockDataFunctions } from './utils/faker-functions';
 export { default as interpolate } from './interpolate';