Improved hxml parsing (ignores everything after --next when using raw hxml)

Fixed completion failing due to macros escaping. Fixes Chman/Snowkit-FD#8

Author: elsassph

External/Plugins/HaXeContext/Completion/HaxeComplete.cs

@@ -20,7 +20,11 @@ namespace HaXeContext
     internal class HaxeComplete
     {
         static readonly Regex reArg =
-            new Regex("^(-cp)\\s*([^\"'].*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            new Regex("^(-cp|-resource)\\s*([^\"'].*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        static readonly Regex reMacro =
+            new Regex("^(--macro)\\s*([^\"'].*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        static readonly Regex reQuote =
+            new Regex("([^\"])\"", RegexOptions.Compiled);
 
         static readonly Regex rePosition =
             new Regex("(?<path>.*?):(?<line>[0-9]*): (?<range>characters|lines) (?<start>[0-9]*)-(?<end>[0-9]*)",
@@ -105,7 +109,9 @@ string[] BuildHxmlArgs()
             // Build Haxe command
             var paths = ProjectManager.PluginMain.Settings.GlobalClasspaths.ToArray();
             var hxmlArgs = new List<String>(hxproj.BuildHXML(paths, "Nothing__", true));
+            RemoveComments(hxmlArgs);
             QuotePath(hxmlArgs);
+            EscapeMacros(hxmlArgs);
 
             // Get the current class edited (ensure completion even if class not reference in the project)
             var package = ASContext.Context.CurrentModel.Package;
@@ -131,6 +137,38 @@ string[] BuildHxmlArgs()
             return hxmlArgs.ToArray();
         }
 
+        private void RemoveComments(List<string> hxmlArgs)
+        {
+            for (int i = 0; i < hxmlArgs.Count; i++)
+            {
+                string arg = hxmlArgs[i];
+                if (!string.IsNullOrEmpty(arg))
+                {
+                    if (arg.StartsWith("#")) // commented line
+                        hxmlArgs[i] = "";
+                }
+            }
+        }
+
+        private void EscapeMacros(List<string> hxmlArgs)
+        {
+            for (int i = 0; i < hxmlArgs.Count; i++)
+            {
+                string arg = hxmlArgs[i];
+                if (!string.IsNullOrEmpty(arg))
+                {
+                    Match m = reMacro.Match(arg);
+                    if (m.Success)
+                        hxmlArgs[i] = m.Groups[1].Value + " " + EscapeQuotes(m.Groups[2].Value.Trim());
+                }
+            }
+        }
+
+        private string EscapeQuotes(string expr)
+        {
+            return reQuote.Replace(expr, "$1\\\"");
+        }
+
         void QuotePath(List<string> hxmlArgs)
         {
             for (int i = 0; i < hxmlArgs.Count; i++)
@@ -141,8 +179,6 @@ void QuotePath(List<string> hxmlArgs)
                     Match m = reArg.Match(arg);
                     if (m.Success)
                         hxmlArgs[i] = m.Groups[1].Value + " \"" + m.Groups[2].Value.Trim() + "\"";
-                    else if (arg.StartsWith("#")) // commented line
-                        hxmlArgs[i] = "";
                 }
             }
         }

External/Plugins/ProjectManager/Projects/Haxe/HaxeProject.cs

@@ -365,6 +365,9 @@ private void ParseHXML(string[] raw)
                 if (m.Success)
                 {
                     string op = m.Groups[1].Value;
+                    if (op == "-next")
+                        break; // ignore the rest
+
                     string value = m.Groups[2].Value.Trim();
                     switch (op)
                     {
@@ -385,7 +388,8 @@ private void ParseHXML(string[] raw)
                             int.TryParse(header[2], out MovieOptions.Fps);
                             MovieOptions.Background = header[3];
                             break;
-                        case "--connect": break; // ignore
+                        case "-connect": break; // ignore
+                        case "-each": break; // ignore
                         default:
                             // detect platform (-cpp output, -js output, ...)
                             var targetPlatform = FindPlatform(op);
@@ -395,7 +399,8 @@ private void ParseHXML(string[] raw)
                                 haxeTarget = targetPlatform.HaxeTarget;
                                 output = value;
                             }
-                            else add.Add(line); break;
+                            else add.Add(line); 
+                            break;
                     }
                 }
             }