New tests for parsing error when found generics in certains parts of code and fix for it.

Author: Neverbirth

External/Plugins/ASCompletion/Model/ASFileParser.cs

@@ -1225,7 +1225,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                                         }
                                         addChar = true;
                                     }
-                                    else
+                                    else if (foundColon)
                                     {
                                         evalToken = 0;
                                         inGeneric = true;

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

@@ -153,6 +153,8 @@
     <EmbeddedResource Include="Test Files\parser\haxe\AnonymousStructuresTest.hx" />
     <EmbeddedResource Include="Test Files\parser\haxe\MultipleVarsAtOnceTest.hx" />
     <EmbeddedResource Include="Test Files\generated\haxe\ImplementInterfaceNoMembersInsertSingleProperty.hx" />
+    <EmbeddedResource Include="Test Files\parser\haxe\NotGenericTest.hx" />
+    <EmbeddedResource Include="Test Files\parser\as3\CompletionErrorTest.as" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\External\Plugins\AS2Context\AS2Context.csproj">

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

@@ -68,6 +68,33 @@ public void ParseFile_OverrideFunction()
                 }
             }
 
+            [Test(Description = "Error #617")]
+            public void ParseFile_CompletionError()
+            {
+                using (var resourceFile = new TestFile("ASCompletion.Test_Files.parser.as3.CompletionErrorTest.as"))
+                {
+                    var plugin = Substitute.For<PluginMain>();
+                    plugin.MenuItems.Returns(new List<ToolStripItem>());
+                    var context = new AS3Context.Context(new AS3Context.AS3Settings());
+                    Context.ASContext.GlobalInit(plugin);
+                    Context.ASContext.Context = context;
+                    var model = context.GetCodeModel(File.ReadAllText(resourceFile.DestinationFile));
+
+                    Assert.AreEqual(2, model.Members.Count); // First member = function itself
+
+                    var funcMember = model.Members[0];
+                    Assert.AreEqual("init", funcMember.Name);
+                    Assert.AreEqual("void", funcMember.Type);
+                    Assert.AreEqual(FlagType.Function, funcMember.Flags & FlagType.Function);
+                    Assert.AreEqual("args", funcMember.Parameters[0].Name);
+                    Assert.AreEqual("String", funcMember.Parameters[0].Type);
+
+                    var infoMember = model.Members[1];
+                    Assert.AreEqual("info", infoMember.Name);
+                    Assert.AreEqual("NativeProcessStartupInfo", infoMember.Type);
+                    Assert.AreEqual(FlagType.Variable, infoMember.Flags & FlagType.Variable);
+                }
+            }
         }
 
         [TestFixture]
@@ -1468,6 +1495,31 @@ public void ParseFile_IdentifiersWithUnicodeChars()
                     Assert.AreEqual(8, memberModel.LineTo);
                 }
             }
+
+            [Test]
+            public void ParseFile_NotGeneric()
+            {
+                using (var resourceFile = new TestFile("ASCompletion.Test_Files.parser.haxe.NotGenericTest.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(3, model.Members.Count); // First member = function itself
+
+                    var funcMember = model.Members[0];
+                    Assert.AreEqual("init", funcMember.Name);
+                    Assert.AreEqual(FlagType.Function, funcMember.Flags & FlagType.Function);
+                    var member1 = model.Members[1];
+                    Assert.AreEqual("testA", member1.Name);
+                    Assert.AreEqual("Int", member1.Type);
+                    var member2 = model.Members[2];
+                    Assert.AreEqual("i1", member2.Name);
+                }
+            }
         }
     }
 }

Tests/External/Plugins/ASCompletion.Tests/Test Files/parser/as3/CompletionErrorTest.as

@@ -0,0 +1,6 @@
+function init(args:String):void 
+{
+	var info:NativeProcessStartupInfo = new NativeProcessStartupInfo;
+	info.arguments = Vector.<String>(args.split(" "));
+	info.
+}

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

@@ -0,0 +1,8 @@
+function init() 
+{
+	var testA:Int = 1;
+	if (testA<testB) trace("asd");
+	for (i1 in sprites)
+	{
+	}
+}