Issue #4016 AddComponentCommand should use the active project name as…

… a default folder name
rubberduck-vba · Jul 10, 2018 · 6ce76af · 6ce76af
1 parent 362918e
commit 6ce76af
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs
@@ -9,7 +9,6 @@ namespace Rubberduck.UI.CodeExplorer.Commands
     public class AddComponentCommand
     {
         private readonly IVBE _vbe;
-        private const string DefaultFolder = "VBAProject";
 
         public AddComponentCommand(IVBE vbe)
         {
@@ -69,16 +68,22 @@ private Declaration GetDeclaration(CodeExplorerItemViewModel node)
 
             return (node as ICodeExplorerDeclarationViewModel)?.Declaration;
         }
-
+        private string GetActiveProjectName()
+        {
+            using (var activeProject = _vbe.ActiveVBProject)
+            {
+                return activeProject.Name;
+            }
+        }
         private string GetFolder(CodeExplorerItemViewModel node)
         {
             switch (node)
             {
                 case null:
-                    return DefaultFolder;
+                    return GetActiveProjectName();
                 case ICodeExplorerDeclarationViewModel declarationNode:
                     return string.IsNullOrEmpty(declarationNode.Declaration.CustomFolder)
-                        ? DefaultFolder
+                        ? GetActiveProjectName()
                         : declarationNode.Declaration.CustomFolder.Replace("\"", string.Empty);
                 default:
                     return ((CodeExplorerCustomFolderViewModel)node).FullPath;