Skip to content

Commit a1e4d48

Browse files
committed
Bring RemoveParameters signature preview generation in line with ReorderParameters
1 parent 75c4015 commit a1e4d48

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -90,58 +90,46 @@ public string SignaturePreview
9090

9191
private string GetSignature(SubroutineDeclaration member)
9292
{
93-
var signature = member.Accessibility == Accessibility.Implicit ? string.Empty : member.Accessibility.ToString();
94-
signature += " Sub " + member.IdentifierName + "(";
95-
93+
var access = member.Accessibility.CodeString();
9694
var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
97-
return signature + string.Join(", ", selectedParams) + ")";
95+
return $"{access} Sub {member.IdentifierName}({string.Join(", ", selectedParams)})";
9896
}
9997

10098
private string GetSignature(FunctionDeclaration member)
10199
{
102-
var signature = member.Accessibility == Accessibility.Implicit ? string.Empty : member.Accessibility.ToString();
103-
signature += " Function " + member.IdentifierName + "(";
104-
100+
var access = member.Accessibility.CodeString();
105101
var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
106-
return signature + string.Join(", ", selectedParams) + ") As " + member.AsTypeName;
102+
return $"{access} Function {member.IdentifierName}({string.Join(", ", selectedParams)}) As {member.AsTypeName}";
107103
}
108104

109105
private string GetSignature(EventDeclaration member)
110106
{
111-
var signature = member.Accessibility == Accessibility.Implicit ? string.Empty : member.Accessibility.ToString();
112-
signature += " Event " + member.IdentifierName + "(";
113-
107+
var access = member.Accessibility.CodeString();
114108
var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
115-
return signature + string.Join(", ", selectedParams) + ")";
109+
return $"{access} Event {member.IdentifierName}({string.Join(", ", selectedParams)})";
116110
}
117111

118112
private string GetSignature(PropertyGetDeclaration member)
119113
{
120-
var signature = member.Accessibility == Accessibility.Implicit ? string.Empty : member.Accessibility.ToString();
121-
signature += " Property Get " + member.IdentifierName + "(";
122-
114+
var access = member.Accessibility.CodeString();
123115
var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
124-
return signature + string.Join(", ", selectedParams) + ") As " + member.AsTypeName;
116+
return $"{access} Property Get {member.IdentifierName}({string.Join(", ", selectedParams)}) As {member.AsTypeName}";
125117
}
126118

127119
private string GetSignature(PropertyLetDeclaration member)
128120
{
129-
var signature = member.Accessibility == Accessibility.Implicit ? string.Empty : member.Accessibility.ToString();
130-
signature += " Property Let " + member.IdentifierName + "(";
131-
121+
var access = member.Accessibility.CodeString();
132122
var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name).ToList();
133123
selectedParams.Add(new Parameter(member.Parameters.Last()).Name);
134-
return signature + string.Join(", ", selectedParams) + ")";
124+
return $"{access} Property Let {member.IdentifierName}({string.Join(", ", selectedParams)})";
135125
}
136126

137127
private string GetSignature(PropertySetDeclaration member)
138128
{
139-
var signature = member.Accessibility == Accessibility.Implicit ? string.Empty : member.Accessibility.ToString();
140-
signature += " Property Set " + member.IdentifierName + "(";
141-
129+
var access = member.Accessibility.CodeString();
142130
var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name).ToList();
143131
selectedParams.Add(new Parameter(member.Parameters.Last()).Name);
144-
return signature + string.Join(", ", selectedParams) + ")";
132+
return $"{access} Property Set {member.IdentifierName}({string.Join(", ", selectedParams)})";
145133
}
146134

147135
private void RemoveParameter(ParameterViewModel parameter)

0 commit comments

Comments
 (0)