Merge pull request #6265 from Kristupasc/next

Export function now allows to choose a file name

Author: retailcoder

Rubberduck.Core/UI/CodeExplorer/Commands/ExportCommand.cs

@@ -101,7 +101,7 @@ public bool PromptFileNameAndExport(QualifiedModuleName qualifiedModule)
                 var component = ProjectsProvider.Component(qualifiedModule);
                 try
                 {
-                    var path = Path.GetDirectoryName(dialog.FileName);
+                    var path = dialog.FileName; // This makes it that the file is named not as the module name, but as the file name the user provided in the explorer.
                     component.ExportAsSourceFile(path, false, true); // skipped optional parameters interfere with mock setup
                 }
                 catch (Exception ex)

Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBComponent.cs

@@ -107,18 +107,27 @@ public bool HasDesigner
         /// <param name="folder">Destination folder for the resulting source file.</param>
         /// <param name="isTempFile">True if a unique temp file name should be generated. WARNING: filenames generated with this flag are not persisted.</param>
         /// <param name="specialCaseDocumentModules">If reimport of a document file is required later, it has to receive special treatment.</param>
-        public string ExportAsSourceFile(string folder, bool isTempFile = false, bool specialCaseDocumentModules = true)
+        public string ExportAsSourceFile(string folderOrPath, bool isTempFile = false, bool specialCaseDocumentModules = true)
         {
             //TODO: this entire thign needs to be reworked. IO is not the class' concern.
             //We probably need to leverage IPersistancePathProvider? ITempSourceFileHandler? 
             //Just not here.
-            var fullPath = isTempFile
-                ? _fileSystem.Path.Combine(folder, _fileSystem.Path.GetRandomFileName())
-                : _fileSystem.Path.Combine(folder, SafeName + Type.FileExtension());
+            string fullPath;
+            if (_fileSystem.Path.HasExtension(folderOrPath))
+            {
+                fullPath = folderOrPath;
+            }
+            else
+            {
+                fullPath = isTempFile
+                    ? _fileSystem.Path.Combine(folderOrPath, _fileSystem.Path.GetRandomFileName())
+                    : _fileSystem.Path.Combine(folderOrPath, SafeName + Type.FileExtension());
+            }
 
-            if (!_fileSystem.Directory.Exists(folder))
+            var dir = _fileSystem.Path.GetDirectoryName(fullPath);
+            if (!_fileSystem.Directory.Exists(dir))
             {
-                _fileSystem.Directory.CreateDirectory(folder);
+                _fileSystem.Directory.CreateDirectory(dir);
             }
 
             switch (Type)

RubberduckTests/CodeExplorer/CodeExplorerViewModelTests.cs

@@ -1858,7 +1858,8 @@ public void ExportModule_ExpectExecution()
             {
                 explorer.VbComponent.Setup(c => c.ExportAsSourceFile(folder, It.IsAny<bool>(), It.IsAny<bool>()));
                 explorer.ExecuteExportCommand();
-                explorer.VbComponent.Verify(c => c.ExportAsSourceFile(folder, false, true), Times.Once);
+                // Expected: ExportAsSourceFile will now be called with the full path, because the default filename was appended.
+                explorer.VbComponent.Verify(c => c.ExportAsSourceFile(path, false, true), Times.Once);
             }
         }