Minor refactorings

PawelGerr · PawelGerr · commit 671a99400f98 · 2025-03-09T17:55:04.000+01:00
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ComparableGeneratorState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ComparableGeneratorState.cs
@@ -49,7 +49,7 @@ public override int GetHashCode()
          hashCode = (hashCode * 397) ^ CreateFactoryMethodName.GetHashCode();
          hashCode = (hashCode * 397) ^ SkipIComparable.GetHashCode();
          hashCode = (hashCode * 397) ^ IsKeyMemberComparable.GetHashCode();
-         hashCode = (hashCode * 397) ^ ComparerAccessor?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (ComparerAccessor?.GetHashCode() ?? 0);
 
          return hashCode;
       }
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ComparisonOperatorsGeneratorState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ComparisonOperatorsGeneratorState.cs
@@ -49,7 +49,7 @@ public override int GetHashCode()
          hashCode = (hashCode * 397) ^ CreateFactoryMethodName.GetHashCode();
          hashCode = (hashCode * 397) ^ (int)OperatorsGeneration;
          hashCode = (hashCode * 397) ^ (int)KeyMemberOperators;
-         hashCode = (hashCode * 397) ^ ComparerAccessor?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (ComparerAccessor?.GetHashCode() ?? 0);
 
          return hashCode;
       }
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ContainingTypeState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ContainingTypeState.cs
@@ -38,7 +38,11 @@ public override int GetHashCode()
    {
       unchecked
       {
-         return (Name.GetHashCode() * 397) ^ IsReferenceType.GetHashCode();
+         var hashCode = Name.GetHashCode();
+         hashCode = (hashCode * 397) ^ IsReferenceType.GetHashCode();
+         hashCode = (hashCode * 397) ^ IsRecord.GetHashCode();
+
+         return hashCode;
       }
    }
 }
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/DelegateMethodState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/DelegateMethodState.cs
@@ -49,9 +49,9 @@ public override int GetHashCode()
       {
          var hashCode = (int)Accessibility;
          hashCode = (hashCode * 397) ^ MethodName.GetHashCode();
-         hashCode = (hashCode * 397) ^ ReturnType?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (ReturnType?.GetHashCode() ?? 0);
          hashCode = (hashCode * 397) ^ Parameters.ComputeHashCode();
-         hashCode = (hashCode * 397) ^ DelegateName?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (DelegateName?.GetHashCode() ?? 0);
          return hashCode;
       }
    }
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/EqualityComparisonOperatorsGeneratorState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/EqualityComparisonOperatorsGeneratorState.cs
@@ -39,7 +39,7 @@ public override int GetHashCode()
          var hashCode = TypeInformationComparer.Instance.GetHashCode(Type);
          hashCode = (hashCode * 397) ^ (KeyMember is null ? 0 : MemberInformationComparer.Instance.GetHashCode(KeyMember));
          hashCode = (hashCode * 397) ^ (int)OperatorsGeneration;
