Skip to content

Commit b8ef5d3

Browse files
ChebanovDDChebanovDD
committed
Resolve #15. Unify ObservableAttribute logic for properties and commands.
1 parent 155d7a6 commit b8ef5d3

File tree

18 files changed

+194
-94
lines changed

18 files changed

+194
-94
lines changed

‎src/UnityMvvmToolkit.Core/Attributes/ObservableAttribute.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
using System;
22

3-
namespace System.Runtime.CompilerServices
4-
{
5-
internal static class IsExternalInit {}
6-
}
7-
83
namespace UnityMvvmToolkit.Core.Attributes
94
{
10-
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
5+
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
116
public sealed class ObservableAttribute : Attribute
127
{
138
/// <summary>

‎src/UnityMvvmToolkit.Core/BindingContextObjectProvider.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ public TCommand GetCommand<TCommand>(IBindingContext context, string propertyNam
109109
{
110110
EnsureIsNotNullOrWhiteSpace(propertyName, nameof(propertyName));
111111

112-
if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false ||
113-
memberInfo.MemberType != MemberTypes.Property)
112+
if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false)
114113
{
115114
throw new InvalidOperationException($"Command '{propertyName}' not found.");
116115
}
@@ -131,8 +130,7 @@ public IBaseCommand RentCommandWrapper(IBindingContext context, CommandBindingDa
131130
EnsureIsNotNullOrWhiteSpace(bindingData.ParameterValue,
132131
$"Command '{bindingData.PropertyName}' has no parameter. Use {nameof(GetCommand)} instead.");
133132

134-
if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false ||
135-
memberInfo.MemberType != MemberTypes.Property)
133+
if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false)
136134
{
137135
throw new InvalidOperationException($"Command '{bindingData.PropertyName}' not found.");
138136
}

‎src/UnityMvvmToolkit.Core/Internal/BindingContextMemberProvider.cs

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,39 @@ private static bool TryGetFieldHashCode(Type contextType, FieldInfo fieldInfo, o
5858
return false;
5959
}
6060

61-
if (fieldInfo.IsPublic)
61+
if (HasObservableAttribute(fieldInfo, out var propertyName))
6262
{
63-
return TryGetHashCode(contextType, fieldInfo.Name, fieldInfo.FieldType, out hashCode);
63+
return string.IsNullOrWhiteSpace(propertyName)
64+
? TryGetHashCode(contextType, GetBindableName(fieldInfo.Name), fieldInfo.FieldType, out hashCode)
65+
: TryGetHashCode(contextType, propertyName, fieldInfo.FieldType, out hashCode);
6466
}
6567

66-
if (HasObservableAttribute(fieldInfo, out var propertyName) == false)
68+
if (fieldInfo.IsPublic)
6769
{
68-
hashCode = default;
69-
return false;
70+
return TryGetHashCode(contextType, fieldInfo.Name, fieldInfo.FieldType, out hashCode);
7071
}
7172

72-
return string.IsNullOrWhiteSpace(propertyName)
73-
? TryGetHashCode(contextType, GetFieldName(fieldInfo.Name), fieldInfo.FieldType, out hashCode)
74-
: TryGetHashCode(contextType, propertyName, fieldInfo.FieldType, out hashCode);
73+
hashCode = default;
74+
return false;
7575
}
7676

7777
[MethodImpl(MethodImplOptions.AggressiveInlining)]
7878
private static bool TryGetPropertyHashCode(Type contextType, PropertyInfo propertyInfo, out int hashCode)
7979
{
80-
if (propertyInfo.GetMethod.IsPrivate)
80+
if (HasObservableAttribute(propertyInfo, out var propertyName))
8181
{
82-
hashCode = default;
83-
return false;
82+
return string.IsNullOrWhiteSpace(propertyName)
83+
? TryGetHashCode(contextType, GetBindableName(propertyInfo.Name), propertyInfo.PropertyType, out hashCode)
84+
: TryGetHashCode(contextType, propertyName, propertyInfo.PropertyType, out hashCode);
8485
}
8586

86-
return TryGetHashCode(contextType, propertyInfo.Name, propertyInfo.PropertyType, out hashCode);
87+
if (propertyInfo.GetMethod.IsPublic)
88+
{
89+
return TryGetHashCode(contextType, propertyInfo.Name, propertyInfo.PropertyType, out hashCode);
90+
}
91+
92+
hashCode = default;
93+
return false;
8794
}
8895

