Test for multiple variables declared at once, and fixed them when they are initialized.

Author: Neverbirth

External/Plugins/ASCompletion/Model/ASFileParser.cs

@@ -1132,7 +1132,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                     hadValue = false;
                     valueLength = 0;
                     valueMember = null;
-                    if (!inParams && !(inConst && context != 0) && c1 != '{') continue;
+                    if (!inParams && !(inConst && context != 0) && c1 != '{' && c1 != ',') continue;
                     else length = 0;
                 }
 

Tests/External/Plugins/ASCompletion.Tests/ASCompletion.Tests.csproj

@@ -151,6 +151,7 @@
     <EmbeddedResource Include="Test Files\generated\haxe\ImplementInterfacePublicMemberBehindPrivate.hx" />
     <EmbeddedResource Include="Test Files\completion\as3\SimpleTest.as" />
     <EmbeddedResource Include="Test Files\parser\haxe\AnonymousStructuresTest.hx" />
+    <EmbeddedResource Include="Test Files\parser\haxe\MultipleVarsAtOnceTest.hx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\External\Plugins\AS2Context\AS2Context.csproj">

Tests/External/Plugins/ASCompletion.Tests/Model/ASFileParserTests.cs

@@ -1174,6 +1174,64 @@ public void ParseFile_FunctionTypesWithSubTypes()
                 }
             }
 
+            [Test]
+            public void ParseFile_MultipleVarsAtOnce()
+            {
+                using (var resourceFile = new TestFile("ASCompletion.Test_Files.parser.haxe.MultipleVarsAtOnceTest.hx"))
+                {
+                    var plugin = Substitute.For<PluginMain>();
+                    plugin.MenuItems.Returns(new List<ToolStripItem>());
+                    var context = new HaXeContext.Context(new HaXeContext.HaXeSettings());
+                    Context.ASContext.GlobalInit(plugin);
+                    Context.ASContext.Context = context;
+                    var model = context.GetCodeModel(File.ReadAllText(resourceFile.DestinationFile));
+
+                    Assert.AreEqual(7, model.Members.Count);
+
+                    var member = model.Members[1];
+                    Assert.AreEqual("var1", member.Name);
+                    Assert.AreEqual(2, member.LineFrom);
+                    Assert.AreEqual(2, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("Int", member.Type);
+
+                    member = model.Members[2];
+                    Assert.AreEqual("var2", member.Name);
+                    Assert.AreEqual(2, member.LineFrom);
+                    Assert.AreEqual(2, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("(Dynamic->Dynamic)->(Int->Int)", member.Type);
+
+                    member = model.Members[3];
+                    Assert.AreEqual("var3", member.Name);
+                    Assert.AreEqual(3, member.LineFrom);
+                    Assert.AreEqual(3, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("Float", member.Type);
+
+                    member = model.Members[4];
+                    Assert.AreEqual("var4", member.Name);
+                    Assert.AreEqual(3, member.LineFrom);
+                    Assert.AreEqual(3, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("String", member.Type);
+
+                    member = model.Members[5];
+                    Assert.AreEqual("var5", member.Name);
+                    Assert.AreEqual(4, member.LineFrom);
+                    Assert.AreEqual(4, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("Bool", member.Type);
+
+                    member = model.Members[6];
+                    Assert.AreEqual("var6", member.Name);
+                    Assert.AreEqual(5, member.LineFrom);
+                    Assert.AreEqual(5, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("Dynamic", member.Type);
+                }
+            }
+
             [Test]
             public void ParseFile_ComplexClass()
             {

Tests/External/Plugins/ASCompletion.Tests/Test Files/parser/haxe/MultipleVarsAtOnceTest.hx

@@ -0,0 +1,7 @@
+public function multipleVars():Void
+{
+	var var1:Int, var2:(Dynamic->Dynamic)->(Int->Int);
+	var var3:Float = 10, var4:String = "hello";
+	var var5:Bool = true, 
+		var6:Dynamic;
+}