Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions XAMLTest/Host/VisualTreeService.Elements.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ namespace XamlTest.Host;

internal partial class VisualTreeService : Protocol.ProtocolBase
{
[GeneratedRegex(@"(?<=^\[[^=\]]+=[^=\]]+)\]")]
private static partial Regex PropertyExpressionRegex();

[GeneratedRegex(@"(?<=.)[\.\/\~]")]
private static partial Regex QuerySeparatorRegex();

[GeneratedRegex(@"\[(?<Index>\d+)]$")]
private static partial Regex IndexerRegex();

private Dictionary<string, WeakReference<DependencyObject>> KnownElements { get; } = new();

public override async Task<ElementResult> GetElement(ElementQuery request, ServerCallContext context)
Expand Down Expand Up @@ -133,17 +142,14 @@ await Application.Dispatcher.InvokeAsync(() =>

static QueryPartType GetNextQueryType(ref string query, out string value)
{
Regex propertyExpressionRegex = new(@"(?<=^\[[^=\]]+=[^=\]]+)\]");
Regex regex = new(@"(?<=.)[\.\/\~]");

string currentQuery = query;
if (propertyExpressionRegex.Match(query) is { } propertyExpressionMatch &&
if (PropertyExpressionRegex().Match(query) is { } propertyExpressionMatch &&
propertyExpressionMatch.Success)
{
currentQuery = query[..(propertyExpressionMatch.Index + 1)];
query = query[(propertyExpressionMatch.Index + 1)..];
}
else if (regex.Match(query) is { } match &&
else if (QuerySeparatorRegex().Match(query) is { } match &&
match.Success)
{
currentQuery = query[..match.Index];
Expand Down Expand Up @@ -203,10 +209,8 @@ static bool TryEvaluateNameQuery(DependencyObject root, string name, [NotNullWhe

static bool TryEvaluateChildTypeQuery(DependencyObject root, string childTypeQuery, [NotNullWhen(true)] out object? found)
{
Regex indexerRegex = new(@"\[(?<Index>\d+)]$");

int index = 0;
Match match = indexerRegex.Match(childTypeQuery);
Match match = IndexerRegex().Match(childTypeQuery);
if (match.Success)
{
index = int.Parse(match.Groups["Index"].Value);
Expand Down
27 changes: 21 additions & 6 deletions XAMLTest/Internal/Serializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ public string Serialize(Type type, object? value)

string ISerializer.Serialize(Type type, object? value, ISerializer rootSerializer)
{
if (Serializers.FirstOrDefault(x => x.CanSerialize(type, rootSerializer)) is { } serializer)
for (int i = 0; i < Serializers.Count; i++)
{
return serializer.Serialize(type, value, rootSerializer);
if (Serializers[i].CanSerialize(type, rootSerializer))
{
return Serializers[i].Serialize(type, value, rootSerializer);
}
}
return "";
}
Expand All @@ -39,9 +42,12 @@ string ISerializer.Serialize(Type type, object? value, ISerializer rootSerialize

object? ISerializer.Deserialize(Type type, string value, ISerializer rootSerializer)
{
if (Serializers.FirstOrDefault(x => x.CanSerialize(type, rootSerializer)) is { } serializer)
for (int i = 0; i < Serializers.Count; i++)
{
return serializer.Deserialize(type, value, rootSerializer);
if (Serializers[i].CanSerialize(type, rootSerializer))
{
return Serializers[i].Deserialize(type, value, rootSerializer);
}
}
return null;
}
Expand All @@ -55,6 +61,15 @@ string ISerializer.Serialize(Type type, object? value, ISerializer rootSerialize
return default;
}

bool ISerializer.CanSerialize(Type type, ISerializer rootSerializer)
=> Serializers.Any(x => x.CanSerialize(type, rootSerializer));
bool ISerializer.CanSerialize(Type type, ISerializer rootSerializer)
{
for (int i = 0; i < Serializers.Count; i++)
{
if (Serializers[i].CanSerialize(type, rootSerializer))
{
return true;
}
}
return false;
}
}
Loading