1
1
using System ;
2
- using System . Collections . Generic ;
3
2
using System . Windows . Forms ;
4
- using System . Linq ;
5
3
using Rubberduck . Common ;
6
4
using Rubberduck . Resources ;
7
5
8
6
namespace Rubberduck . UI . Refactorings
9
7
{
10
8
public partial class AssignedByValParameterQuickFixDialog : Form , IAssignedByValParameterQuickFixDialog
11
9
{
12
- //private readonly IEnumerable<string> _forbiddenNames;
13
10
private readonly Func < string , bool > _isConflictingName ;
14
11
15
12
public AssignedByValParameterQuickFixDialog ( string identifier , string identifierType , Func < string , bool > nameCollisionChecker ) //, IEnumerable<string> forbiddenNames)
16
13
{
17
14
InitializeComponent ( ) ;
18
15
InitializeCaptions ( identifier , identifierType ) ;
19
- //_forbiddenNames = forbiddenNames;
20
16
_isConflictingName = nameCollisionChecker ;
21
17
}
22
18
@@ -56,10 +52,6 @@ private string GetVariableNameFeedback()
56
52
{
57
53
return string . Empty ;
58
54
}
59
- //if (_forbiddenNames.Any(name => name.Equals(NewName, StringComparison.OrdinalIgnoreCase)))
60
- //{
61
- // return string.Format(RubberduckUI.AssignedByValDialog_NewNameAlreadyUsedFormat, NewName);
62
- //}
63
55
if ( _isConflictingName ( NewName ) )
64
56
{
65
57
return string . Format ( RubberduckUI . AssignedByValDialog_NewNameAlreadyUsedFormat , NewName ) ;
@@ -85,8 +77,7 @@ private string GetVariableNameFeedback()
85
77
86
78
private void SetControlsProperties ( )
87
79
{
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 ) ;
90
81
OkButton . Visible = isValid ;
91
82
OkButton . Enabled = isValid ;
92
83
InvalidNameValidationIcon . Visible = ! isValid ;
0 commit comments