-         hashCode = (hashCode * 397) ^ EqualityComparer?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (EqualityComparer?.GetHashCode() ?? 0);
 
          return hashCode;
       }
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ComplexValueObjectSourceGeneratorState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ComplexValueObjectSourceGeneratorState.cs
@@ -116,7 +116,7 @@ public override int GetHashCode()
       {
          var hashCode = TypeFullyQualified.GetHashCode();
          hashCode = (hashCode * 397) ^ IsReferenceType.GetHashCode();
-         hashCode = (hashCode * 397) ^ FactoryValidationReturnType?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (FactoryValidationReturnType?.GetHashCode() ?? 0);
          hashCode = (hashCode * 397) ^ ValidationError.GetHashCode();
          hashCode = (hashCode * 397) ^ Settings.GetHashCode();
          hashCode = (hashCode * 397) ^ EqualityMembers.ComputeHashCode();
diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/KeyedValueObjectSourceGeneratorState.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/KeyedValueObjectSourceGeneratorState.cs
@@ -76,7 +76,7 @@ public override int GetHashCode()
       {
          var hashCode = TypeFullyQualified.GetHashCode();
          hashCode = (hashCode * 397) ^ IsReferenceType.GetHashCode();
-         hashCode = (hashCode * 397) ^ FactoryValidationReturnType?.GetHashCode() ?? 0;
+         hashCode = (hashCode * 397) ^ (FactoryValidationReturnType?.GetHashCode() ?? 0);
          hashCode = (hashCode * 397) ^ KeyMember.GetHashCode();
          hashCode = (hashCode * 397) ^ ValidationError.GetHashCode();
          hashCode = (hashCode * 397) ^ Settings.GetHashCode();

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override int GetHashCode()`
`49`	`49`	`hashCode = (hashCode * 397) ^ CreateFactoryMethodName.GetHashCode();`
`50`	`50`	`hashCode = (hashCode * 397) ^ SkipIComparable.GetHashCode();`
`51`	`51`	`hashCode = (hashCode * 397) ^ IsKeyMemberComparable.GetHashCode();`
`52`		`- hashCode = (hashCode * 397) ^ ComparerAccessor?.GetHashCode() ?? 0;`
	`52`	`+ hashCode = (hashCode * 397) ^ (ComparerAccessor?.GetHashCode() ?? 0);`
`53`	`53`
`54`	`54`	`return hashCode;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ public override int GetHashCode()`
`38`	`38`	`{`
`39`	`39`	`unchecked`
`40`	`40`	`{`
`41`		`- return (Name.GetHashCode() * 397) ^ IsReferenceType.GetHashCode();`
	`41`	`+ var hashCode = Name.GetHashCode();`
	`42`	`+ hashCode = (hashCode * 397) ^ IsReferenceType.GetHashCode();`
	`43`	`+ hashCode = (hashCode * 397) ^ IsRecord.GetHashCode();`
	`44`	`+`
	`45`	`+ return hashCode;`
`42`	`46`	`}`
`43`	`47`	`}`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ public override int GetHashCode()`
`49`	`49`	`{`
`50`	`50`	`var hashCode = (int)Accessibility;`
`51`	`51`	`hashCode = (hashCode * 397) ^ MethodName.GetHashCode();`
`52`		`- hashCode = (hashCode * 397) ^ ReturnType?.GetHashCode() ?? 0;`
	`52`	`+ hashCode = (hashCode * 397) ^ (ReturnType?.GetHashCode() ?? 0);`
`53`	`53`	`hashCode = (hashCode * 397) ^ Parameters.ComputeHashCode();`
`54`		`- hashCode = (hashCode * 397) ^ DelegateName?.GetHashCode() ?? 0;`
	`54`	`+ hashCode = (hashCode * 397) ^ (DelegateName?.GetHashCode() ?? 0);`
`55`	`55`	`return hashCode;`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public override int GetHashCode()`
`39`	`39`	`var hashCode = TypeInformationComparer.Instance.GetHashCode(Type);`
`40`	`40`	`hashCode = (hashCode * 397) ^ (KeyMember is null ? 0 : MemberInformationComparer.Instance.GetHashCode(KeyMember));`
`41`	`41`	`hashCode = (hashCode * 397) ^ (int)OperatorsGeneration;`
`42`		`- hashCode = (hashCode * 397) ^ EqualityComparer?.GetHashCode() ?? 0;`
	`42`	`+ hashCode = (hashCode * 397) ^ (EqualityComparer?.GetHashCode() ?? 0);`
`43`	`43`
`44`	`44`	`return hashCode;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public override int GetHashCode()`
`116`	`116`	`{`
`117`	`117`	`var hashCode = TypeFullyQualified.GetHashCode();`
`118`	`118`	`hashCode = (hashCode * 397) ^ IsReferenceType.GetHashCode();`
`119`		`- hashCode = (hashCode * 397) ^ FactoryValidationReturnType?.GetHashCode() ?? 0;`
	`119`	`+ hashCode = (hashCode * 397) ^ (FactoryValidationReturnType?.GetHashCode() ?? 0);`
`120`	`120`	`hashCode = (hashCode * 397) ^ ValidationError.GetHashCode();`
`121`	`121`	`hashCode = (hashCode * 397) ^ Settings.GetHashCode();`
`122`	`122`	`hashCode = (hashCode * 397) ^ EqualityMembers.ComputeHashCode();`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public override int GetHashCode()`
`76`	`76`	`{`
`77`	`77`	`var hashCode = TypeFullyQualified.GetHashCode();`
`78`	`78`	`hashCode = (hashCode * 397) ^ IsReferenceType.GetHashCode();`
`79`		`- hashCode = (hashCode * 397) ^ FactoryValidationReturnType?.GetHashCode() ?? 0;`
	`79`	`+ hashCode = (hashCode * 397) ^ (FactoryValidationReturnType?.GetHashCode() ?? 0);`
`80`	`80`	`hashCode = (hashCode * 397) ^ KeyMember.GetHashCode();`
`81`	`81`	`hashCode = (hashCode * 397) ^ ValidationError.GetHashCode();`
`82`	`82`	`hashCode = (hashCode * 397) ^ Settings.GetHashCode();`