Merge pull request #2795 from retailcoder/rd-next

last-minute fixes

Author: retailcoder

RetailCoder.VBE/Settings/CodeInspectionConfigProvider.cs

@@ -71,7 +71,7 @@ public HashSet<CodeInspectionSetting> GetDefaultCodeInspections()
                 new CodeInspectionSetting("ObsoleteCommentSyntaxInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
                 new CodeInspectionSetting("OptionExplicitInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error),
                 new CodeInspectionSetting("VariableTypeNotDeclaredInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
-                new CodeInspectionSetting("MalformedAnnotationInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error)
+                new CodeInspectionSetting("MissingAnnotationArgumentInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error)
             };
         }
     }

RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs

@@ -29,10 +29,11 @@ public AddTestModuleCommand(IVBE vbe, RubberduckParserState state, IGeneralConfi
             _configLoader = configLoader;
         }
 
+        private const string FolderAnnotation = "'@Folder(\"Tests\")\r\n";
         private const string ModuleLateBinding = "Private Assert As Object\r\n";
         private const string ModuleEarlyBinding = "Private Assert As New Rubberduck.{0}AssertClass\r\n";
 
-        private const string TestModuleEmptyTemplate = "'@TestModule\r\n{0}\r\n'@Folder(\"Tests\")\r\n";
+        private const string TestModuleEmptyTemplate = "'@TestModule\r\n{0}\r\n{1}\r\n";
 
         private const string ModuleInitLateBinding = "Set Assert = CreateObject(\"Rubberduck.{0}AssertClass\")\r\n";
         private readonly string _moduleInit = string.Concat(
@@ -66,7 +67,7 @@ private string GetTestModule(IUnitTestSettings settings)
                 ? string.Format(ModuleEarlyBinding, assertClass)
                 : ModuleLateBinding;
 
-            var formattedModuleTemplate = string.Format(TestModuleEmptyTemplate, moduleBinding);
+            var formattedModuleTemplate = string.Format(TestModuleEmptyTemplate, FolderAnnotation, moduleBinding);
 
             if (settings.ModuleInit)
             {