logic: vs plugin fixes

Can now deal with single projects and solutions with non-c/c++ projects bug id = 32
2016-03-05 18:18:54 +01:00
parent c9f1f65ba4
commit 5cdaafc6de
8 changed files with 247 additions and 18 deletions
@@ -143,23 +143,30 @@ namespace CoatiSoftware.CoatiPlugin

        void OnSolutionOpened()
        {
-            DTE dte = (DTE)GetService(typeof(DTE));
-            List<String> languages = SolutionUtility.GetSolutionLanguages(dte);
-
-            bool enable = true;
-            foreach (String language in languages)
+            try
            {
-                if(language != CodeModelLanguageConstants.vsCMLanguageVC
-                    && language != CodeModelLanguageConstants.vsCMLanguageMC)
+                DTE dte = (DTE)GetService(typeof(DTE));
+                List<String> languages = SolutionUtility.GetSolutionLanguages(dte);
+
+                bool enable = false;
+                foreach (String language in languages)
                {
-                    enable = false;
+                    if (language == CodeModelLanguageConstants.vsCMLanguageVC
+                        || language == CodeModelLanguageConstants.vsCMLanguageMC)
+                    {
+                        enable = true;
+                    }
+                }
+
+                if (enable)
+                {
+                    _menuItemSetActiveToken.Enabled = true;
+                    _menuItemCreateProject.Enabled = true;
                }
            }
-
-            if(enable)
+            catch(Exception e)
            {
-                _menuItemSetActiveToken.Enabled = true;
-                _menuItemCreateProject.Enabled = true;
+                DisplayMessage("Error", e.Message);
            }
        }

@@ -208,9 +215,26 @@ namespace CoatiSoftware.CoatiPlugin
                {
                    string solutionName = SolutionUtility.GetSolutionPath(dte);

-                    string message = NetworkProtocolUtility.createCreateProjectMessage(solutionName);
+                    if(solutionName == "")
+                    {
+                        List<string> items = SolutionUtility.GetSolutionProjectsFullNames(dte);

-                    AsynchronousClient.Send(message);
+                        if(items.Count > 0)
+                        {
+                            solutionName = items[0];
+                        }
+                    }
+
+                    if(solutionName.Length > 0)
+                    {
+                        string message = NetworkProtocolUtility.createCreateProjectMessage(solutionName);
+
+                        AsynchronousClient.Send(message);
+                    }
+                    else
+                    {
+                        DisplayMessage("Coati", "Can not create a Coati Project. Please check whether your VS solution is a valid C or C++ solution and is saved.");
+                    }
                }
            }
        }
@@ -31,6 +31,21 @@ namespace CoatiSoftware.CoatiPlugin
            return projectNames;
        }

+        public static List<String> GetSolutionProjectsFullNames(DTE dte)
+        {
+            List<String> projectNames = new List<String>();
+
+            EnvDTE.Solution solution = dte.Solution;
+            EnvDTE.Projects projects = solution.Projects;
+
+            foreach (EnvDTE.Project project in projects)
+            {
+                projectNames.Add(project.FullName);
+            }
+
+            return projectNames;
+        }
+
        public static List<List<String>> GetSolutionProjectItems(DTE dte)
        {
            List<List<String>> projectItems = new List<List<String>>();
@@ -67,13 +82,23 @@ namespace CoatiSoftware.CoatiPlugin

            foreach (EnvDTE.Project project in projects)
            {
-                string language = project.CodeModel.Language;
-                languages.Add(language);
+                if (project.CodeModel != null)
+                {
+                    string language = project.CodeModel.Language;
+                    languages.Add(language);
+                }
            }

            languages = languages.Distinct().ToList();

            return languages;
        }
+
+        public static bool GetSolutionIsSaved(DTE dte)
+        {
+            EnvDTE.Solution solution = dte.Solution;
+
+            return solution.Saved;
+        }
    }
 }