Merge pull request #2 from Renilac/dev_handle_unsupported_types

don't overwrite already existing files
better warning for incompatible types

Author: froque

README.md

@@ -12,3 +12,18 @@ http://www.codeproject.com/Articles/18954/Interop-Forms-Toolkit-Tutorial
 https://www.microsoft.com/en-us/download/details.aspx?id=3264
 
 https://interoptoolkitcs.codeplex.com (also imported to https://github.com/froque/interoptoolkitcs)
+
+### Info
+At present state this tool does not override files previously generated. 
+When forms with unsupported parameter types are found, the initialize method will be generated with a paramenter with the root type "Object".
+
+### How to Debug 
+
+Open project properties 
+- Start Action 
+	- choose "Start external program"
+	- and write path to visual studio. (Ex: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe")
+- On Command line arguments "/rootsuffix Exp"
+- Start application
+- Create project in newly opened VS window
+- Run tool

VSIXInteropFormsToolkit/GenerateInteropFormCommand.cs

@@ -36,6 +36,11 @@ internal sealed class GenerateInteropFormCommand
         /// </summary>
         private readonly Package package;
 
+        /// <summary>
+        /// Warning message presented flag for unsupported parameter types
+        /// </summary>
+        private bool DisplayWarningPresented = false;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="GenerateInteropFormCommand"/> class.
         /// Adds our command handlers for menu (commands must exist in the command table file)
@@ -164,6 +169,11 @@ private void CreateInteropFormProxiesForProject(Project currentAssembly, Project
         private void CreateInteropFormProxiesForDocument(List<CodeClass> interopFormClasses, Project currentAssembly, ProjectItem interopFormDoc)
         {
 
+            if (checkFileExists(currentAssembly, interopFormDoc))
+            {
+                return;
+            }
+
             if (interopFormClasses.Count <= 0)
                 return;
 
@@ -173,6 +183,7 @@ private void CreateInteropFormProxiesForDocument(List<CodeClass> interopFormClas
             namespace1.Name = "Interop";
             unit1.Namespaces.Add(namespace1);
             namespace1.Imports.Add(import1);
+            namespace1.Imports.Add(new CodeNamespaceImport("System"));
             foreach (CodeClass class1 in interopFormClasses)
             {
                 string text2 = class1.FullName;
@@ -258,9 +269,9 @@ private void CreateInteropFormProxiesForDocument(List<CodeClass> interopFormClas
                     declaration1.CustomAttributes.Add(new CodeAttributeDeclaration("System.Runtime.InteropServices.ComSourceInterfaces", new System.CodeDom.CodeAttributeArgument[] { new System.CodeDom.CodeAttributeArgument(new CodeTypeOfExpression(declaration2.Name)) }));
                 }
             }
-
-
+            
             ProjectItem generatedFolderItem = GetGeneratedFolderItem(currentAssembly);
+            
             FileInfo generatedItemInfo = getGeneratedItem(currentAssembly, generatedFolderItem, interopFormDoc);
 
             StreamWriter writer1 = new StreamWriter(generatedItemInfo.Create());
@@ -285,7 +296,7 @@ private FileInfo getGeneratedItem(Project currentAssembly, ProjectItem generated
             {
                 d.Create();
             }
-
+            
             FileInfo infoGeneratedItem = new FileInfo(fullName);
             foreach (ProjectItem item in generatedFolderItem.ProjectItems)
             {
@@ -382,12 +393,18 @@ private void AddInitializeMethodForConstructor(CodeTypeDeclaration proxyClass, C
             bool flag1 = false;
             foreach (CodeParameter parameter1 in method.Parameters)
             {
+                var paramType = parameter1.Type.AsFullName;
                 if (!this.IsSupported(parameter1.Type))
                 {
-                    this.DisplayWarning(String.Format(Resource.InitMethodErrMsg, parameter1.Type.AsFullName, parameter1.Name, parameter1.Type.AsFullName));
-                    return;
+                    if(!DisplayWarningPresented)
+                    {
+                        this.DisplayWarning(String.Format(Resource.InitMethodWarningMsg));
+                        DisplayWarningPresented = true;
+                    }
+                    paramType = "Object";
+
                 }
-                CodeParameterDeclarationExpression expression1 = new CodeParameterDeclarationExpression(parameter1.Type.AsFullName, parameter1.Name);
+                CodeParameterDeclarationExpression expression1 = new CodeParameterDeclarationExpression(paramType, parameter1.Name);
                 method1.Parameters.Add(expression1);
                 if (flag1)
                 {
@@ -712,6 +729,24 @@ private List<CodeClass> GetInteropFormClasses(Project assemblyProj, ProjectItem
             return list2;
         }
 
+        private bool checkFileExists(Project currentAssembly, ProjectItem interopFormDoc)
+        {
+            FileInfo infoProjectItem = new FileInfo(interopFormDoc.get_FileNames(0));
+            string name = infoProjectItem.Name.Replace(infoProjectItem.Extension, ".wrapper" + infoProjectItem.Extension);
+            string folder = Path.GetDirectoryName(infoProjectItem.FullName.Replace(Path.GetDirectoryName(currentAssembly.FullName), Path.GetDirectoryName(currentAssembly.FullName) 
+                            + @"\" + Resource.INTEROP_FORM_PROXY_FOLDER_NAME));
+            string fullName = folder + @"\" + name;
+
+            if (File.Exists(fullName))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         private DTE2 _applicationObject;
         private System.Type _attrTypeEvent;
         private System.Type _attrTypeForm;

VSIXInteropFormsToolkit/Resource.Designer.cs

@@ -174,4 +174,7 @@
   <data name="PropertyErrMsg" xml:space="preserve">
     <value>Type {0} is not supported. Property {1} will not be generated.</value>
   </data>
+  <data name="InitMethodWarningMsg" xml:space="preserve">
+    <value>Parameters with unsupported types found for initialize method, type Object will be used instead.</value>
+  </data>
 </root>