Merge pull request #4 from a1dancole/comments-bug

Remove code comments when extracting variables.

PowerDocu.Common/AppParser.cs

@@ -291,6 +291,10 @@ private void addScreenNavigation(ControlEntity controlEntity, string destination
 
         private void CheckForVariables(ControlEntity controlEntity, string input)
         {
+            if (hasCodeComments(input))
+            {
+                input = stripCodeComments(input);
+            }
             //Reference: https://docs.microsoft.com/en-us/powerapps/maker/canvas-apps/working-with-variables#types-of-variables
             string code = input.Replace("\n", "").Replace("\r", "");
             MatchCollection matches;
@@ -537,6 +541,18 @@ private bool isWithinCodeComment(string code)
             return !(lastOpeningCommentBrackets == -1 || lastOpeningCommentBrackets < lastClosingCommentBrackets);
         }
 
+        private bool hasCodeComments(string code)
+        {
+            var regex = @"(@(?:""[^""]*"")+|""(?:[^""\n\\]+|\\.)*""|'(?:[^'\n\\]+|\\.)*')|//.*|/\*(?s:.*?)\*/";
+            return Regex.Match(code, regex).Success;
+        }
+
+        private string stripCodeComments(string code)
+        {
+            var regex = @"(@(?:""[^""]*"")+|""(?:[^""\n\\]+|\\.)*""|'(?:[^'\n\\]+|\\.)*')|//.*|/\*(?s:.*?)\*/";
+            return Regex.Replace(code, regex, "$1");
+        }
+
         private void parseAppDataSources(Stream appArchive)
         {
             ZipArchiveEntry dataSourceFile = ZipHelper.getFileFromZip(appArchive, "References\\DataSources.json");