Adress Review Concerns

Vogel612 · Vogel612 · commit fac0f14da652 · 2018-06-06T21:36:05.000+02:00
diff --git a/Rubberduck.CodeAnalysis/Inspections/Inspector.cs b/Rubberduck.CodeAnalysis/Inspections/Inspector.cs
@@ -18,7 +18,6 @@
 using Rubberduck.UI.Inspections;
 using Rubberduck.VBEditor;
 using Rubberduck.Resources;
-using Rubberduck.CodeAnalysis.Inspections;
 
 namespace Rubberduck.Inspections
 {
@@ -55,6 +54,7 @@ private void UpdateInspectionSeverity(Configuration config)
                         if (inspection.Name == setting.Name)
                         {
                             inspection.Severity = setting.Severity;
+                            break;
                         }
                     }
                 }
diff --git a/Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs b/Rubberduck.Core/CodeAnalysis/CodeMetrics/CodeMetricsViewModel.cs
@@ -127,6 +127,10 @@ public CodeExplorerItemViewModel SelectedItem
             get => _selectedItem;
             set
             {
+                if (_selectedItem == value)
+                {
+                    return;
+                }
                 _selectedItem = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(Metrics));
diff --git a/Rubberduck.Core/UI/CodeExplorer/CodeExplorerWindow.cs b/Rubberduck.Core/UI/CodeExplorer/CodeExplorerWindow.cs
@@ -9,8 +9,8 @@ namespace Rubberduck.UI.CodeExplorer
     [ExcludeFromCodeCoverage]
     public partial class CodeExplorerWindow : UserControl, IDockableUserControl
     {
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        private const string ClassId = "C5318B59-172F-417C-88E3-B377CDA2D809";
+        string IDockableUserControl.ClassId { get { return ClassId; } }
         string IDockableUserControl.Caption { get { return CodeExplorerUI.CodeExplorerDockablePresenter_Caption; } }
 
         private CodeExplorerWindow()
diff --git a/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs b/Rubberduck.Core/UI/CodeMetrics/CodeMetricsWindow.cs
@@ -2,15 +2,14 @@
 using System.Windows.Forms;
 using Rubberduck.Resources;
 using Rubberduck.CodeAnalysis.CodeMetrics;
-using System;
 
 namespace Rubberduck.UI.CodeMetrics
 {
     [ExcludeFromCodeCoverage]
     public partial class CodeMetricsWindow : UserControl, IDockableUserControl
     {
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        private const string ClassId = "C5318B5A-172F-417C-88E3-B377CDA2D809";
+        string IDockableUserControl.ClassId => ClassId;
         string IDockableUserControl.Caption => RubberduckUI.CodeMetricsDockablePresenter_Caption;
 
         private CodeMetricsWindow()
diff --git a/Rubberduck.Core/UI/Controls/SearchResultWindow.cs b/Rubberduck.Core/UI/Controls/SearchResultWindow.cs
@@ -22,8 +22,10 @@ public ISearchResultsWindowViewModel ViewModel
             }
         }
 
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        public string ClassId
+        {
+            get { return "BFD04A86-CACA-4F95-9656-A0BF7D3AE254"; }
+        }
 
         public string Caption
         {
diff --git a/Rubberduck.Core/UI/Converters/DeclarationToMemberSignatureConverter.cs b/Rubberduck.Core/UI/Converters/DeclarationToMemberSignatureConverter.cs
@@ -19,7 +19,7 @@ public class Parameter
 
             public override string ToString()
             {
-                return $"{ParamAccessibility} {ParamName} As {ParamType}";
+                return $"{ParamAccessibility} {ParamName} {Tokens.As} {ParamType}";
             }
         }
 
@@ -64,7 +64,7 @@ private List<Parameter> GetMemberParameters(Declaration member)
                 return new List<Parameter>();
             }
 
-            if (GetMethodType(member) == "Property Get")
+            if (GetMethodType(member) == $"{Tokens.Property} {Tokens.Get}")
             {
                 parameters = parameters.Take(parameters.Count - 1).ToList();
             }
