Skip to content

Commit 7b97e68

Browse files
BZngrBZngr
committed
Some cleanup and comments
1 parent 5f18ec3 commit 7b97e68

File tree

4 files changed

+17
-91
lines changed

4 files changed

+17
-91
lines changed

‎Rubberduck.Refactorings/Common/DeclarationExtensions.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ public static bool IsDeclaredInList(this Declaration declaration)
4646
&& varList.ChildCount > 1;
4747
}
4848

49+
/// <summary>
50+
/// Generates a Property Member code block specified by the letSetGet DeclarationType argument.
51+
/// </summary>
52+
/// <param name="variable"></param>
53+
/// <param name="letSetGetType"></param>
54+
/// <param name="propertyIdentifier"></param>
55+
/// <param name="accessibility"></param>
56+
/// <param name="content"></param>
57+
/// <param name="parameterIdentifier"></param>
58+
/// <returns></returns>
4959
public static string FieldToPropertyBlock(this Declaration variable, DeclarationType letSetGetType, string propertyIdentifier, string accessibility, string content, string parameterIdentifier = "value")
5060
{
5161
var template = string.Join(Environment.NewLine, accessibility + " {0}{1} {2}{3}", $"{content}", Tokens.End + " {0}", string.Empty);

‎Rubberduck.Refactorings/Common/ModuleBodyElementDeclarationExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ public static string AsCodeBlock(this ModuleBodyElementDeclaration declaration,
9797
FullMemberSignature(declaration, accessibility, newIdentifier),
9898
Environment.NewLine,
9999
endStatement);
100-
//return $"{FullMemberSignature(declaration)}{Environment.NewLine}{endStatement}{Environment.NewLine}";
101100
}
102101

103102
/// <summary>

