Skip to content

Commit ea27034

Browse files
authored
remove un-used parameters (#4514)
1 parent 9f76a25 commit ea27034

File tree

6 files changed

+34
-46
lines changed

6 files changed

+34
-46
lines changed

Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/AutoSerializable/Discovery/ContainerDefinitionsExtractor.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ public static IReadOnlyList<ExtractedContainerDefinition> GetContainerDefinition
3131
while (containingTypeDeclaration.Parent is TypeDeclarationSyntax syntax)
3232
{
3333
containingTypeDeclaration = syntax;
34-
containers.Add(GetContainerDefinition(extractionContext, containingTypeDeclaration));
34+
containers.Add(GetContainerDefinition(containingTypeDeclaration));
3535
}
3636

3737
namespaceDeclaration = containingTypeDeclaration.Parent as NamespaceDeclarationSyntax;
3838
if (namespaceDeclaration is not null)
3939
{
40-
containers.Add(GetContainerDefinition(extractionContext, namespaceDeclaration));
40+
containers.Add(GetContainerDefinition(namespaceDeclaration));
4141
}
4242

4343
containers.Reverse();
4444

4545
return containers;
4646
}
4747

48-
private static ExtractedContainerDefinition GetContainerDefinition(DefinitionExtractionContext extractionContext, TypeDeclarationSyntax typeDeclarationSyntax)
48+
private static ExtractedContainerDefinition GetContainerDefinition(TypeDeclarationSyntax typeDeclarationSyntax)
4949
{
5050
StringBuilder containerDefinitionBuilder = new StringBuilder();
5151
ExtractedContainerDefinition containerDefinition;
@@ -69,7 +69,7 @@ private static ExtractedContainerDefinition GetContainerDefinition(DefinitionExt
6969
return containerDefinition;
7070
}
7171

72-
private static ExtractedContainerDefinition GetContainerDefinition(DefinitionExtractionContext extractionContext, NamespaceDeclarationSyntax namespaceDeclarationSyntax)
72+
private static ExtractedContainerDefinition GetContainerDefinition(NamespaceDeclarationSyntax namespaceDeclarationSyntax)
7373
{
7474
StringBuilder containerDefinitionBuilder = new StringBuilder();
7575
ExtractedContainerDefinition containerDefinition;

Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/AutoSerializable/Discovery/FieldDefinitionExtractor.cs

+6-9
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public static ExtractedFieldDefinition ExtractFieldDefinition(DefinitionExtracti
2828
{
2929
ExtractedFieldDefinition fieldDefinition = new ExtractedFieldDefinition();
3030

31-
fieldDefinition.FieldName = GetFieldName(extractionContext, fieldDeclaration);
32-
fieldDefinition.TypeDefinition.TypeName = GetFieldTypeName(extractionContext, fieldDeclaration);
31+
fieldDefinition.FieldName = GetFieldName(fieldDeclaration);
32+
fieldDefinition.TypeDefinition.TypeName = GetFieldTypeName(fieldDeclaration);
3333
fieldDefinition.TypeDefinition.TypeNamespace = extractionContext.GetTypeNamespace(fieldDeclaration.Declaration.Type);
3434
fieldDefinition.TypeDefinition.IsAutoSerializable = extractionContext.IsTypeAutoSerializable(fieldDeclaration.Declaration.Type);
3535
fieldDefinition.TypeDefinition.ImplementsIMobileObject = extractionContext.DoesTypeImplementIMobileObject(fieldDeclaration.Declaration.Type);
36-
fieldDefinition.TypeDefinition.Nullable = GetFieldTypeNullable(extractionContext, fieldDeclaration);
36+
fieldDefinition.TypeDefinition.Nullable = GetFieldTypeNullable(fieldDeclaration);
3737
return fieldDefinition;
3838
}
3939

@@ -42,10 +42,9 @@ public static ExtractedFieldDefinition ExtractFieldDefinition(DefinitionExtracti
4242
/// <summary>
4343
/// Determines whether the field type is nullable.
4444
/// </summary>
45-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed.</param>
4645
/// <param name="fieldDeclaration">The FieldDeclarationSyntax representing the field declaration.</param>
4746
/// <returns><c>true</c> if the field type is nullable; otherwise, <c>false</c>.</returns>
48-
private static bool GetFieldTypeNullable(DefinitionExtractionContext extractionContext, FieldDeclarationSyntax fieldDeclaration)
47+
private static bool GetFieldTypeNullable(FieldDeclarationSyntax fieldDeclaration)
4948
{
5049
return fieldDeclaration.Declaration.Type is NullableTypeSyntax;
5150
}
@@ -54,21 +53,19 @@ private static bool GetFieldTypeNullable(DefinitionExtractionContext extractionC
5453
/// <summary>
5554
/// Extract the name of the field for which we are building information
5655
/// </summary>
57-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
5856
/// <param name="fieldDeclaration">The FieldDeclarationSyntax from which to extract the necessary information</param>
5957
/// <returns>The name of the field for which we are extracting information</returns>
60-
private static string GetFieldName(DefinitionExtractionContext extractionContext, FieldDeclarationSyntax fieldDeclaration)
58+
private static string GetFieldName(FieldDeclarationSyntax fieldDeclaration)
6159
{
6260
return fieldDeclaration.Declaration.Variables[0].Identifier.ToString();
6361
}
6462

6563
/// <summary>
6664
/// Extract the type name of the field for which we are building information
6765
/// </summary>
68-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
6966
/// <param name="fieldDeclaration">The FieldDeclarationSyntax from which to extract the necessary information</param>
7067
/// <returns>The type name of the field for which we are extracting information</returns>
71-
private static string GetFieldTypeName(DefinitionExtractionContext extractionContext, FieldDeclarationSyntax fieldDeclaration)
68+
private static string GetFieldTypeName(FieldDeclarationSyntax fieldDeclaration)
7269
{
7370
return fieldDeclaration.Declaration.Type.ToString();
7471
}

Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/AutoSerializable/Discovery/FieldDefinitionsExtractor.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private static List<FieldDeclarationSyntax> GetPublicNonExcludedFields(Definitio
7777
// Get all fields that are not specifically opted out with the [AutoNonSerialized] attribute
7878
serializableFields = targetTypeDeclaration.Members.Where(
7979
m => m is FieldDeclarationSyntax fieldDeclaration &&
80-
HasOneOfScopes(extractionContext, fieldDeclaration, "public") &&
80+
HasOneOfScopes(fieldDeclaration, "public") &&
8181
!extractionContext.IsFieldDecoratedWithAutoNonSerialized(fieldDeclaration))
8282
.Cast<FieldDeclarationSyntax>()
8383
.ToList();
@@ -98,7 +98,7 @@ private static List<FieldDeclarationSyntax> GetNonPublicIncludedFields(Definitio
9898
// Get any private or protected fields that are opted in with the use of the [AutoSerialized] attribute
9999
serializableFields = targetTypeDeclaration.Members.Where(
100100
m => m is FieldDeclarationSyntax fieldDeclaration &&
101-
!HasOneOfScopes(extractionContext, fieldDeclaration, "public") &&
101+
!HasOneOfScopes(fieldDeclaration, "public") &&
102102
extractionContext.IsFieldDecoratedWithAutoSerialized(fieldDeclaration))
103103
.Cast<FieldDeclarationSyntax>()
104104
.ToList();
@@ -129,11 +129,10 @@ private static List<FieldDeclarationSyntax> GetAllIncludedFields(DefinitionExtra
129129
/// <summary>
130130
/// Determine if a field has one of the scopes requested by a caller
131131
/// </summary>
132-
/// <param name="context">The definition extraction context for this extraction</param>
133132
/// <param name="fieldDeclaration">The declaration of the field being tested</param>
134133
/// <param name="scopes">The list of scopes in which the caller is interested</param>
135134
/// <returns>Boolean true if the field has one of the scopes requested by the caller, else false</returns>
136-
private static bool HasOneOfScopes(DefinitionExtractionContext context, FieldDeclarationSyntax fieldDeclaration, params string[] scopes)
135+
private static bool HasOneOfScopes(FieldDeclarationSyntax fieldDeclaration, params string[] scopes)
137136
{
138137
foreach (string scope in scopes)
139138
{

Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/AutoSerializable/Discovery/PropertyDefinitionExtractor.cs

+7-9
Original file line numberDiff line numberDiff line change
@@ -28,46 +28,44 @@ public static ExtractedPropertyDefinition ExtractPropertyDefinition(DefinitionEx
2828
{
2929
ExtractedPropertyDefinition propertyDefinition = new ExtractedPropertyDefinition();
3030

31-
propertyDefinition.PropertyName = GetPropertyName(extractionContext, propertyDeclaration);
32-
propertyDefinition.TypeDefinition.TypeName = GetPropertyTypeName(extractionContext, propertyDeclaration);
31+
propertyDefinition.PropertyName = GetPropertyName(propertyDeclaration);
32+
propertyDefinition.TypeDefinition.TypeName = GetPropertyTypeName(propertyDeclaration);
3333
propertyDefinition.TypeDefinition.TypeNamespace = extractionContext.GetTypeNamespace(propertyDeclaration.Type);
3434
propertyDefinition.TypeDefinition.IsAutoSerializable = extractionContext.IsTypeAutoSerializable(propertyDeclaration.Type);
3535
propertyDefinition.TypeDefinition.ImplementsIMobileObject = extractionContext.DoesTypeImplementIMobileObject(propertyDeclaration.Type);
36-
propertyDefinition.TypeDefinition.Nullable = GetFieldTypeNullable(extractionContext, propertyDeclaration);
36+
propertyDefinition.TypeDefinition.Nullable = GetFieldTypeNullable(propertyDeclaration);
3737

3838
return propertyDefinition;
3939
}
4040

4141
#region Private Helper Methods
42+
4243
/// <summary>
4344
/// Determines whether the field type is nullable.
4445
/// </summary>
45-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed.</param>
4646
/// <param name="propertyDeclaration">The PropertyDeclarationSyntax representing the field declaration.</param>
4747
/// <returns><c>true</c> if the field type is nullable; otherwise, <c>false</c>.</returns>
48-
private static bool GetFieldTypeNullable(DefinitionExtractionContext extractionContext, PropertyDeclarationSyntax propertyDeclaration)
48+
private static bool GetFieldTypeNullable(PropertyDeclarationSyntax propertyDeclaration)
4949
{
5050
return propertyDeclaration.Type is NullableTypeSyntax;
5151
}
5252

5353
/// <summary>
5454
/// Extract the name of the property for which we are building information
5555
/// </summary>
56-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
5756
/// <param name="propertyDeclaration">The PropertyDeclarationSyntax from which to extract the necessary information</param>
5857
/// <returns>The name of the property for which we are extracting information</returns>
59-
private static string GetPropertyName(DefinitionExtractionContext extractionContext, PropertyDeclarationSyntax propertyDeclaration)
58+
private static string GetPropertyName(PropertyDeclarationSyntax propertyDeclaration)
6059
{
6160
return propertyDeclaration.Identifier.ValueText;
6261
}
6362

6463
/// <summary>
6564
/// Extract the type name of the property for which we are building information
6665
/// </summary>
67-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
6866
/// <param name="propertyDeclaration">The PropertyDeclarationSyntax from which to extract the necessary information</param>
6967
/// <returns>The type name of the property for which we are extracting information</returns>
70-
private static string GetPropertyTypeName(DefinitionExtractionContext extractionContext, PropertyDeclarationSyntax propertyDeclaration)
68+
private static string GetPropertyTypeName(PropertyDeclarationSyntax propertyDeclaration)
7169
{
7270
return propertyDeclaration.Type.ToString();
7371
}

Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/AutoSerializable/Discovery/PropertyDefinitionsExtractor.cs

+6-8
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ private static List<PropertyDeclarationSyntax> GetPublicNonExcludedProperties(De
7575
// Get public or internal properties that are not specifically opted out with the [AutoNonSerialized] attribute
7676
serializableProperties = targetTypeDeclaration.Members.Where(
7777
m => m is PropertyDeclarationSyntax propertyDeclaration &&
78-
HasOneOfScopes(extractionContext, propertyDeclaration, "public") &&
79-
HasGetterAndSetter(extractionContext, propertyDeclaration) &&
78+
HasOneOfScopes(propertyDeclaration, "public") &&
79+
HasGetterAndSetter(propertyDeclaration) &&
8080
!extractionContext.IsPropertyDecoratedWithAutoNonSerialized(propertyDeclaration))
8181
.Cast<PropertyDeclarationSyntax>()
8282
.ToList();
@@ -97,8 +97,8 @@ private static List<PropertyDeclarationSyntax> GetNonPublicIncludedProperties(De
9797
// Get private or protected properties that are specifically opted in with the [AutoSerialized] attribute
9898
serializableProperties = targetTypeDeclaration.Members.Where(
9999
m => m is PropertyDeclarationSyntax propertyDeclaration &&
100-
!HasOneOfScopes(extractionContext, propertyDeclaration, "public") &&
101-
HasGetterAndSetter(extractionContext, propertyDeclaration) &&
100+
!HasOneOfScopes(propertyDeclaration, "public") &&
101+
HasGetterAndSetter(propertyDeclaration) &&
102102
extractionContext.IsPropertyDecoratedWithAutoSerialized(propertyDeclaration))
103103
.Cast<PropertyDeclarationSyntax>()
104104
.ToList();
@@ -109,11 +109,10 @@ private static List<PropertyDeclarationSyntax> GetNonPublicIncludedProperties(De
109109
/// <summary>
110110
/// Determine if a property has one of the scopes requested by a caller
111111
/// </summary>
112-
/// <param name="context">The definition extraction context for this extraction</param>
113112
/// <param name="propertyDeclaration">The declaration of the property being tested</param>
114113
/// <param name="scopes">The list of scopes in which the caller is interested</param>
115114
/// <returns>Boolean true if the property has one of the scopes requested by the caller, else false</returns>
116-
private static bool HasOneOfScopes(DefinitionExtractionContext context, PropertyDeclarationSyntax propertyDeclaration, params string[] scopes)
115+
private static bool HasOneOfScopes(PropertyDeclarationSyntax propertyDeclaration, params string[] scopes)
117116
{
118117
foreach (string scope in scopes)
119118
{
@@ -129,10 +128,9 @@ private static bool HasOneOfScopes(DefinitionExtractionContext context, Property
129128
/// <summary>
130129
/// Determine if a property has both a getter and a setter
131130
/// </summary>
132-
/// <param name="context">The definition extraction context for this extraction</param>
133131
/// <param name="propertyDeclaration">The declaration of the property being tested</param>
134132
/// <returns>Boolean true if the property has both a getter and setter (of any scope), else false</returns>
135-
private static bool HasGetterAndSetter(DefinitionExtractionContext context, PropertyDeclarationSyntax propertyDeclaration)
133+
private static bool HasGetterAndSetter(PropertyDeclarationSyntax propertyDeclaration)
136134
{
137135
bool hasGetter = false;
138136
bool hasSetter = false;

Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/AutoSerializable/Discovery/TypeDefinitionExtractor.cs

+8-12
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ public static ExtractedTypeDefinition ExtractTypeDefinition(DefinitionExtraction
3030
ExtractedTypeDefinition definition = new ExtractedTypeDefinition();
3131
StringBuilder fullyQualifiedNameBuilder = new StringBuilder();
3232

33-
definition.TypeName = GetTypeName(extractionContext, targetTypeDeclaration);
34-
definition.TypeKind = GetTypeKind(extractionContext, targetTypeDeclaration);
35-
definition.Namespace = GetNamespace(extractionContext, targetTypeDeclaration);
36-
definition.Scope = GetScopeDefinition(extractionContext, targetTypeDeclaration);
33+
definition.TypeName = GetTypeName(targetTypeDeclaration);
34+
definition.TypeKind = GetTypeKind(targetTypeDeclaration);
35+
definition.Namespace = GetNamespace(targetTypeDeclaration);
36+
definition.Scope = GetScopeDefinition(targetTypeDeclaration);
3737

3838
foreach (ExtractedContainerDefinition containerDefinition in ContainerDefinitionsExtractor.GetContainerDefinitions(extractionContext, targetTypeDeclaration))
3939
{
@@ -63,10 +63,9 @@ public static ExtractedTypeDefinition ExtractTypeDefinition(DefinitionExtraction
6363
/// <summary>
6464
/// Extract the namespace of the type for which we will be generating code
6565
/// </summary>
66-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
6766
/// <param name="targetTypeDeclaration">The TypeDeclarationSyntax from which to extract the necessary information</param>
6867
/// <returns>The namespace of the type for which generation is being performed</returns>
69-
private static string GetNamespace(DefinitionExtractionContext extractionContext, TypeDeclarationSyntax targetTypeDeclaration)
68+
private static string GetNamespace(TypeDeclarationSyntax targetTypeDeclaration)
7069
{
7170
// If we don't have a namespace at all we'll return an empty string
7271
// This accounts for the "default namespace" case
@@ -113,10 +112,9 @@ potentialNamespaceParent is not NamespaceDeclarationSyntax
113112
/// <summary>
114113
/// Extract the scope of the type for which we will be generating code
115114
/// </summary>
116-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
117115
/// <param name="targetTypeDeclaration">The TypeDeclarationSyntax from which to extract the necessary information</param>
118116
/// <returns>The scope of the type for which generation is being performed</returns>
119-
private static string GetScopeDefinition(DefinitionExtractionContext extractionContext, TypeDeclarationSyntax targetTypeDeclaration)
117+
private static string GetScopeDefinition(TypeDeclarationSyntax targetTypeDeclaration)
120118
{
121119
StringBuilder scopeNameBuilder = new StringBuilder();
122120

@@ -166,21 +164,19 @@ private static void AppendScopeName(StringBuilder stringBuilder, string scope)
166164
/// <summary>
167165
/// Extract the name of the type for which we will be generating code
168166
/// </summary>
169-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
170167
/// <param name="targetTypeDeclaration">The TypeDeclarationSyntax from which to extract the necessary information</param>
171168
/// <returns>The name of the type for which generation is being performed</returns>
172-
private static string GetTypeName(DefinitionExtractionContext extractionContext, TypeDeclarationSyntax targetTypeDeclaration)
169+
private static string GetTypeName(TypeDeclarationSyntax targetTypeDeclaration)
173170
{
174171
return targetTypeDeclaration.Identifier.ToString();
175172
}
176173

177174
/// <summary>
178175
/// Extract the textual definition of the kind that this type represents
179176
/// </summary>
180-
/// <param name="extractionContext">The definition extraction context in which the extraction is being performed</param>
181177
/// <param name="targetTypeDeclaration">The TypeDeclarationSyntax from which to extract the necessary information</param>
182178
/// <returns>The kind of the type for which generation is being performed</returns>
183-
private static string GetTypeKind(DefinitionExtractionContext extractionContext, TypeDeclarationSyntax targetTypeDeclaration)
179+
private static string GetTypeKind(TypeDeclarationSyntax targetTypeDeclaration)
184180
{
185181
return targetTypeDeclaration.Keyword.ToString();
186182
}

0 commit comments

Comments
 (0)