Merge updated export handling for document modules

Author: Vogel612

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

@@ -100,7 +100,8 @@ public bool PromptFileNameAndExport(QualifiedModuleName qualifiedModule)
                 var component = ProjectsProvider.Component(qualifiedModule);
                 try
                 {
-                    component.Export(dialog.FileName);
+                    var path = System.IO.Path.GetDirectoryName(dialog.FileName);
+                    component.ExportAsSourceFile(path, false, true); // skipped optional parameters interfere with mock setup
                 }
                 catch (Exception ex)
                 {

Rubberduck.Core/UI/Command/ComCommands/ExportAllCommand.cs

@@ -107,11 +107,9 @@ private void Export(IVBProject project)
 
             // If .GetDirectoryName is passed an empty string for a RootFolder, 
             // it defaults to the Documents library (Win 7+) or equivalent.
-            var path = string.Empty;
-            if (!string.IsNullOrWhiteSpace(project.FileName))
-            {
-                path = Path.GetDirectoryName(project.FileName);
-            }
+            var path = string.IsNullOrWhiteSpace(project.FileName)
+                ? string.Empty
+                : Path.GetDirectoryName(project.FileName);
 
             using (var _folderBrowser = _factory.CreateFolderBrowser(desc, true, path))
             {

Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBComponent.cs

@@ -20,7 +20,7 @@ public interface IVBComponent : ISafeComWrapper, IEquatable<IVBComponent>
         IWindow DesignerWindow();
         void Activate();
         void Export(string path);
-        string ExportAsSourceFile(string folder, bool tempFile = false, bool specialCaseDocumentModules = true);
+        string ExportAsSourceFile(string folder, bool isTempFile = false, bool specialCaseDocumentModules = true);
         int FileCount { get; }
         string GetFileName(short index);
         IVBProject ParentProject { get; }

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

@@ -123,9 +123,9 @@ public bool HasDesigner
         /// Exports the component to the folder. The file name matches the component name and file extension is based on the component's type.
         /// </summary>
         /// <param name="folder">Destination folder for the resulting source file.</param>
-        /// <param name="tempFile">True if a unique temp file name should be generated. WARNING: filenames generated with this flag are not persisted.</param>
-        /// <param name="specialCaseDocumentModules">If reimpot of a document file is required later, it has to receive special treatment.</param>
-        public string ExportAsSourceFile(string folder, bool tempFile = false, bool specialCaseDocumentModules = true)
+        /// <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)
         {
             throw new NotSupportedException("Export as source file is not supported in VB6");
         }

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

@@ -95,14 +95,14 @@ public bool HasDesigner
         /// Exports the component to the folder. The file name matches the component name and file extension is based on the component's type.
         /// </summary>
         /// <param name="folder">Destination folder for the resulting source file.</param>
-        /// <param name="tempFile">True if a unique temp file name should be generated. WARNING: filenames generated with this flag are not persisted.</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 tempFile = false, bool specialCaseDocumentModules = true)
+        public string ExportAsSourceFile(string folder, 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 = tempFile
+            var fullPath = isTempFile
                 ? Path.Combine(folder, Path.GetRandomFileName())
                 : Path.Combine(folder, SafeName + Type.FileExtension());
 
@@ -160,7 +160,7 @@ private void ExportUserFormModule(string path)
 
             var tempFile = ExportToTempFile();
             var tempFilePath = Directory.GetParent(tempFile).FullName;
-            var fileEncoding = System.Text.Encoding.Default;    //We use the current ANSI codepage because that is what the VBE does.
+            var fileEncoding = Encoding.Default;    //We use the current ANSI codepage because that is what the VBE does.
             var contents = File.ReadAllLines(tempFile, fileEncoding);
             var nonAttributeLines = contents.TakeWhile(line => !line.StartsWith("Attribute")).Count();
             var attributeLines = contents.Skip(nonAttributeLines).TakeWhile(line => line.StartsWith("Attribute")).Count();

RubberduckTests/CodeExplorer/CodeExplorerViewModelTests.cs

@@ -1847,14 +1847,17 @@ public void ReplaceProjectContentsFromFiles_Cancel()
         [Test]
         public void ExportModule_ExpectExecution()
         {
-            const string path = @"C:\Users\Rubberduck\Desktop\StdModule1.bas";
+            const string folder = @"C:\Users\Rubberduck\Desktop";
+            const string filename = "StdModule1.bas";
+            var path = Path.Combine(folder, filename);
 
             using (var explorer = new MockedCodeExplorer(ProjectType.HostProject)
                 .ConfigureSaveDialog(path, DialogResult.OK)
                 .SelectFirstModule())
             {
+                explorer.VbComponent.Setup(c => c.ExportAsSourceFile(folder, It.IsAny<bool>(), It.IsAny<bool>()));
                 explorer.ExecuteExportCommand();
-                explorer.VbComponent.Verify(c => c.Export(path), Times.Once);
+                explorer.VbComponent.Verify(c => c.ExportAsSourceFile(folder, false, true), Times.Once);
             }
         }
 
@@ -1868,8 +1871,11 @@ public void ExportModule_CancelPressed_ExpectNoExecution()
                 .ConfigureSaveDialog(path, DialogResult.Cancel)
                 .SelectFirstModule())
             {
+                explorer.VbComponent.Setup(c => c.Export(path));
+                explorer.VbComponent.Setup(c => c.ExportAsSourceFile(path, It.IsAny<bool>(), It.IsAny<bool>()));
                 explorer.ExecuteExportCommand();
                 explorer.VbComponent.Verify(c => c.Export(path), Times.Never);
+                explorer.VbComponent.Verify(c => c.ExportAsSourceFile(path, It.IsAny<bool>(), It.IsAny<bool>()), Times.Never);
             }
         }