Merge pull request #6058 from Mo-Gul/next

chore: list annotations first (fixes #6054)

Author: retailcoder

Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoringAction.cs

@@ -117,7 +117,7 @@ private static string InterfaceModuleBody(ExtractInterfaceModel model)
             var interfaceAnnotation = new InterfaceAnnotation();
             var interfaceAnnotationText = $"'@{interfaceAnnotation.Name}{Environment.NewLine}";
 
-            return $"{optionExplicit}{Environment.NewLine}{folderAnnotationText}{exposedAnnotationText}{interfaceAnnotationText}{Environment.NewLine}{interfaceMembers}";
+            return $"{folderAnnotationText}{exposedAnnotationText}{interfaceAnnotationText}{Environment.NewLine}{optionExplicit}{Environment.NewLine}{interfaceMembers}";
         }
 
         private static string ExposedInterfaceHeader(string interfaceName)
@@ -358,7 +358,7 @@ private static void DeleteMembers(ExtractInterfaceModel model, IRewriteSession r
         private static bool IsParameterlessPropertyGet(ModuleBodyElementDeclaration member)
             => member.DeclarationType.Equals(DeclarationType.PropertyGet) && member.Parameters.Count == 0;
 
-        private static List<Declaration> SelectedDeclarations(ExtractInterfaceModel model) 
+        private static List<Declaration> SelectedDeclarations(ExtractInterfaceModel model)
             => model.SelectedMembers.Select(m => m.Member).ToList();
 
         private static List<Declaration> MembersWithExternalReferences(ExtractInterfaceModel model)
@@ -382,4 +382,4 @@ private static string ConstrainNewlineSequences(string content, int maxConsecuti
             return content;
         }
     }
-}
+}

Rubberduck.UnitTesting/CodeGeneration/TestCodeGeneratorStatics.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Rubberduck.Resources.UnitTesting;
 
 namespace Rubberduck.UnitTesting.CodeGeneration
@@ -116,12 +116,13 @@ End If
 #End If";
 
         private static string TestModuleTemplate =>
-$@"{{0}}Option Explicit
-Option Private Module
-
-'@TestModule
+$@"'@TestModule
 '@Folder(""{DefaultTestFolder}"")
 
+{{0}}
+Option Explicit
+Option Private Module
+
 {{1}}
 
 '@ModuleInitialize

RubberduckTests/Refactoring/ExtractInterface/ExtractInterfaceRefactoringActionTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -328,12 +328,12 @@ Public Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
 END
 Attribute VB_Name = ""IClass""
 Attribute VB_Exposed = True
-Option Explicit
-
 '@Folder(""MyFolder.MySubFolder"")
 '@Exposed
 '@Interface
 
+Option Explicit
+
 Public Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
 End Sub
 ";