diff --git a/Rubberduck.Core/UI/DockableToolwindowPresenter.cs b/Rubberduck.Core/UI/DockableToolwindowPresenter.cs
@@ -53,7 +53,7 @@ private IWindow CreateToolWindow(IDockableUserControl control)
             {
                 using (var windows = _vbe.Windows)
                 {
-                    var info = windows.CreateToolWindow(_addin, RubberduckProgId.DockableWindowHostProgId, control.Caption, control.GuidIdentifier);
+                    var info = windows.CreateToolWindow(_addin, RubberduckProgId.DockableWindowHostProgId, control.Caption, control.ClassId);
                     _userControlObject = info.UserControl;
                     toolWindow = info.ToolWindow;
                 }
diff --git a/Rubberduck.Core/UI/IDockableUserControl.cs b/Rubberduck.Core/UI/IDockableUserControl.cs
@@ -3,9 +3,9 @@
     public interface IDockableUserControl
     {
         /// <summary>
-        /// Gets a string containing some semi-random GUID to use for positional registration
+        /// Gets a string containing the GUID with which the class is registered.
         /// </summary>
-        string GuidIdentifier { get; }
+        string ClassId { get; }
 
         /// <summary>
         /// Gets a string containing the caption of the toolwindow.
diff --git a/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs b/Rubberduck.Core/UI/Inspections/InspectionResultsWindow.cs
@@ -1,13 +1,12 @@
-﻿using System;
-using System.Windows.Forms;
+﻿using System.Windows.Forms;
 using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Inspections
 {
     public partial class InspectionResultsWindow : UserControl, IDockableUserControl
     {
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        private const string ClassId = "D3B2A683-9856-4246-BDC8-6B0795DC875B";
+        string IDockableUserControl.ClassId { get { return ClassId; } }
         string IDockableUserControl.Caption { get { return RubberduckUI.CodeInspections; } }
         
         private InspectionResultsWindow()
diff --git a/Rubberduck.Core/UI/SimpleListControl.cs b/Rubberduck.Core/UI/SimpleListControl.cs
@@ -32,8 +32,8 @@ private void ResultBox_DoubleClick(object sender, EventArgs e)
             handler(this, arg);
         }
 
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        private const string ClassId = "972A7CE8-55A0-48F5-B607-2035E81D28CF";
+        string IDockableUserControl.ClassId { get { return ClassId; } }
 
         private readonly string _caption;
         string IDockableUserControl.Caption
diff --git a/Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs b/Rubberduck.Core/UI/ToDoItems/ToDoExplorerWindow.cs
@@ -8,8 +8,8 @@ namespace Rubberduck.UI.ToDoItems
     [ExcludeFromCodeCoverage]
     public partial class ToDoExplorerWindow : UserControl, IDockableUserControl
     {
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        private const string ClassId = "8B071EDA-2C9C-4009-9A22-A1958BF98B28"; // todo get from Resources.Registration?
+        string IDockableUserControl.ClassId { get { return ClassId; } }
         string IDockableUserControl.Caption { get { return RubberduckUI.TodoExplorer_Caption; } }
 
         private ToDoExplorerWindow()
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerWindow.cs b/Rubberduck.Core/UI/UnitTesting/TestExplorerWindow.cs
@@ -23,8 +23,10 @@ public TestExplorerViewModel ViewModel
             get { return _viewModel; }
         }
 
-        private readonly string RandomGuid = Guid.NewGuid().ToString();
-        string IDockableUserControl.GuidIdentifier => RandomGuid;
+        public string ClassId
+        {
+            get { return "9CF1392A-2DC9-48A6-AC0B-E601A9802608"; }
+        }
 
         public string Caption => TestExplorer.TestExplorerWindow_Caption;
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`using Rubberduck.UI.Inspections;`
`19`	`19`	`using Rubberduck.VBEditor;`
`20`	`20`	`using Rubberduck.Resources;`
`21`		`-using Rubberduck.CodeAnalysis.Inspections;`
`22`	`21`
`23`	`22`	`namespace Rubberduck.Inspections`
`24`	`23`	`{`
`@@ -55,6 +54,7 @@ private void UpdateInspectionSeverity(Configuration config)`
`55`	`54`	`if (inspection.Name == setting.Name)`
`56`	`55`	`{`
`57`	`56`	`inspection.Severity = setting.Severity;`
	`57`	`+ break;`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@ public ISearchResultsWindowViewModel ViewModel`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`- private readonly string RandomGuid = Guid.NewGuid().ToString();`
`26`		`- string IDockableUserControl.GuidIdentifier => RandomGuid;`
	`25`	`+ public string ClassId`
	`26`	`+ {`
	`27`	`+ get { return "BFD04A86-CACA-4F95-9656-A0BF7D3AE254"; }`
	`28`	`+ }`
`27`	`29`
`28`	`30`	`public string Caption`
`29`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class Parameter`
`19`	`19`
`20`	`20`	`public override string ToString()`
`21`	`21`	`{`
`22`		`- return $"{ParamAccessibility} {ParamName} As {ParamType}";`
	`22`	`+ return $"{ParamAccessibility} {ParamName} {Tokens.As} {ParamType}";`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`@@ -64,7 +64,7 @@ private List<Parameter> GetMemberParameters(Declaration member)`
`64`	`64`	`return new List<Parameter>();`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (GetMethodType(member) == "Property Get")`
	`67`	`+ if (GetMethodType(member) == $"{Tokens.Property} {Tokens.Get}")`
`68`	`68`	`{`
`69`	`69`	`parameters = parameters.Take(parameters.Count - 1).ToList();`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private IWindow CreateToolWindow(IDockableUserControl control)`
`53`	`53`	`{`
`54`	`54`	`using (var windows = _vbe.Windows)`
`55`	`55`	`{`
`56`		`- var info = windows.CreateToolWindow(_addin, RubberduckProgId.DockableWindowHostProgId, control.Caption, control.GuidIdentifier);`
	`56`	`+ var info = windows.CreateToolWindow(_addin, RubberduckProgId.DockableWindowHostProgId, control.Caption, control.ClassId);`
`57`	`57`	`_userControlObject = info.UserControl;`
`58`	`58`	`toolWindow = info.ToolWindow;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ private void ResultBox_DoubleClick(object sender, EventArgs e)`
`32`	`32`	`handler(this, arg);`
`33`	`33`	`}`
`34`	`34`
`35`		`- private readonly string RandomGuid = Guid.NewGuid().ToString();`
`36`		`- string IDockableUserControl.GuidIdentifier => RandomGuid;`
	`35`	`+ private const string ClassId = "972A7CE8-55A0-48F5-B607-2035E81D28CF";`
	`36`	`+ string IDockableUserControl.ClassId { get { return ClassId; } }`
`37`	`37`
`38`	`38`	`private readonly string _caption;`
`39`	`39`	`string IDockableUserControl.Caption`