Merge branch 'next' into Issue1908

Author: Hosch250

RetailCoder.VBE/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.2.*")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyVersion("2.0.4.*")]
+[assembly: AssemblyFileVersion("2.0.4.0")]

Rubberduck.VBEEditor/Extensions/VBComponentsExtensions.cs

@@ -54,17 +54,20 @@ public static void ImportSourceFile(this VBComponents components, string filePat
                     component.CodeModule.AddFromString(codeString);
                 }
             }
-            else if(ext != VBComponentExtensions.FormBinaryExtension)
+            else if (ext == VBComponentExtensions.FormExtension)
             {
-                components.Import(filePath);
-            }
+                VBComponent component;
+                try
+                {
+                    component = components.Item(name);
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    component = components.Add(vbext_ComponentType.vbext_ct_MSForm);
+                    component.Properties.Item("Caption").Value = name;
+                    component.Name = name;
+                }
 
-            if (ext == VBComponentExtensions.FormExtension)
-            {
-                var component = components.Item(name);
-                // note: vbeCode contains an extraneous line here:
-                //var vbeCode = component.CodeModule.Lines().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;
@@ -73,6 +76,10 @@ public static void ImportSourceFile(this VBComponents components, string filePat
                 component.CodeModule.Clear();
                 component.CodeModule.AddFromString(correctCodeString);
             }
+            else if(ext != VBComponentExtensions.FormBinaryExtension)
+            {
+                components.Import(filePath);
+            }
         }
     }
 }