Refactored a bit interface implementation. It's a bit faster, and fixes interface implementation in Haxe with a single property with get and set accessors.

Added a test to avoid possible future regressions.

Author: Neverbirth

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -3139,25 +3139,32 @@ private static void GenerateImplementation(ClassModel iType, ClassModel inClass,
                         {
                             decl = TemplateUtils.ToDeclarationWithModifiersString(method, TemplateUtils.GetTemplate("Property"));
 
-                            string getter = null, setter = null;
+                            string templateName = null;
+                            string metadata = null;
                             if (method.Parameters[0].Name == "get")
                             {
-                                getter = NewLine + TemplateUtils.ToDeclarationString(method, TemplateUtils.GetTemplate("Getter"));
-                                getter = TemplateUtils.ReplaceTemplateVariable(getter, "Modifiers", null);
-                                getter = TemplateUtils.ReplaceTemplateVariable(getter, "Member", method.Name);
-                                decl += getter;
-                            }
-
-                            if (method.Parameters[1].Name == "set")
-                            {
-                                setter = NewLine + TemplateUtils.ToDeclarationString(method, TemplateUtils.GetTemplate("Setter"));
-                                setter = TemplateUtils.ReplaceTemplateVariable(setter, "Modifiers", null);
-                                setter = TemplateUtils.ReplaceTemplateVariable(setter, "Member", method.Name);
-                                decl += setter;
+                                if (method.Parameters[1].Name == "set")
+                                {
+                                    templateName = "GetterSetter";
+                                    metadata = "@:isVar";
+                                }
+                                else
+                                    templateName = "Getter";
                             }
-
-                            string metadata = (getter != null && setter != null) ? "@:isVar" : null;
+                            else if (method.Parameters[1].Name == "set")
+                            {
+                                templateName = "Setter";
+                            }
+
                             decl = TemplateUtils.ReplaceTemplateVariable(decl, "MetaData", metadata);
+
+                            if (templateName != null)
+                            {
+                                var accessor = NewLine + TemplateUtils.ToDeclarationString(method, TemplateUtils.GetTemplate(templateName));
+                                accessor = TemplateUtils.ReplaceTemplateVariable(accessor, "Modifiers", null);
+                                accessor = TemplateUtils.ReplaceTemplateVariable(accessor, "Member", method.Name);
+                                decl += accessor;
+                            }
                         }
                         else
                             decl = TemplateUtils.ToDeclarationWithModifiersString(method, TemplateUtils.GetTemplate("Getter"));

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

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

Tests/External/Plugins/ASCompletion.Tests/Completion/ASGeneratorTests.cs

@@ -412,6 +412,43 @@ public void ImplementFromInterface_FullHaxe()
                 ASGenerator.GenerateJob(GeneratorJobType.ImplementInterface, null, classModel, null, null);
                 Assert.AreEqual(TestFile.ReadAllText("ASCompletion.Test_Files.generated.haxe.ImplementInterfaceNoMembers.hx"), sci.Text);
             }
+
+            [Test]
+            public void ImplementFromInterface_SinglePropertyHaxe()
+            {
+                var interfaceModel = new ClassModel { InFile = new FileModel(), Name = "ITest", Type = "ITest" };
+                interfaceModel.Members.Add(new MemberList
+                                           {
+                                               new MemberModel("x", "Int", FlagType.Getter, Visibility.Public)
+                                               {
+                                                   Parameters = new List<MemberModel>
+                                                   {
+                                                       new MemberModel {Name = "get"},
+                                                       new MemberModel {Name = "set"}
+                                                   }
+                                               }
+                                           });
+
+                var classModel = new ClassModel { InFile = new FileModel(), LineFrom = 2, LineTo = 2 };
+                var pluginMain = Substitute.For<PluginMain>();
+                var pluginUiMock = new PluginUIMock(pluginMain);
+                pluginMain.MenuItems.Returns(new List<System.Windows.Forms.ToolStripItem>());
+                pluginMain.Settings.Returns(new GeneralSettings());
+                pluginMain.Panel.Returns(pluginUiMock);
+                ASContext.GlobalInit(pluginMain);
+                ASContext.Context = Substitute.For<IASContext>();
+                ASContext.Context.ResolveType(null, null).ReturnsForAnyArgs(interfaceModel);
+                ASContext.Context.Features.voidKey = "Void";
+                ASContext.Context.CurrentModel.Returns(new FileModel { haXe = true });
+
+                var sci = GetBaseScintillaControl();
+                sci.Text = "package generatortest;\r\n\r\nclass ImplementTest{}";
+                sci.ConfigurationLanguage = "haxe";
+                doc.SciControl.Returns(sci);
+
+                ASGenerator.GenerateJob(GeneratorJobType.ImplementInterface, null, classModel, null, null);
+                Assert.AreEqual(TestFile.ReadAllText("ASCompletion.Test_Files.generated.haxe.ImplementInterfaceNoMembersInsertSingleProperty.hx"), sci.Text);
+            }
         }
     }
 }

Tests/External/Plugins/ASCompletion.Tests/Test Files/generated/haxe/ImplementInterfaceNoMembersInsertSingleProperty.hx

@@ -0,0 +1,16 @@
+package generatortest;
+
+class ImplementTest{
+	
+	/* INTERFACE ITest */
+	
+	@:isVar public var x(get, set):Int;
+	
+	function get_x():Int {
+		return x;
+	}
+	
+	function set_x(value:Int):Int {
+		return x = value;
+	}
+}