8996
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -116,9 +123,9 @@ private static bool HasObservableAttribute(MemberInfo fieldInfo, out string prop
116123
}
117124

118125
[MethodImpl(MethodImplOptions.AggressiveInlining)]
119-
private static string GetFieldName(string fieldName)
126+
private static string GetBindableName(string memberName)
120127
{
121-
var resultName = fieldName;
128+
var resultName = memberName;
122129

123130
if (resultName.Length > 1)
124131
{

‎src/UnityMvvmToolkit.Core/System.Runtime.CompilerServices/IsExternalInit.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.ComponentModel;
2+
3+
// ReSharper disable CheckNamespace
4+
// ReSharper disable UnusedType.Global
5+
6+
namespace System.Runtime.CompilerServices
7+
{
8+
[EditorBrowsable(EditorBrowsableState.Never)]
9+
internal static class IsExternalInit
10+
{
11+
}
12+
}

‎src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Attributes/ObservableAttribute.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
using System;
22

3-
namespace System.Runtime.CompilerServices
4-
{
5-
internal static class IsExternalInit {}
6-
}
7-
83
namespace UnityMvvmToolkit.Core.Attributes
94
{
10-
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
5+
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
116
public sealed class ObservableAttribute : Attribute
127
{
138
/// <summary>

‎src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/BindingContextObjectProvider.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ public TCommand GetCommand<TCommand>(IBindingContext context, string propertyNam
109109
{
110110
EnsureIsNotNullOrWhiteSpace(propertyName, nameof(propertyName));
111111

112-
if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false ||
113-
memberInfo.MemberType != MemberTypes.Property)
112+
if (TryGetContextMemberInfo(context.GetType(), propertyName, out var memberInfo) == false)
114113
{
115114
throw new InvalidOperationException($"Command '{propertyName}' not found.");
116115
}
@@ -131,8 +130,7 @@ public IBaseCommand RentCommandWrapper(IBindingContext context, CommandBindingDa
131130
EnsureIsNotNullOrWhiteSpace(bindingData.ParameterValue,
132131
$"Command '{bindingData.PropertyName}' has no parameter. Use {nameof(GetCommand)} instead.");
133132

134-
if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false ||
135-
memberInfo.MemberType != MemberTypes.Property)
133+
if (TryGetContextMemberInfo(context.GetType(), bindingData.PropertyName, out var memberInfo) == false)
136134
{
137135
throw new InvalidOperationException($"Command '{bindingData.PropertyName}' not found.");
138136
}

‎src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Internal/BindingContextMemberProvider.cs

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,39 @@ private static bool TryGetFieldHashCode(Type contextType, FieldInfo fieldInfo, o
5858
return false;
5959
}
6060

61-
if (fieldInfo.IsPublic)
61+
if (HasObservableAttribute(fieldInfo, out var propertyName))
6262
{
63-
return TryGetHashCode(contextType, fieldInfo.Name, fieldInfo.FieldType, out hashCode);
63+
return string.IsNullOrWhiteSpace(propertyName)
64+
? TryGetHashCode(contextType, GetBindableName(fieldInfo.Name), fieldInfo.FieldType, out hashCode)
65+
: TryGetHashCode(contextType, propertyName, fieldInfo.FieldType, out hashCode);
6466
}
6567

66-
if (HasObservableAttribute(fieldInfo, out var propertyName) == false)
68+
if (fieldInfo.IsPublic)
6769
{
68-
hashCode = default;
69-
return false;
70+
return TryGetHashCode(contextType, fieldInfo.Name, fieldInfo.FieldType, out hashCode);
7071
}
7172

72-
return string.IsNullOrWhiteSpace(propertyName)
73-
? TryGetHashCode(contextType, GetFieldName(fieldInfo.Name), fieldInfo.FieldType, out hashCode)
74-
: TryGetHashCode(contextType, propertyName, fieldInfo.FieldType, out hashCode);
73+
hashCode = default;
74+
return false;
7575
}
7676

7777
[MethodImpl(MethodImplOptions.AggressiveInlining)]
7878
private static bool TryGetPropertyHashCode(Type contextType, PropertyInfo propertyInfo, out int hashCode)
7979
{
80-
if (propertyInfo.GetMethod.IsPrivate)
80+
if (HasObservableAttribute(propertyInfo, out var propertyName))
8181
{
82-
hashCode = default;
83-
return false;
82+
return string.IsNullOrWhiteSpace(propertyName)
83+
? TryGetHashCode(contextType, GetBindableName(propertyInfo.Name), propertyInfo.PropertyType, out hashCode)
84+
: TryGetHashCode(contextType, propertyName, propertyInfo.PropertyType, out hashCode);
8485
}
8586

86-
return TryGetHashCode(contextType, propertyInfo.Name, propertyInfo.PropertyType, out hashCode);
87+
if (propertyInfo.GetMethod.IsPublic)
88+
{
89+
return TryGetHashCode(contextType, propertyInfo.Name, propertyInfo.PropertyType, out hashCode);
90+
}
91+
92+
hashCode = default;
93+
return false;
8794
}
8895

8996
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -116,9 +123,9 @@ private static bool HasObservableAttribute(MemberInfo fieldInfo, out string prop
116123
}
117124

118125
[MethodImpl(MethodImplOptions.AggressiveInlining)]
119-
private static string GetFieldName(string fieldName)
126+
private static string GetBindableName(string memberName)
120127
{
121-
var resultName = fieldName;
128+
var resultName = memberName;
122129

123130
if (resultName.Length > 1)
124131
{

‎src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/System.Runtime.CompilerServices.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/System.Runtime.CompilerServices/IsExternalInit.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.ComponentModel;
2+
3+
// ReSharper disable CheckNamespace
4+
// ReSharper disable UnusedType.Global
5+
6+
namespace System.Runtime.CompilerServices
7+
{
8+
[EditorBrowsable(EditorBrowsableState.Never)]
9+
internal static class IsExternalInit
10+
{
11+
}
12+
}

‎src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/System.Runtime.CompilerServices/IsExternalInit.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/UnityMvvmToolkit.Test.Integration/BindingContextObjectProviderTests.cs

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void WarmupViewModel_ShouldWarmupBindingContext_WhenBindingContextIsNotWa
9696
}
9797

9898
[Theory]
99-
[InlineData(typeof(NoBindingContext))]
99+
[InlineData(typeof(NotBindingContext))]
100100
[InlineData(typeof(AbstractBindingContext))]
101101
[InlineData(typeof(IInterfaceBindingContext))]
102102
public void WarmupViewModel_ShouldThrow_WhenBindingContextIsNotSupported(Type bindingContextType)
@@ -437,23 +437,6 @@ public void GetCommand_ShouldThrow_WhenCommandIsNotFound()
437437
.WithMessage($"Command '{notPresentedCommand}' not found.");
438438
}
439439

440-
[Fact]
441-
public void GetCommand_ShouldThrow_WhenMemberTypeIsNotProperty()
442-
{
443-
// Arrange
444-
const string commandName = nameof(MyBindingContext.FieldCommand);
445-
446-
var objectProvider = new BindingContextObjectProvider(Array.Empty<IValueConverter>());
447-
var bindingContext = new MyBindingContext();
448-
449-
// Assert
450-
objectProvider
451-
.Invoking(sut => sut.GetCommand<ICommand>(bindingContext, commandName))
452-
.Should()
453-
.Throw<InvalidOperationException>()
454-
.WithMessage($"Command '{commandName}' not found.");
455-
}
456-
457440
[Fact]
458441
public void GetCommand_ShouldThrow_WhenCommandTypeIsNotAssignableFromPropertyType()
459442
{
@@ -553,25 +536,6 @@ public void RentCommandWrapper_ShouldThrow_WhenCommandIsNotFound()
553536
.WithMessage($"Command '{notPresentedCommand}' not found.");
554537
}
555538

556-
[Fact]
557-
public void RentCommandWrapper_ShouldThrow_WhenMemberTypeIsNotProperty()
558-
{
559-
// Arrange
560-
const string commandName = nameof(MyBindingContext.FieldCommand);
561-
562-
var objectProvider = new BindingContextObjectProvider(Array.Empty<IValueConverter>());
563-
var bindingContext = new MyBindingContext();
564-
565-
var commandBindingData = $"{commandName}, 5".ToCommandBindingData(0);
566-
567-
// Assert
568-
objectProvider
569-
.Invoking(sut => sut.RentCommandWrapper(bindingContext, commandBindingData))
570-
.Should()
571-
.Throw<InvalidOperationException>()
572-
.WithMessage($"Command '{commandName}' not found.");
573-
}
574-
575539
[Fact]
576540
public void GetCollectionItemTemplate_ShouldReturnObject_WhenCollectionIsNotEmpty()
577541
{

‎tests/UnityMvvmToolkit.Test.Integration/TestBindingContext/NotBindingContext.cs

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)