From 0495103635f68ace087c55307000f218a3d0c99b Mon Sep 17 00:00:00 2001 From: Justin Greywolf Date: Mon, 8 Jun 2020 19:21:33 -0700 Subject: [PATCH] Fix regex and Fix incorrect test --- cypress/integration/rendering/classDiagram.spec.js | 6 +++--- src/diagrams/class/svgDraw.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/integration/rendering/classDiagram.spec.js b/cypress/integration/rendering/classDiagram.spec.js index 97d7d9041..bf7125717 100644 --- a/cypress/integration/rendering/classDiagram.spec.js +++ b/cypress/integration/rendering/classDiagram.spec.js @@ -71,9 +71,9 @@ describe('Class diagram', () => { classDiagram Class01 <|-- AveryLongClass : Cool <<interface>> Class01 - Class01 : -int privateMethod() - Class01 : +int publicMethod() - Class01 : #int protectedMethod() + Class01 : -privateMethod() + Class01 : +publicMethod() + Class01 : #protectedMethod() Class01 : -int privateChimp Class01 : +int publicGorilla Class01 : #int protectedMarmoset diff --git a/src/diagrams/class/svgDraw.js b/src/diagrams/class/svgDraw.js index 61bd51ccc..828824f05 100644 --- a/src/diagrams/class/svgDraw.js +++ b/src/diagrams/class/svgDraw.js @@ -278,7 +278,7 @@ export const drawClass = function(elem, classDef, conf) { }; export const parseMember = function(text) { - const fieldRegEx = /^(\+|-|~|#)?(\w+)(~\w+~|\[\])?\s+(\w+)$/; + const fieldRegEx = /(\+|-|~|#)?(\w+)(~\w+~|\[\])?\s+(\w+)/; const methodRegEx = /(\+|-|~|#)?(\w+)\((.*)\)(\*|\$)? *(.*)?/; ///^(\+|-|~|#)?(\w+)\((.*)\)(\*|\$)?[ ]*(.*)?$/;