Skip to content

Commit 4567265

Browse files
committed
Missed some cleanup
1 parent e062d1e commit 4567265

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

Rubberduck.Core/UI/Refactorings/AssignedByValParameterQuickFixDialog.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Windows.Forms;
4-
using System.Linq;
53
using Rubberduck.Common;
64
using Rubberduck.Resources;
75

86
namespace Rubberduck.UI.Refactorings
97
{
108
public partial class AssignedByValParameterQuickFixDialog : Form, IAssignedByValParameterQuickFixDialog
119
{
12-
//private readonly IEnumerable<string> _forbiddenNames;
1310
private readonly Func<string, bool> _isConflictingName;
1411

1512
public AssignedByValParameterQuickFixDialog(string identifier, string identifierType, Func<string, bool> nameCollisionChecker)//, IEnumerable<string> forbiddenNames)
1613
{
1714
InitializeComponent();
1815
InitializeCaptions(identifier, identifierType);
19-
//_forbiddenNames = forbiddenNames;
2016
_isConflictingName = nameCollisionChecker;
2117
}
2218

@@ -56,10 +52,6 @@ private string GetVariableNameFeedback()
5652
{
5753
return string.Empty;
5854
}
59-
//if (_forbiddenNames.Any(name => name.Equals(NewName, StringComparison.OrdinalIgnoreCase)))
60-
//{
61-
// return string.Format(RubberduckUI.AssignedByValDialog_NewNameAlreadyUsedFormat, NewName);
62-
//}
6355
if (_isConflictingName(NewName))
6456
{
6557
return string.Format(RubberduckUI.AssignedByValDialog_NewNameAlreadyUsedFormat, NewName);
@@ -85,8 +77,7 @@ private string GetVariableNameFeedback()
8577

8678
private void SetControlsProperties()
8779
{
88-
//var isValid = VariableNameValidator.IsValidName(NewName) && !_forbiddenNames.Any(name => name.Equals(NewName, StringComparison.OrdinalIgnoreCase));
89-
var isValid = VariableNameValidator.IsValidName(NewName); // && !_forbiddenNames.Any(name => name.Equals(NewName, StringComparison.OrdinalIgnoreCase));
80+
var isValid = VariableNameValidator.IsValidName(NewName);
9081
OkButton.Visible = isValid;
9182
OkButton.Enabled = isValid;
9283
InvalidNameValidationIcon.Visible = !isValid;
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
using Rubberduck.Parsing.Symbols;
2-
using System;
3-
using System.Collections.Generic;
1+
using System;
42

53
namespace Rubberduck.UI.Refactorings
64
{
75
public interface IAssignedByValParameterQuickFixDialogFactory
86
{
9-
IAssignedByValParameterQuickFixDialog Create(string identifier, string identifierType, Func<string, bool> nameCollisionChecker); //, IEnumerable<string> forbiddenNames);
7+
IAssignedByValParameterQuickFixDialog Create(string identifier, string identifierType, Func<string, bool> nameCollisionChecker);
108
void Release(IAssignedByValParameterQuickFixDialog dialog);
119
}
1210
}

RubberduckTests/QuickFixes/AssignedByValParameterMakeLocalCopyQuickFixTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using NUnit.Framework;
2-
using System.Collections.Generic;
32
using System.Linq;
43
using System.Threading;
54
using Rubberduck.Inspections.QuickFixes;
@@ -393,7 +392,7 @@ private Mock<IAssignedByValParameterQuickFixDialogFactory> BuildMockDialogFactor
393392
mockDialog.SetupGet(m => m.DialogResult).Returns(() => DialogResult.OK);
394393

395394
var mockDialogFactory = new Mock<IAssignedByValParameterQuickFixDialogFactory>();
396-
mockDialogFactory.Setup(f => f.Create(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Func<string,bool>>()/*, It.IsAny<IEnumerable<string>>()*/)).Returns(mockDialog.Object);
395+
mockDialogFactory.Setup(f => f.Create(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Func<string,bool>>())).Returns(mockDialog.Object);
397396

398397
return mockDialogFactory;
399398
}

0 commit comments

Comments
 (0)