Unit test for anonymous structures, and more complex unit test for function types with subtypes.

Author: Neverbirth

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

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

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

@@ -7,9 +7,9 @@
 
 namespace ASCompletion.Model
 {
-    [TestFixture]
     class ASFileParserTests
     {
+        [TestFixture]
         public class As3
         {
             [Test]
@@ -70,6 +70,7 @@ public void ParseFile_OverrideFunction()
 
         }
 
+        [TestFixture]
         public class Haxe
         {
             [Test]
@@ -1057,6 +1058,37 @@ public void ParseFile_ImportAliases()
                 }
             }
 
+            [Test]
+            public void ParseFile_AnonymousStructures()
+            {
+                using (var resourceFile = new TestFile("ASCompletion.Test_Files.parser.haxe.AnonymousStructuresTest.hx"))
+                {
+                    var srcModel = new FileModel(resourceFile.DestinationFile);
+                    srcModel.Context = new HaXeContext.Context(new HaXeContext.HaXeSettings());
+                    var model = ASFileParser.ParseFile(srcModel);
+
+                    Assert.AreEqual(1, model.Classes.Count);
+
+                    var classModel = model.Classes[0];
+
+                    Assert.AreEqual(2, classModel.Members.Count);
+
+                    var member = classModel.Members[0];
+                    Assert.AreEqual("start", member.Name);
+                    Assert.AreEqual(1, member.LineFrom);
+                    Assert.AreEqual(1, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("{x:Int, y:Int}", member.Type);
+
+                    member = classModel.Members[1];
+                    Assert.AreEqual("target", member.Name);
+                    Assert.AreEqual(2, member.LineFrom);
+                    Assert.AreEqual(2, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("{x:Int, y:Int}", member.Type);
+                }
+            }
+
             [Test]
             public void ParseFile_FunctionTypes()
             {
@@ -1075,12 +1107,14 @@ public void ParseFile_FunctionTypes()
                     Assert.AreEqual("functionType", member.Name);
                     Assert.AreEqual(2, member.LineFrom);
                     Assert.AreEqual(2, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
                     Assert.AreEqual("Dynamic->Dynamic", member.Type);
 
                     member = model.Members[2];
                     Assert.AreEqual("functionType2", member.Name);
                     Assert.AreEqual(3, member.LineFrom);
                     Assert.AreEqual(3, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
                     Assert.AreEqual("Int->Int->Int", member.Type);
                 }
             }
@@ -1099,19 +1133,43 @@ public void ParseFile_FunctionTypesWithSubTypes()
                     Context.ASContext.Context = context;
                     var model = context.GetCodeModel(File.ReadAllText(resourceFile.DestinationFile));
 
-                    Assert.AreEqual(3, model.Members.Count);
+                    Assert.AreEqual(4, model.Members.Count);
 
                     var member = model.Members[0];
+                    Assert.AreEqual("functionTypesWithSubTypes", member.Name);
+                    Assert.AreEqual(FlagType.Function, member.Flags & FlagType.Function);
+                    Assert.AreEqual(3, member.Parameters.Count);
+                    var arg = member.Parameters[0];
+                    Assert.AreEqual("functionTypeArg", arg.Name);
+                    Assert.AreEqual("(Dynamic->Dynamic)->Dynamic", arg.Type);
+                    arg = member.Parameters[1];
+                    Assert.AreEqual("functionTypeArg2", arg.Name);
+                    Assert.AreEqual("(Dynamic->Dynamic)->(Int->Int)", arg.Type);
+                    Assert.AreEqual("null", arg.Value);
+                    arg = member.Parameters[2];
+                    Assert.AreEqual("test2", arg.Name);
+                    Assert.AreEqual("String", arg.Type);
+
+                    member = model.Members[1];
                     Assert.AreEqual("functionType", member.Name);
                     Assert.AreEqual(2, member.LineFrom);
                     Assert.AreEqual(2, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
                     Assert.AreEqual("(Dynamic->Dynamic)->Dynamic", member.Type);
 
-                    member = model.Members[1];
+                    member = model.Members[2];
                     Assert.AreEqual("functionType2", member.Name);
                     Assert.AreEqual(3, member.LineFrom);
                     Assert.AreEqual(3, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
                     Assert.AreEqual("((Dynamic->Dynamic)->Int->)Int", member.Type);
+
+                    member = model.Members[3];
+                    Assert.AreEqual("functionType3", member.Name);
+                    Assert.AreEqual(4, member.LineFrom);
+                    Assert.AreEqual(4, member.LineTo);
+                    Assert.AreEqual(FlagType.Variable, member.Flags & FlagType.Variable);
+                    Assert.AreEqual("(Dynamic->Dynamic)->(Int->Int)", member.Type);
                 }
             }
 

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

@@ -0,0 +1,4 @@
+class Path {
+    var start : { x : Int, y : Int };
+    var target : { x : Int, y : Int };
+}

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

@@ -1,5 +1,6 @@
-public function new()
+public function functionTypesWithSubTypes(functionTypeArg:(Dynamic->Dynamic)->Dynamic, functionTypeArg2:(Dynamic->Dynamic)->(Int->Int) = null, test2:String):((Dynamic->Dynamic)->Int->)Int
 {
 	var functionType:(Dynamic->Dynamic)->Dynamic;
 	var functionType2:((Dynamic->Dynamic)->Int->)Int;
+	var functionType3:(Dynamic->Dynamic)->(Int->Int);
 }