From 9091d686ed09ad81c5bfa1927f12244ac233ffcb Mon Sep 17 00:00:00 2001
From: Justin Greywolf <jgreywolf@lostware.com>
Date: Mon, 8 Jun 2020 18:40:18 -0700
Subject: [PATCH] 1378-Update regex to match multiple parameters

removing node version changes
---
 package.json                  | 1 -
 src/diagrams/class/svgDraw.js | 9 +++++----
 yarn.lock                     | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 5ca9a34b2..90c991b46 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,6 @@
     "he": "^1.2.0",
     "minify": "^4.1.1",
     "moment-mini": "^2.22.1",
-    "node": "^14.3.0",
     "scope-css": "^1.2.1"
   },
   "devDependencies": {
diff --git a/src/diagrams/class/svgDraw.js b/src/diagrams/class/svgDraw.js
index c97259a55..61bd51ccc 100644
--- a/src/diagrams/class/svgDraw.js
+++ b/src/diagrams/class/svgDraw.js
@@ -278,13 +278,14 @@ export const drawClass = function(elem, classDef, conf) {
 };
 
 export const parseMember = function(text) {
-  const fieldRegEx = /^(\+|-|~|#)?(\w+)(~\w+~|\[\])?\s+(\w+)/;
-  const methodRegEx = /^(\+|-|~|#)?(\w+)\((.*)\)(\*|\$)?\s?(.*)?/;
+  const fieldRegEx = /^(\+|-|~|#)?(\w+)(~\w+~|\[\])?\s+(\w+)$/;
+  const methodRegEx = /(\+|-|~|#)?(\w+)\((.*)\)(\*|\$)? *(.*)?/;
+  ///^(\+|-|~|#)?(\w+)\((.*)\)(\*|\$)?[ ]*(.*)?$/;
 
   let fieldMatch = text.match(fieldRegEx);
   let methodMatch = text.match(methodRegEx);
 
-  if (fieldMatch) {
+  if (fieldMatch && !methodMatch) {
     return buildFieldDisplay(fieldMatch);
   } else if (methodMatch) {
     return buildMethodDisplay(methodMatch);
@@ -299,7 +300,7 @@ const buildFieldDisplay = function(parsedText) {
   try {
     let visibility = parsedText[1] ? parsedText[1].trim() : '';
     let fieldType = parsedText[2] ? parseGenericTypes(parsedText[2]) : '';
-    let fieldName = parsedText[3] ? parsedText[3].trim() : '';
+    let fieldName = parsedText[4] ? parsedText[4].trim() : '';
 
     displayText = visibility + fieldType + ' ' + fieldName;
   } catch (err) {
diff --git a/yarn.lock b/yarn.lock
index 320906b14..a55f0753d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7548,11 +7548,6 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-bin-setup@^1.0.0:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-bin-setup/-/node-bin-setup-1.0.6.tgz#4b5c9bb937ece702d7069b36ca78af4684677528"
-  integrity sha512-uPIxXNis1CRbv1DwqAxkgBk5NFV3s7cMN/Gf556jSw6jBvV7ca4F9lRL/8cALcZecRibeqU+5dFYqFFmzv5a0Q==
-
 node-forge@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"