Skip to content

Commit 00922e1

Browse files
committed
Make property assignment explicit
1 parent 52a04e9 commit 00922e1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Rubberduck.Refactorings/ExtractInterface/InterfaceMember.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public InterfaceMember(Declaration member)
5656
Identifier = member.IdentifierName;
5757
Type = member.AsTypeName;
5858

59-
GetMethodType();
59+
MemberType = GetMethodType(Member.Context);
6060

6161
if (member is IParameterizedDeclaration memberWithParams)
6262
{
@@ -83,34 +83,34 @@ public InterfaceMember(Declaration member)
8383
}
8484
}
8585

86-
private void GetMethodType()
86+
private string GetMethodType(Antlr4.Runtime.ParserRuleContext context)
8787
{
88-
var context = Member.Context;
89-
9088
if (context is VBAParser.SubStmtContext)
9189
{
92-
MemberType = Tokens.Sub;
90+
return Tokens.Sub;
9391
}
9492

9593
if (context is VBAParser.FunctionStmtContext)
9694
{
97-
MemberType = Tokens.Function;
95+
return Tokens.Function;
9896
}
9997

10098
if (context is VBAParser.PropertyGetStmtContext)
10199
{
102-
MemberType = $"{Tokens.Property} {Tokens.Get}";
100+
return $"{Tokens.Property} {Tokens.Get}";
103101
}
104102

105103
if (context is VBAParser.PropertyLetStmtContext)
106104
{
107-
MemberType = $"{Tokens.Property} {Tokens.Let}";
105+
return $"{Tokens.Property} {Tokens.Let}";
108106
}
109107

110108
if (context is VBAParser.PropertySetStmtContext)
111109
{
112-
MemberType = $"{Tokens.Property} {Tokens.Set}";
110+
return $"{Tokens.Property} {Tokens.Set}";
113111
}
112+
113+
return null;
114114
}
115115

116116
public string Body => string.Format("Public {0}{1}End {2}{1}", FullMemberSignature, Environment.NewLine, MemberType.Split(' ').First());

0 commit comments

Comments
 (0)