Allow opening multiple instances of *Watch windows (max 10).

Author: awulkiew

Visual_Studio_2017/GraphicalDebugging/GeometryWatchCommand.cs

@@ -95,17 +95,7 @@ public static void Initialize(GraphicalWatchPackage package)
         /// <param name="e">The event args.</param>
         private void ShowToolWindow(object sender, EventArgs e)
         {
-            // Get the instance number 0 of this tool window. This window is single instance so this instance
-            // is actually the only one.
-            // The last flag is set to true so that if the tool window does not exists it will be created.
-            ToolWindowPane window = this.package.FindToolWindow(typeof(GeometryWatch), 0, true);
-            if ((null == window) || (null == window.Frame))
-            {
-                throw new NotSupportedException("Cannot create tool window");
-            }
-
-            IVsWindowFrame windowFrame = (IVsWindowFrame)window.Frame;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
+            Util.ShowWindow<GeometryWatch>(this.package, "Geometry Watch");
         }
     }
 }

Visual_Studio_2017/GraphicalDebugging/GraphicalWatchCommand.cs

@@ -95,17 +95,7 @@ public static void Initialize(GraphicalWatchPackage package)
         /// <param name="e">The event args.</param>
         private void ShowToolWindow(object sender, EventArgs e)
         {
-            // Get the instance number 0 of this tool window. This window is single instance so this instance
-            // is actually the only one.
-            // The last flag is set to true so that if the tool window does not exists it will be created.
-            ToolWindowPane window = this.package.FindToolWindow(typeof(GraphicalWatch), 0, true);
-            if ((null == window) || (null == window.Frame))
-            {
-                throw new NotSupportedException("Cannot create tool window");
-            }
-
-            IVsWindowFrame windowFrame = (IVsWindowFrame)window.Frame;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
+            Util.ShowWindow<GraphicalWatch>(this.package, "Graphical Watch");
         }
     }
 }

Visual_Studio_2017/GraphicalDebugging/GraphicalWatchPackage.cs

@@ -35,9 +35,9 @@ namespace GraphicalDebugging
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(GraphicalWatchPackage.PackageGuidString)]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
-    [ProvideToolWindow(typeof(GeometryWatch))]
-    [ProvideToolWindow(typeof(GraphicalWatch))]
-    [ProvideToolWindow(typeof(PlotWatch))]
+    [ProvideToolWindow(typeof(GeometryWatch), MultiInstances = true)]
+    [ProvideToolWindow(typeof(GraphicalWatch), MultiInstances = true)]
+    [ProvideToolWindow(typeof(PlotWatch), MultiInstances = true)]
     [ProvideOptionPage(typeof(GeneralOptionPage), "Graphical Debugging", "General", 0, 0, true)]
     [ProvideOptionPage(typeof(GeometryWatchOptionPage), "Graphical Debugging", "Geometry Watch", 0, 0, true)]
     [ProvideOptionPage(typeof(GraphicalWatchOptionPage), "Graphical Debugging", "Graphical Watch", 0, 0, true)]

Visual_Studio_2017/GraphicalDebugging/PlotWatchCommand.cs

@@ -95,17 +95,7 @@ public static void Initialize(GraphicalWatchPackage package)
         /// <param name="e">The event args.</param>
         private void ShowToolWindow(object sender, EventArgs e)
         {
-            // Get the instance number 0 of this tool window. This window is single instance so this instance
-            // is actually the only one.
-            // The last flag is set to true so that if the tool window does not exists it will be created.
-            ToolWindowPane window = this.package.FindToolWindow(typeof(PlotWatch), 0, true);
-            if ((null == window) || (null == window.Frame))
-            {
-                throw new NotSupportedException("Cannot create tool window");
-            }
-
-            IVsWindowFrame windowFrame = (IVsWindowFrame)window.Frame;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
+            Util.ShowWindow<PlotWatch>(this.package, "Plot Watch");
         }
     }
 }

Visual_Studio_2017/GraphicalDebugging/Util.cs

@@ -174,6 +174,32 @@ public static bool Tparams(string type, out string param1, out string param2)
             return true;
         }
 
+        public static void ShowWindow<WatchWindow>(Package package, string name)
+            where WatchWindow : ToolWindowPane
+        {
+            for (int i = 0; i < 10; ++i)
+            {
+                ToolWindowPane window = package.FindToolWindow(typeof(WatchWindow), i, false);
+                if (window == null)
+                {
+                    window = package.FindToolWindow(typeof(WatchWindow), i, true);
+                    if ((null == window) || (null == window.Frame))
+                    {
+                        throw new NotSupportedException("Cannot create " + name + " window");
+                    }
+
+                    /*if (i > 0)
+                    {
+                        window.Caption = window.Caption + ' ' + (i + 1);
+                    }*/
+
+                    IVsWindowFrame windowFrame = (IVsWindowFrame)window.Frame;
+                    Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(windowFrame.Show());
+                    break;
+                }
+            }
+        }
+
         public static T GetDialogPage<T>()
             where T : DialogPage
         {