Accept R# suggestions

rubberduck-vba · Oct 26, 2018 · f5da764 · f5da764
1 parent 07b6d2e
commit f5da764
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/ImportCommand.cs
@@ -144,17 +144,10 @@ private string RewrittenModuleText((IParseTree parseTree, TokenStreamRewriter re
                 }
                 else
                 {
-                    if (HasOptionExplicit(startRule.parseTree, out var optionExplicitStmt))
-                    {
-                        startRule.rewriter.InsertBefore(optionExplicitStmt.SourceInterval.a, FolderAnnotationWithFolderName(updatedFolderName) + Environment.NewLine);
-                    }
-                    else
-                    {
-                        //var lastNewline = moduleDeclarations.GetDescendents<VBAParser.EndOfLineContext>().Last();
-                        //startRule.rewriter.InsertBefore(lastNewline.SourceInterval.a, FolderAnnotationWithFolderName(updatedFolderName) + Environment.NewLine);
-                        startRule.rewriter.InsertBefore(moduleDeclarations.SourceInterval.a, FolderAnnotationWithFolderName(updatedFolderName) + Environment.NewLine);
-
-                    }
+                    var index = HasOptionExplicit(startRule.parseTree, out var optionExplicitStmt)
+                        ? optionExplicitStmt.SourceInterval.a
+                        : moduleDeclarations.SourceInterval.a;
+                    startRule.rewriter.InsertBefore(index, FolderAnnotationWithFolderName(updatedFolderName) + Environment.NewLine);
                 }
             }
             else
@@ -187,7 +180,7 @@ private bool HasFolderAnnotation(IParseTree parseTree, out VBAParser.AnnotationC
             var startRuleContext = (ParserRuleContext)parseTree;
             var folderDescendents = startRuleContext.GetDescendents<VBAParser.AnnotationContext>()
                                         .Where(a => a.GetText().Contains(AnnotationType.Folder.ToString()));
-            if (folderDescendents.Count() > 0)
+            if (folderDescendents.Any())
             {
                 folderAnnotation = folderDescendents.ElementAt(0);
                 return true;
@@ -201,7 +194,7 @@ private bool HasOptionExplicit(IParseTree parseTree, out VBAParser.OptionExplici
         {
             var startRuleContext = (ParserRuleContext)parseTree;
             var optionExplicitDescendents = startRuleContext.GetDescendents<VBAParser.OptionExplicitStmtContext>();
-            if (optionExplicitDescendents.Count() > 0)
+            if (optionExplicitDescendents.Any())
             {
                 optionExplicit = optionExplicitDescendents.ElementAt(0);
                 return true;