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
6 changes: 6 additions & 0 deletions Hypercube.Utilities.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hypercube.Utilities.Analyze
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hypercube.Utilities.Analyzers.CodeFix", "src\Hypercube.Utilities.Analyzers.CodeFix\Hypercube.Utilities.Analyzers.CodeFix.csproj", "{33E0A347-BAE3-43A1-9D6B-E5AF033CCE16}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Main", "Main\Main.csproj", "{6BB9C8F4-4BA5-45EA-8924-1DE5771DF4BF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -30,5 +32,9 @@ Global
{33E0A347-BAE3-43A1-9D6B-E5AF033CCE16}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33E0A347-BAE3-43A1-9D6B-E5AF033CCE16}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33E0A347-BAE3-43A1-9D6B-E5AF033CCE16}.Release|Any CPU.Build.0 = Release|Any CPU
{6BB9C8F4-4BA5-45EA-8924-1DE5771DF4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BB9C8F4-4BA5-45EA-8924-1DE5771DF4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BB9C8F4-4BA5-45EA-8924-1DE5771DF4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BB9C8F4-4BA5-45EA-8924-1DE5771DF4BF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
14 changes: 14 additions & 0 deletions Main/Main.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\src\Hypercube.Utilities\Hypercube.Utilities.csproj" />
</ItemGroup>

</Project>
53 changes: 53 additions & 0 deletions Main/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using Hypercube.Utilities.Serialization.Hml;
using Hypercube.Utilities.Serialization.Hml.Core;

namespace Main;

public static class Program
{
public static void Main()
{
var data = new TestData
{
Name = "ТесмиДев",
Age = 20,
Object = new TestObject(),
Roles =
[
"Programmer",
"Driver"
],
Recursion = new TestData
{
Name = "TornadoTech",
Age = 0x1F1A,
Object = null!,
Roles = [],
Recursion = null,
}
};

var options = new HmlSerializerOptions
{
Eol = false,
Indented = true,
IndentSize = 2
};

var serialized = HmlSerializer.Serialize(data, options);
var deserialized = HmlSerializer.Deserialize<TestData>(serialized, options);

Console.WriteLine(serialized);
}

private class TestData
{
public string Name;
public int Age;
public TestObject Object;
public List<string> Roles;
public TestData? Recursion;
}

private class TestObject;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Editing;

namespace Hypercube.Analyzers.CodeFix;
namespace Hypercube.Utilities.Analyzers.CodeFix;

[Shared, ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(DependencyCodeFixProvider))]
public sealed class DependencyCodeFixProvider : CodeFixProvider
Expand Down
2 changes: 1 addition & 1 deletion src/Hypercube.Utilities.Analyzers/DependencyAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Diagnostics;

namespace Hypercube.Analyzers;
namespace Hypercube.Utilities.Analyzers;

[DiagnosticAnalyzer(LanguageNames.CSharp)]
public sealed class DependencyAnalyzer : DiagnosticAnalyzer
Expand Down
2 changes: 1 addition & 1 deletion src/Hypercube.Utilities.Analyzers/DependencySuppressor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Diagnostics;

namespace Hypercube.Analyzers;
namespace Hypercube.Utilities.Analyzers;

[DiagnosticAnalyzer(LanguageNames.CSharp)]
public sealed class DependencySuppressor : DiagnosticSuppressor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public void SerializeTrailingComma()

""";

var options = new HmlSerializerOptions { TrailingComma = false };
var options = new HmlSerializerOptions();

var serialized = HmlSerializer.Serialize(new Weapon(), options);
Assert.That(serialized, Is.EqualTo(expected));
Expand Down
9 changes: 6 additions & 3 deletions src/Hypercube.Utilities/Helpers/ReflectionHelper.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System.Reflection;
using System.Xml.XPath;
using Hypercube.Utilities.Extensions;
using Hypercube.Utilities.Serialization.Hml.Core.Nodes.Value;
using JetBrains.Annotations;

namespace Hypercube.Utilities.Helpers;
Expand Down Expand Up @@ -249,6 +247,11 @@ public static IReadOnlyList<ValueInfo> GetValueInfos<T>(BindingFlags? flags = nu
return GetValueInfos(typeof(T), flags);
}

public static IReadOnlyList<ValueInfo> GetValueInfos(object obj, BindingFlags? flags = null)
{
return GetValueInfos(obj.GetType(), flags);
}

public static IReadOnlyList<ValueInfo> GetValueInfos(Type type, BindingFlags? flags = null)
{
flags ??= DefaultFlags;
Expand All @@ -262,7 +265,7 @@ public static IReadOnlyList<ValueInfo> GetValueInfos(Type type, BindingFlags? fl

foreach (var info in type.GetFields((BindingFlags) flags))
{
if (info.Name.Contains("k__BackingField"))
if (info.Name.Contains("k__BackingField") || info.Name.Contains("i__Field"))
continue;

if (Attribute.IsDefined(info, typeof(System.Runtime.CompilerServices.CompilerGeneratedAttribute)))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Diagnostics;
using Hypercube.Utilities.Serialization.Hml.Core.Nodes;

namespace Hypercube.Utilities.Serialization.Hml.Core.CompilerTypes;

[DebuggerDisplay("{Node} ({Parent})")]
public record BuildAstStackFrame(INode Node, INode Parent)
{
public readonly INode Node = Node;
public readonly INode Parent = Parent;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Hypercube.Utilities.Serialization.Hml.Core.Nodes;

namespace Hypercube.Utilities.Serialization.Hml.Core.CompilerTypes;

public record RenderAstStackFrame(INode Node)
{
public readonly INode Node = Node;

public RenderState State;
public int Index;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
namespace Hypercube.Utilities.Serialization.Hml.Core.CompilerTypes;

public class RenderAstState(int indentSize)
{
public string Indent { get; private set; } = string.Empty;

public void PushIndent()
{
Indent += new string(' ', indentSize);
}

public void PopIndent()
{
Indent = Indent.Remove(Indent.Length - indentSize);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Hypercube.Utilities.Serialization.Hml.Core.CompilerTypes;

public enum RenderState
{
Start,
Body,
End
}
Loading
Loading