Fixed an unhandled case with GetBodyStart (test pending).

Improvements to interface implementation.

Author: Neverbirth

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -949,9 +949,9 @@ static public void GenerateJob(GeneratorJobType job, MemberModel member, ClassMo
                     if (latest == null)
                         latest = FindLatest(0, 0, inClass, false, false);
 
-                    position = latest == null ? GetBodyStart(inClass.LineFrom, inClass.LineTo, sci) : latest.LineTo;
+                    position = latest == null ? GetBodyStart(inClass.LineFrom, inClass.LineTo, sci) : 
+                        sci.PositionFromLine(latest.LineTo + 1) - ((sci.EOLMode == 0) ? 2 : 1);
 
-                    position = sci.PositionFromLine(position + 1) - ((sci.EOLMode == 0) ? 2 : 1);
                     sci.SetSel(position, position);
                     GenerateImplementation(iType, inClass, sci);
                     break;
@@ -1890,13 +1890,15 @@ public static int GetBodyStart(int lineFrom, int lineTo, ScintillaControl Sci)
                     if (endLn == ln)
                     {
                         Sci.InsertText(funcBodyStart, Sci.NewLineMarker);
-                        Sci.SetLineIndentation(++ln, indent + Sci.Indent);
-                        funcBodyStart = Sci.LineIndentPosition(ln);
+                        // Do we want to set the line indentation no matter what? {\r\t\t\t\r} -> {\r\t\r}
+                        // Better results in most cases, but maybe highly unwanted in others?
+                        Sci.SetLineIndentation(++endLn, indent + Sci.Indent);
+                        funcBodyStart = Sci.LineIndentPosition(endLn);
                     }
                     if (c == '}')
                     {
                         Sci.InsertText(funcBodyStart, Sci.NewLineMarker);
-                        Sci.SetLineIndentation(ln + 1, indent);
+                        Sci.SetLineIndentation(endLn + 1, indent);
                     }
                     break;
                 }

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

@@ -157,7 +157,7 @@ public void GenerateJob_FieldFromParameterPublicScope()
         public void GenerateJob_ImplementFromInterface_FullAs3()
         {
             var interfaceModel = new Model.ClassModel { InFile = new Model.FileModel(), Name = "ITest" };
-            var classModel = new Model.ClassModel {InFile = new Model.FileModel()};
+            var classModel = new Model.ClassModel {InFile = new Model.FileModel(), LineTo = 1};
             var pluginMain = Substitute.For<PluginMain>();
             var pluginUiMock = new PluginUIMock(pluginMain);
             pluginMain.MenuItems.Returns(new List<System.Windows.Forms.ToolStripItem>());
@@ -169,19 +169,19 @@ public void GenerateJob_ImplementFromInterface_FullAs3()
             ASContext.Context.Features.voidKey = "void";
 
             var sci = GetBaseScintillaControl();
-            sci.Text = "package  test():void{\r\n\t\t\t}";
+            sci.Text = "package  test():void{\r\n\t}";
             sci.ConfigurationLanguage = "as3";
             doc.SciControl.Returns(sci);
 
             interfaceModel.Members.Add(new Model.MemberList
                                            {
-                                               new Model.MemberModel("getter", "String", Model.FlagType.Getter, Model.Visibility.Default),
-                                               new Model.MemberModel("setter", "void", Model.FlagType.Setter, Model.Visibility.Default)
+                                               new Model.MemberModel("getter", "String", Model.FlagType.Getter, Model.Visibility.Public),
+                                               new Model.MemberModel("setter", "void", Model.FlagType.Setter, Model.Visibility.Public)
                                                    {
                                                         Parameters = new List<Model.MemberModel> { new Model.MemberModel("value", "String", Model.FlagType.Variable, Model.Visibility.Default) }
                                                    },
-                                               new Model.MemberModel("testMethod", "Number", Model.FlagType.Function, Model.Visibility.Default),
-                                               new Model.MemberModel("testMethodArgs", "int", Model.FlagType.Function, Model.Visibility.Default)
+                                               new Model.MemberModel("testMethod", "Number", Model.FlagType.Function, Model.Visibility.Public),
+                                               new Model.MemberModel("testMethodArgs", "int", Model.FlagType.Function, Model.Visibility.Public)
                                                    {
                                                         Parameters = new List<Model.MemberModel> { new Model.MemberModel("arg", "Number", Model.FlagType.Variable, Model.Visibility.Default) }
                                                    }