Skip to content

sync with merged PR's in main repo #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 28, 2015
Merged

sync with merged PR's in main repo #18

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b630e1d
Display type in UI for extract interface
Hosch250 Dec 27, 2015
fea1477
Pull from next
Hosch250 Dec 28, 2015
cfc62cd
Merge pull request #905 from Hosch250/BugBlipper
retailcoder Dec 28, 2015
32715a5
Merge pull request #17 from rubberduck-vba/next
retailcoder Dec 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions RetailCoder.VBE/Refactorings/ExtractInterface/InterfaceMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ public class InterfaceMember
public string Type { get; set; }

public string MemberType { get; set; }
public string PropertyType { get; set; }

public bool IsSelected { get; set; }
public string MemberSignature
{
get
{
var signature = Member.IdentifierName + "(" +
var signature = MemberType + " " + Member.IdentifierName + "(" +
string.Join(", ", MemberParams.Select(m => m.ParamType)) + ")";

return Type == null ? signature : signature + " As " + Type;
Expand All @@ -43,7 +42,7 @@ public string FullMemberSignature
{
get
{
var signature = Member.IdentifierName + "(" +
var signature = MemberType + " " + Member.IdentifierName + "(" +
string.Join(", ", MemberParams) + ")";

return Type == null ? signature : signature + " As " + Type;
Expand All @@ -69,12 +68,11 @@ public InterfaceMember(Declaration member, IEnumerable<Declaration> declarations
})
.ToList();

if (PropertyType == "Get")
if (MemberType == "Property Get")
{
MemberParams = MemberParams.Take(MemberParams.Count() - 1);
}


IsSelected = false;
}

Expand All @@ -97,29 +95,26 @@ private void GetMethodType()
var propertyGetStmtContext = context as VBAParser.PropertyGetStmtContext;
if (propertyGetStmtContext != null)
{
MemberType = Tokens.Property;
PropertyType = Tokens.Get;
MemberType = Tokens.Property + " " + Tokens.Get;
}

var propertyLetStmtContext = context as VBAParser.PropertyLetStmtContext;
if (propertyLetStmtContext != null)
{
MemberType = Tokens.Property;
PropertyType = Tokens.Let;
MemberType = Tokens.Property + " " + Tokens.Let;
}

var propertySetStmtContext = context as VBAParser.PropertySetStmtContext;
if (propertySetStmtContext != null)
{
MemberType = Tokens.Property;
PropertyType = Tokens.Set;
MemberType = Tokens.Property + " " + Tokens.Set;
}
}

public override string ToString()
{
return "Public " + MemberType + " " + PropertyType + " " + FullMemberSignature + Environment.NewLine + "End " + MemberType +
Environment.NewLine;
return "Public " + FullMemberSignature + Environment.NewLine +
"End " + MemberType.Split(' ').First() + Environment.NewLine;
}
}
}