[Haxe][FileParser] Added test for #2381

External/Plugins/HaXeContext/Model/FileParser.cs

@@ -793,6 +793,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                         && curClass.Flags is var f && (f & FlagType.Extern) == 0 && (f & FlagType.TypeDef) == 0 && (f & FlagType.Interface) == 0)
                     {
                         inFunction = true;
+                        inType = false;
                         i -= 2;
                         continue;
                     }
@@ -1014,6 +1015,11 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                             {
                                 context = 0;
                             }
+                            else if (curMember != null && (curMember.Flags & FlagType.Function) != 0 && length == 0 && !foundColon)
+                            {
+                                inType = false;
+                                braceCount++;
+                            }
                             else braceCount++; // ignore block
                         }
                         // end of block

Tests/External/Plugins/HaxeContext.Tests/HaxeContext.Tests.csproj

@@ -789,6 +789,7 @@
     <EmbeddedResource Include="Test Files\parser\Issue2377_2.hx" />
     <EmbeddedResource Include="Test Files\completion\BeforeOnCharAndReplaceTextIssue2358_1.hx" />
     <EmbeddedResource Include="Test Files\parser\Issue2381_1.hx" />
+    <EmbeddedResource Include="Test Files\parser\Issue2381_2.hx" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Tests/External/Plugins/HaxeContext.Tests/Model/FileParserTests.cs

@@ -333,6 +333,16 @@ static IEnumerable<TestCaseData> Issue2381TestCases
                     })
                     .SetName("Issue 2381. Case 1")
                     .SetDescription("https://github.com/fdorg/flashdevelop/issues/2381");
+                yield return new TestCaseData("Issue2381_2")
+                    .Returns(new List<MemberModel>
+                    {
+                        new MemberModel("foo", "String->String", FlagType.Access | FlagType.Dynamic | FlagType.Getter | FlagType.Setter, Visibility.Public),
+                        new MemberModel("get_foo", "String->String", FlagType.Dynamic | FlagType.Function, Visibility.Private),
+                        new MemberModel("set_foo", "String->String", FlagType.Dynamic | FlagType.Function, Visibility.Private),
+                        new MemberModel("checkLength", "Bool", FlagType.Dynamic | FlagType.Function, Visibility.Private),
+                    })
+                    .SetName("Issue 2381. Case 2")
+                    .SetDescription("https://github.com/fdorg/flashdevelop/issues/2381");
             }
         }
 

Tests/External/Plugins/HaxeContext.Tests/Test Files/parser/Issue2381_2.hx

@@ -0,0 +1,16 @@
+package;
+class Foo2381_1 {
+	@:isVar public var foo(get, set):String->String;
+
+	function get_foo():String->String {
+		return foo;
+	}
+
+	function set_foo(value:String->String):String->String {
+		return foo = value;
+	}
+
+	function checkLength(length:Int):Bool {
+		return length <= 0x7FFFFFFF;
+	}
+}