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
2 changes: 1 addition & 1 deletion Silksong.ModMenu/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
It should follow the format major.minor.patch (semantic versioning). If you publish your mod
as a library to NuGet, this version will also be used as the package version.
-->
<Version>0.7.3</Version>
<Version>0.7.4</Version>
</PropertyGroup>
</Project>
20 changes: 10 additions & 10 deletions Silksong.ModMenuAnalyzerTest/GeneratorTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class TestDataMenu : Silksong.ModMenu.Generator.ICustomMenu<Test.TestData
{
public Silksong.ModMenu.Elements.SelectableValueElement<int> MyInt
{
get => _MyInt;
get => _MyInt!;
set
{
if (value == null) throw new System.ArgumentNullException(nameof(MyInt));
Expand All @@ -45,7 +45,7 @@ public Silksong.ModMenu.Elements.SelectableValueElement<int> MyInt
_MyInt.OnValueChanged += _MyInt_subscriber;
}
}
private Silksong.ModMenu.Elements.SelectableValueElement<int> _MyInt;
private Silksong.ModMenu.Elements.SelectableValueElement<int>? _MyInt;

/// An aggregate event notified whenever any menu element in this class has its value changed.
public event System.Action<Silksong.ModMenu.Generator.CustomMenuValueChangedEvent>? OnValueChanged;
Expand Down Expand Up @@ -125,7 +125,7 @@ public class TestDataMenu : Silksong.ModMenu.Generator.ICustomMenu<Test.TestData
{
public Silksong.ModMenu.Generator.SubMenuElement<Test.SubData, SubDataMenu> SubData
{
get => _SubData;
get => _SubData!;
set
{
if (value == null) throw new System.ArgumentNullException(nameof(SubData));
Expand All @@ -137,7 +137,7 @@ public class TestDataMenu : Silksong.ModMenu.Generator.ICustomMenu<Test.TestData
_SubData.SubMenu.OnValueChanged += _SubData_subscriber;
}
}
private Silksong.ModMenu.Generator.SubMenuElement<Test.SubData, SubDataMenu> _SubData;
private Silksong.ModMenu.Generator.SubMenuElement<Test.SubData, SubDataMenu>? _SubData;

/// An aggregate event notified whenever any menu element in this class has its value changed.
public event System.Action<Silksong.ModMenu.Generator.CustomMenuValueChangedEvent>? OnValueChanged;
Expand Down Expand Up @@ -193,7 +193,7 @@ public class SubDataMenu : Silksong.ModMenu.Generator.ICustomMenu<Test.SubData>
{
public Silksong.ModMenu.Elements.SelectableValueElement<string> MyString
{
get => _MyString;
get => _MyString!;
set
{
if (value == null) throw new System.ArgumentNullException(nameof(MyString));
Expand All @@ -205,7 +205,7 @@ public Silksong.ModMenu.Elements.SelectableValueElement<string> MyString
_MyString.OnValueChanged += _MyString_subscriber;
}
}
private Silksong.ModMenu.Elements.SelectableValueElement<string> _MyString;
private Silksong.ModMenu.Elements.SelectableValueElement<string>? _MyString;

/// An aggregate event notified whenever any menu element in this class has its value changed.
public event System.Action<Silksong.ModMenu.Generator.CustomMenuValueChangedEvent>? OnValueChanged;
Expand Down Expand Up @@ -289,7 +289,7 @@ public class TestDataMenu : Silksong.ModMenu.Generator.ICustomMenu<Test.TestData
{
public Silksong.ModMenu.Elements.SelectableValueElement<int> PrimeInt
{
get => _PrimeInt;
get => _PrimeInt!;
set
{
if (value == null) throw new System.ArgumentNullException(nameof(PrimeInt));
Expand All @@ -301,10 +301,10 @@ public Silksong.ModMenu.Elements.SelectableValueElement<int> PrimeInt
_PrimeInt.OnValueChanged += _PrimeInt_subscriber;
}
}
private Silksong.ModMenu.Elements.SelectableValueElement<int> _PrimeInt;
private Silksong.ModMenu.Elements.SelectableValueElement<int>? _PrimeInt;
public Silksong.ModMenu.Elements.SelectableValueElement<Test.TestEnum> MyEnum
{
get => _MyEnum;
get => _MyEnum!;
set
{
if (value == null) throw new System.ArgumentNullException(nameof(MyEnum));
Expand All @@ -316,7 +316,7 @@ public Silksong.ModMenu.Elements.SelectableValueElement<Test.TestEnum> MyEnum
_MyEnum.OnValueChanged += _MyEnum_subscriber;
}
}
private Silksong.ModMenu.Elements.SelectableValueElement<Test.TestEnum> _MyEnum;
private Silksong.ModMenu.Elements.SelectableValueElement<Test.TestEnum>? _MyEnum;

/// An aggregate event notified whenever any menu element in this class has its value changed.
public event System.Action<Silksong.ModMenu.Generator.CustomMenuValueChangedEvent>? OnValueChanged;
Expand Down
7 changes: 4 additions & 3 deletions Silksong.ModMenuAnalyzers/AnalyzerReleases.Shipped.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
https://github.com/dotnet/roslyn/blob/main/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
; Shipped analyzer releases
; https://github.com/dotnet/roslyn/blob/main/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md

## Release 0.7.1

Expand All @@ -17,8 +18,8 @@ Rule ID | Category | Severity | Notes
SSMM0001 | SilksongModMenu | Error | Diagnostics
SSMM0002 | SilksongModMenu | Warning | Diagnostics
SSMM0003 | SilksongModMenu | Warning | Diagnostics
SSMM0004 | SilksongModMenu | Error | Diagnostics
SSMM0005 | SilksongModMenu | Warning | Diagnostics
SSMM0004 | SilksongModMenu | Warning | Diagnostics
SSMM0005 | SilksongModMenu | Error | Diagnostics
SSMM0006 | SilksongModMenu | Error | Diagnostics
SSMM0007 | SilksongModMenu | Error | Diagnostics
SSMM0008 | SilksongModMenu | Error | Diagnostics
Expand Down
3 changes: 2 additions & 1 deletion Silksong.ModMenuAnalyzers/AnalyzerReleases.Unshipped.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
https://github.com/dotnet/roslyn/blob/main/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
; Unshipped analyzer release
; https://github.com/dotnet/roslyn/blob/main/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
22 changes: 11 additions & 11 deletions Silksong.ModMenuAnalyzers/MenuProperty.cs
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,15 @@ private bool InitEnumType()
return true;
}

private bool InitColorType()
{
if (DataType.ToDisplayString() != "UnityEngine.Color")
return false;
DefaultInitializer.Add(
$@"{Name} = new Silksong.ModMenu.Elements.ColorInput({DisplayName.MakeLiteral()}, {Description.MakeLiteral()});"
);
return true;
private bool InitColorType()
{
if (DataType.ToDisplayString() != "UnityEngine.Color")
return false;

DefaultInitializer.Add(
$@"{Name} = new Silksong.ModMenu.Elements.ColorInput({DisplayName.MakeLiteral()}, {Description.MakeLiteral()});"
);
return true;
}

private bool InitTextType()
Expand Down Expand Up @@ -398,7 +398,7 @@ internal string DefineProperty()
return $$"""
public {{type}} {{Name}}
{
get => _{{Name}};
get => {{privateName}}!;
set
{
if (value == null) throw new System.ArgumentNullException(nameof({{Name}}));
Expand All @@ -410,7 +410,7 @@ internal string DefineProperty()
{{privateName}}{{subMenu}}.OnValueChanged += {{SubscriberName}};
}
}
private {{type}} {{privateName}};
private {{type}}? {{privateName}};
Comment thread
dplochcoder marked this conversation as resolved.
""";
}

Expand Down