Merge pull request #3529 from MDoerner/BringUserFormExportEncodingInLineWithTheVBE

Fixes text encoding issues affecting module exports. May cause issue #3461 to reappear.

Author: retailcoder

RetailCoder.VBE/Common/ModuleExporter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Reflection;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;

Rubberduck.Parsing/VBA/AttributeParser.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Threading;
 using Rubberduck.Parsing.PreProcessing;
 using Rubberduck.Parsing.Symbols.ParsingExceptions;
@@ -37,7 +38,17 @@ public AttributeParser(IModuleExporter exporter, Func<IVBAPreprocessor> preproce
                 // a document component without any code wouldn't be exported (file would be empty anyway).
                 return (null, null, new Dictionary<Tuple<string, DeclarationType>, Attributes>());
             }
-            var code = File.ReadAllText(path);
+
+            string code;
+            if (module.ComponentType == ComponentType.Document)
+            {
+                code = File.ReadAllText(path, Encoding.UTF8);   //We export the code from Documents as UTF8.
+            }
+            else
+            {
+                code = File.ReadAllText(path, Encoding.Default);    //The VBE exports encoded in the current ANSI codepage from the windows settings.
+            }
+
             try
             {
                 File.Delete(path);

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Text;
 using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SafeComWrappers.Office.Core.Abstract;
@@ -114,7 +115,8 @@ private void ExportUserFormModule(string path)
 
             var tempFile = ExportToTempFile();
             var tempFilePath = Directory.GetParent(tempFile).FullName;
-            var contents = File.ReadAllLines(tempFile, System.Text.Encoding.UTF7);
+            var fileEncoding = System.Text.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();
             var declarationsStartLine = nonAttributeLines + attributeLines + 1;
@@ -130,7 +132,7 @@ private void ExportUserFormModule(string path)
                        contents.Skip(declarationsStartLine + emptyLineCount - legitEmptyLineCount))
                                .ToArray();
             }
-            File.WriteAllLines(path, code);
+            File.WriteAllLines(path, code, fileEncoding);
 
             // LINQ hates this search, therefore, iterate the long way
             foreach (string line in contents)
@@ -165,8 +167,10 @@ private void ExportDocumentModule(string path)
             var lineCount = CodeModule.CountOfLines;
             if (lineCount > 0)
             {
+                //One cannot reimport document modules as such in the VBE; so we simply export and import the contents of the code pane.
+                //Because of this, it is OK, and actually preferable, to use the default UTF8 encoding.
                 var text = CodeModule.GetLines(1, lineCount);
-                File.WriteAllText(path, text);
+                File.WriteAllText(path, text, Encoding.UTF8);  
             }
         }
 

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBComponents.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -108,8 +109,6 @@ public void ImportSourceFile(string path)
                 return;
             }
 
-            var codeString = File.ReadAllText(path);
-            var codeLines = codeString.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
             if (ext == ComponentTypeExtensions.DocClassExtension)
             {
                 try
@@ -123,6 +122,8 @@ public void ImportSourceFile(string path)
 
                 var component = this[name];
                 component.CodeModule.Clear();
+
+                var codeString = File.ReadAllText(path, Encoding.UTF8);
                 component.CodeModule.AddFromString(codeString);
             }
             else if (ext == ComponentTypeExtensions.FormExtension)
@@ -138,6 +139,9 @@ public void ImportSourceFile(string path)
 
                 var component = this[name];
 
+                var codeString = File.ReadAllText(path, Encoding.Default);  //The VBE uses the current ANSI codepage from the windows settings to export and import.
+                var codeLines = codeString.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+
                 var nonAttributeLines = codeLines.TakeWhile(line => !line.StartsWith("Attribute")).Count();
                 var attributeLines = codeLines.Skip(nonAttributeLines).TakeWhile(line => line.StartsWith("Attribute")).Count();
                 var declarationsStartLine = nonAttributeLines + attributeLines + 1;