Merge pull request #638 from rubberduck-vba/GrammarIsFun

FindAllReferences fix, localized plural issue count fix

Author: rubberduck203

RetailCoder.VBE/UI/AboutWindow.Designer.cs

@@ -100,7 +100,10 @@ private void ToggleParsingStatus(bool isParsing = true)
         private void Control_CopyResultsToClipboard(object sender, EventArgs e)
         {
             var results = string.Join("\n", _results.Select(FormatResultForClipboard));
-            var text = string.Format(RubberduckUI.CodeInspections_NumberOfIssuesFound, DateTime.Now, _results.Count, (_results.Count != 1 ? "s" : string.Empty)) + results;
+            var resource = _results.Count == 1
+                ? RubberduckUI.CodeInspections_NumberOfIssuesFound_Singular
+                : RubberduckUI.CodeInspections_NumberOfIssuesFound_Plural;
+            var text = string.Format(resource, DateTime.Now, _results.Count) + results;
 
             Clipboard.SetText(text);
         }

RetailCoder.VBE/UI/CodeInspections/CodeInspectionsDockablePresenter.cs

@@ -55,7 +55,7 @@ public void Initialize()
             Menu.SetButtonImage(_refreshButton, refreshIcon);
 
             _statusButton = (CommandBarButton)_toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
-            _statusButton.Caption = string.Format(RubberduckUI.CodeInspections_NumberOfIssues, 0, "s");
+            _statusButton.Caption = string.Format(RubberduckUI.CodeInspections_NumberOfIssues_Plural, 0);
             _statusButton.FaceId = 463; // Resources.Warning doesn't look good here
             _statusButton.Style = MsoButtonStyle.msoButtonIconAndCaption;
 
@@ -200,7 +200,10 @@ private void _refreshButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         private void OnIssuesFound(object sender, InspectorIssuesFoundEventArg e)
         {
             _issueCount = _issueCount + e.Issues.Count;
-            _statusButton.Caption = string.Format(RubberduckUI.CodeInspections_NumberOfIssues, _issueCount, (_issueCount == 1 ? string.Empty : "s"));
+            var resource = _issueCount == 1
+                ? RubberduckUI.CodeInspections_NumberOfIssues_Singular
+                : RubberduckUI.CodeInspections_NumberOfIssues_Plural;
+            _statusButton.Caption = string.Format(resource, _issueCount);
         }
 
         private async void RefreshAsync(CancellationToken token)

RetailCoder.VBE/UI/CodeInspections/CodeInspectionsToolbar.cs

@@ -65,7 +65,7 @@ private void InitWindow()
             NextButton.Text = RubberduckUI.Next;
             PreviousButton.Text = RubberduckUI.Previous;
 
-            StatusLabel.Text = string.Format(RubberduckUI.CodeInspections_NumberOfIssues, 0, "s");
+            StatusLabel.Text = string.Format(RubberduckUI.CodeInspections_NumberOfIssues_Plural, 0);
 
             RefreshButton.ToolTipText = RubberduckUI.CodeInspections_RefreshToolTip;
             QuickFixButton.ToolTipText = RubberduckUI.CodeInspections_QuickFixToolTip;
@@ -123,13 +123,16 @@ public void SetIssuesStatus(int issueCount, bool completed = false)
                 if (completed)
                 {
                     StatusLabel.Image = Resources.exclamation_diamond;
-                    StatusLabel.Text = string.Format(RubberduckUI.CodeInspections_NumberOfIssues, issueCount, (issueCount != 1 ? "s" : string.Empty));
+                    var resource = issueCount == 1
+                        ? RubberduckUI.CodeInspections_NumberOfIssues_Singular
+                        : RubberduckUI.CodeInspections_NumberOfIssues_Plural;
+                    StatusLabel.Text = string.Format(resource, issueCount);
                     QuickFixButton.Enabled = QuickFixButton.HasDropDownItems;
                 }
                 else
                 {
                     StatusLabel.Image = Resources.hourglass;
-                    StatusLabel.Text = string.Format(RubberduckUI.CodeInspections_InspectingIssues, RubberduckUI.CodeInspections_Inspecting, issueCount, (issueCount != 1 ? "s" : string.Empty));
+                    StatusLabel.Text = string.Format(RubberduckUI.CodeInspections_InspectingIssues_Singular, RubberduckUI.CodeInspections_Inspecting, issueCount, (issueCount != 1 ? "s" : string.Empty));
                 }
             }
         }

RetailCoder.VBE/UI/CodeInspections/CodeInspectionsWindow.cs

@@ -180,9 +180,9 @@ public void FindAllReferences()
             var progress = new ParsingProgressPresenter();
             var result = progress.Parse(_parser, IDE.ActiveVBProject);
 
-            var declarations = result.Declarations.Items.Where(item => item.DeclarationType != DeclarationType.ModuleOption
-                && item.ComponentName == selection.QualifiedName.ComponentName)
-                .ToList();
+            var declarations = result.Declarations.Items
+                                     .Where(item => item.DeclarationType != DeclarationType.ModuleOption)
+                                     .ToList();
 
             var target = declarations.SingleOrDefault(item =>
                 IsSelectedDeclaration(selection, item)
@@ -368,12 +368,10 @@ private IEnumerable<Declaration> FindAllImplementationsOfMember(Declaration targ
 
         private bool IsSelectedReference(QualifiedSelection selection, Declaration declaration)
         {
-            var isSameProject = declaration.Project == selection.QualifiedName.Project;
-            var isSameModule = isSameProject && declaration.QualifiedName.QualifiedModuleName.ComponentName == selection.QualifiedName.ComponentName;
-
             return declaration.References.Any(r =>
-                isSameModule &&
-                r.Selection.ContainsFirstCharacter(selection.Selection));
+                r.QualifiedModuleName.Project == selection.QualifiedName.Project 
+                && r.QualifiedModuleName.ComponentName == selection.QualifiedName.ComponentName
+                && r.Selection.ContainsFirstCharacter(selection.Selection));
         }
 
         private bool IsSelectedDeclaration(QualifiedSelection selection, Declaration declaration)

RetailCoder.VBE/UI/RefactorMenu.cs

@@ -29,12 +29,8 @@ internal class RubberduckMenu : Menu
         private readonly IRubberduckParser _parser;
         private readonly AddIn _addIn;
 
-        //These need to stay in scope for their click events to fire. (32-bit only?)
-        // ReSharper disable once NotAccessedField.Local
         private CommandBarButton _about;
-        // ReSharper disable once NotAccessedField.Local
         private CommandBarButton _settings;
-        // ReSharper disable once NotAccessedField.Local
         private CommandBarButton _sourceControl;
 
         private ProjectExplorerContextMenu _projectExplorerContextMenu;