Fixed function types in function return types.

Author: Neverbirth

External/Plugins/ASCompletion/Model/ASFileParser.cs

@@ -1432,6 +1432,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                         else if (c1 == '(')
                         {
                             if (!inValue && context == FlagType.Variable && curToken.Text != "catch" && (!haXe || curToken.Text != "for"))
+                            {
                                 if (haXe && curMember != null && valueLength == 0)
                                 {
                                     if (!foundColon && !inType) // Haxe properties
@@ -1447,6 +1448,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                                     }
                                 }
                                 else context = 0;
+                            }
 
                             // beginning of method parameters
                             if (context == FlagType.Function)
@@ -1547,6 +1549,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                             context = 0;
                             if (inEnum) context = FlagType.Enum;
                             else if (inTypedef) context = FlagType.TypeDef;
+                            else context = FlagType.Variable;
                             modifiers = 0;
                             inParams = false;
                             curMember = curMethod;

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

@@ -1139,6 +1139,7 @@ public void ParseFile_FunctionTypesWithSubTypes()
                     Assert.AreEqual("functionTypesWithSubTypes", member.Name);
                     Assert.AreEqual(FlagType.Function, member.Flags & FlagType.Function);
                     Assert.AreEqual(3, member.Parameters.Count);
+                    Assert.AreEqual("((Dynamic->Dynamic)->Int)->Int", member.Type);
                     var arg = member.Parameters[0];
                     Assert.AreEqual("functionTypeArg", arg.Name);
                     Assert.AreEqual("(Dynamic->Dynamic)->Dynamic", arg.Type);
@@ -1162,7 +1163,7 @@ public void ParseFile_FunctionTypesWithSubTypes()
                     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);
+                    Assert.AreEqual("((Dynamic->Dynamic)->Int)->Int", member.Type);
 
                     member = model.Members[3];
                     Assert.AreEqual("functionType3", member.Name);

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

@@ -1,6 +1,6 @@
-public function functionTypesWithSubTypes(functionTypeArg:(Dynamic->Dynamic)->Dynamic, functionTypeArg2:(Dynamic->Dynamic)->(Int->Int) = null, test2:String):((Dynamic->Dynamic)->Int->)Int
+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 functionType2:((Dynamic->Dynamic)->Int)->Int;
 	var functionType3:(Dynamic->Dynamic)->(Int->Int);
 }