@@ -90,58 +90,46 @@ public string SignaturePreview
90
90
91
91
private string GetSignature ( SubroutineDeclaration member )
92
92
{
93
- var signature = member . Accessibility == Accessibility . Implicit ? string . Empty : member . Accessibility . ToString ( ) ;
94
- signature += " Sub " + member . IdentifierName + "(" ;
95
-
93
+ var access = member . Accessibility . CodeString ( ) ;
96
94
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 ) } )";
98
96
}
99
97
100
98
private string GetSignature ( FunctionDeclaration member )
101
99
{
102
- var signature = member . Accessibility == Accessibility . Implicit ? string . Empty : member . Accessibility . ToString ( ) ;
103
- signature += " Function " + member . IdentifierName + "(" ;
104
-
100
+ var access = member . Accessibility . CodeString ( ) ;
105
101
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 } " ;
107
103
}
108
104
109
105
private string GetSignature ( EventDeclaration member )
110
106
{
111
- var signature = member . Accessibility == Accessibility . Implicit ? string . Empty : member . Accessibility . ToString ( ) ;
112
- signature += " Event " + member . IdentifierName + "(" ;
113
-
107
+ var access = member . Accessibility . CodeString ( ) ;
114
108
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 ) } )";
116
110
}
117
111
118
112
private string GetSignature ( PropertyGetDeclaration member )
119
113
{
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 ( ) ;
123
115
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 } " ;
125
117
}
126
118
127
119
private string GetSignature ( PropertyLetDeclaration member )
128
120
{
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 ( ) ;
132
122
var selectedParams = Parameters . Where ( p => ! p . IsRemoved ) . Select ( s => s . Name ) . ToList ( ) ;
133
123
selectedParams . Add ( new Parameter ( member . Parameters . Last ( ) ) . Name ) ;
134
- return signature + string . Join ( ", " , selectedParams ) + " )";
124
+ return $ " { access } Property Let { member . IdentifierName } ( { string . Join ( ", " , selectedParams ) } )";
135
125
}
136
126
137
127
private string GetSignature ( PropertySetDeclaration member )
138
128
{
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 ( ) ;
142
130
var selectedParams = Parameters . Where ( p => ! p . IsRemoved ) . Select ( s => s . Name ) . ToList ( ) ;
143
131
selectedParams . Add ( new Parameter ( member . Parameters . Last ( ) ) . Name ) ;
144
- return signature + string . Join ( ", " , selectedParams ) + " )";
132
+ return $ " { access } Property Set { member . IdentifierName } ( { string . Join ( ", " , selectedParams ) } )";
145
133
}
146
134
147
135
private void RemoveParameter ( ParameterViewModel parameter )
0 commit comments