Regexp issues, during signers extraction (#224)

* Add parsing utility methods

* Use extractSigners method from utils

* Clear console.log calls

* Add new line at the eof

Co-authored-by: Mackenzie <[email protected]>

Author: MaxStalker

src/components/Arguments/index.tsx

@@ -279,7 +279,6 @@ const Arguments: React.FC<ArgumentsProps> = (props) => {
 
       // Language server throws "input is not literal" without quotes
       if (type === `String`) {
-        console.log({ value });
         value = `\"${value.replace(/"/g, '\\"')}\"`;
       }
 

src/components/CadenceEditor.tsx

@@ -2,6 +2,9 @@ import React from 'react';
 import styled from '@emotion/styled';
 import { keyframes } from '@emotion/core';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+const { MonacoServices } = require('monaco-languageclient/lib/monaco-services');
+import { extractSigners } from "util/parser";
+
 
 import configureCadence, { CADENCE_LANGUAGE_ID } from 'util/cadence';
 import {
@@ -357,10 +360,6 @@ class CadenceEditor extends React.Component<
     return [];
   }
 
-  extractSigners(code: string): number {
-    return this.extract(code, 'prepare').filter((item) => !!item).length;
-  }
-
   hover(highlight: Highlight): void {
     const { startLine, startColumn, endLine, endColumn, color } = highlight;
     const model = this.editor.getModel();
@@ -426,7 +425,7 @@ class CadenceEditor extends React.Component<
     const list = args[activeId] || [];
 
     /// Extract number of signers from code
-    const signers = this.extractSigners(code);
+    const signers = extractSigners(code).length
     const problemsList: ProblemsList = problems[activeId] || {
       error: [],
       warning: [],

src/util/parse-contract-name.ts

@@ -0,0 +1,35 @@
+export const collapseSpaces = (input: string) => input.replace(/\s+/g, " ");
+export const stripNewLines = (input: string) => input.replace(/\r\n|\n|\r/g, " ");
+
+export const generateSchema = (argsDefinition: string) =>
+    argsDefinition
+        .split(",")
+        .map((item) => item.replace(/\s*/g, ""))
+        .filter((item) => item !== "");
+
+export const stripComments = (code: string) => {
+    const commentsRegExp = /(\/\*[\s\S]*?\*\/)|(\/\/.*)/g;
+    return code.replace(commentsRegExp, "");
+};
+
+export const extract = (code: string, keyWord: string) => {
+    const noComments = stripComments(code);
+    const target = collapseSpaces(noComments.replace(/[\n\r]/g, ""));
+
+    if (target) {
+        const regexp = new RegExp(keyWord, "g");
+        const match = regexp.exec(target);
+
+        if (match) {
+            if (match[1] === "") {
+                return [];
+            }
+            return generateSchema(match[1]);
+        }
+    }
+    return [];
+};
+
+export const extractSigners = (code: string) => {
+    return extract(code, `(?:prepare\\s*\\(\\s*)([^\\)]*)(?:\\))`);
+};