‎Rubberduck.Refactorings/EncapsulateField/EncapsulationStrategies/ConvertFieldsToUDTMembers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected override void LoadNewPropertyBlocks()
7878
if (converted.Declaration is VariableDeclaration variableDeclaration)
7979
{
8080
var getContent = $"{set.PropertyName} = {set.BackingField}";
81-
if (set.UsesSetAssignment) // variableDeclaration.AsTypeName.Equals(Tokens.Variant) || converted.Declaration.IsObject)
81+
if (set.UsesSetAssignment)
8282
{
8383
getContent = $"{Tokens.Set} {getContent}";
8484
}

‎Rubberduck.Refactorings/ImplementInterface/AddInterfaceImplementations/AddInterfaceImplementationsRefactoringAction.cs

Lines changed: 6 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -40,108 +40,25 @@ private string GetInterfaceMember(Declaration member, string interfaceName)
4040

4141
if (member.DeclarationType.Equals(DeclarationType.Variable))
4242
{
43-
var members = new List<string>
44-
{
45-
member.FieldToPropertyBlock(DeclarationType.PropertyGet, $"{interfaceName}_{member.IdentifierName}", Tokens.Private, MemberBody, "rhs")
46-
};
43+
var propertyGet = member.FieldToPropertyBlock(DeclarationType.PropertyGet, $"{interfaceName}_{member.IdentifierName}", Tokens.Private, MemberBody, "rhs");
44+
var members = new List<string> { propertyGet };
4745

4846
if (member.AsTypeName.Equals(Tokens.Variant) || !member.IsObject)
4947
{
50-
members.Add(member.FieldToPropertyBlock(DeclarationType.PropertyLet, $"{interfaceName}_{member.IdentifierName}", Tokens.Private, MemberBody, "rhs"));
51-
//members.Add(string.Format(template, Tokens.Property, $" {Tokens.Let}", signature, string.Empty));
48+
var propertyLet = member.FieldToPropertyBlock(DeclarationType.PropertyLet, $"{interfaceName}_{member.IdentifierName}", Tokens.Private, MemberBody, "rhs");
49+
members.Add(propertyLet);
5250
}
5351

5452
if (member.AsTypeName.Equals(Tokens.Variant) || member.IsObject)
5553
{
56-
members.Add(member.FieldToPropertyBlock(DeclarationType.PropertySet, $"{interfaceName}_{member.IdentifierName}", Tokens.Private, MemberBody, "rhs"));
57-
//members.Add(string.Format(template, Tokens.Property, $" {Tokens.Set}", signature, string.Empty));
54+
var propertySet = member.FieldToPropertyBlock(DeclarationType.PropertySet, $"{interfaceName}_{member.IdentifierName}", Tokens.Private, MemberBody, "rhs");
55+
members.Add(propertySet);
5856
}
5957

60-
61-
//var template = string.Join(Environment.NewLine, Tokens.Private + " {0}{1} {2}{3}", MemberBody, Tokens.End + " {0}", string.Empty);
62-
//var signature = $"{interfaceName}_{member.IdentifierName}({string.Join(", ", GetParameters(member))})";
63-
//var asType = $" {Tokens.As} {member.AsTypeName}";
64-
//var members = new List<string>
65-
// {
66-
// string.Format(template, Tokens.Property, $" {Tokens.Get}", $"{interfaceName}_{member.IdentifierName}()", asType)
67-
// };
68-
69-
//if (member.AsTypeName.Equals(Tokens.Variant) || !member.IsObject)
70-
//{
71-
// members.Add(string.Format(template, Tokens.Property, $" {Tokens.Let}", signature, string.Empty));
72-
//}
73-
74-
//if (member.AsTypeName.Equals(Tokens.Variant) || member.IsObject)
75-
//{
76-
// members.Add(string.Format(template, Tokens.Property, $" {Tokens.Set}", signature, string.Empty));
77-
//}
78-
7958
return string.Join(Environment.NewLine, members);
8059
}
8160

8261
return string.Empty;
83-
84-
//var template = string.Join(Environment.NewLine, Tokens.Private + " {0}{1} {2}{3}", MemberBody, Tokens.End + " {0}", string.Empty);
85-
//var signature = $"{interfaceName}_{member.IdentifierName}({string.Join(", ", GetParameters(member))})";
86-
//var asType = $" {Tokens.As} {member.AsTypeName}";
87-
88-
//switch (member.DeclarationType)
89-
//{
90-
// case DeclarationType.Procedure:
91-
// return string.Format(template, Tokens.Sub, string.Empty, signature, string.Empty);
92-
// case DeclarationType.Function:
93-
// return string.Format(template, Tokens.Function, string.Empty, signature, asType);
94-
// case DeclarationType.PropertyGet:
95-
// return string.Format(template, Tokens.Property, $" {Tokens.Get}", signature, asType);
96-
// case DeclarationType.PropertyLet:
97-
// return string.Format(template, Tokens.Property, $" {Tokens.Let}", signature, string.Empty);
98-
// case DeclarationType.PropertySet:
99-
// return string.Format(template, Tokens.Property, $" {Tokens.Set}", signature, string.Empty);
100-
// case DeclarationType.Variable:
101-
// var members = new List<string>
102-
// {
103-
// string.Format(template, Tokens.Property, $" {Tokens.Get}", $"{interfaceName}_{member.IdentifierName}()", asType)
104-
// };
105-
106-
// if (member.AsTypeName.Equals(Tokens.Variant) || !member.IsObject)
107-
// {
108-
// members.Add(string.Format(template, Tokens.Property, $" {Tokens.Let}", signature, string.Empty));
109-
// }
110-
111-
// if (member.AsTypeName.Equals(Tokens.Variant) || member.IsObject)
112-
// {
113-
// members.Add(string.Format(template, Tokens.Property, $" {Tokens.Set}", signature, string.Empty));
114-
// }
115-
116-
// return string.Join(Environment.NewLine, members);
117-
//}
118-
119-
//return string.Empty;
12062
}
121-
122-
//private IEnumerable<Parameter> GetParameters(Declaration member)
123-
//{
124-
// if (member.DeclarationType == DeclarationType.Variable)
125-
// {
126-
// return new List<Parameter>
127-
// {
128-
// new Parameter
129-
// {
130-
// Accessibility = Tokens.ByVal,
131-
// Name = "rhs",
132-
// AsTypeName = member.AsTypeName
133-
// }
134-
// };
135-
// }
136-
137-
// if (member is ModuleBodyElementDeclaration method)
138-
// {
139-
// return method.Parameters
140-
// .OrderBy(parameter => parameter.Selection)
141-
// .Select(parameter => new Parameter(parameter));
142-
// }
143-
144-
// return Enumerable.Empty<Parameter>();
145-
//}
14663
}
14764
}

0 commit comments

Comments
 (0)