Cat-Lips · Joy-less · Feb 11, 2025 · Feb 11, 2025 · Feb 11, 2025 · Jun 6, 2025
diff --git a/CustomGeneratorTests/CustomGeneratorTests.csproj b/CustomGeneratorTests/CustomGeneratorTests.csproj
@@ -7,7 +7,7 @@
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1000.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1122.Release" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4.8.0]" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/Godot 3 Tests/Godot 3 Tests.csproj b/Godot 3 Tests/Godot 3 Tests.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="[7.2.0]" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1000.Release" />                 
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1122.Release" />                 
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />
   </ItemGroup>
 </Project>
diff --git a/Godot 4 Tests/Godot 4 Tests.csproj b/Godot 4 Tests/Godot 4 Tests.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="[7.2.0]" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1000.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1122.Release" />
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />
   </ItemGroup>
 </Project>
diff --git a/NRT.Tests/GD3.NRT/GD3.NRT.csproj b/NRT.Tests/GD3.NRT/GD3.NRT.csproj
@@ -10,6 +10,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="[7.2.0]" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1000.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1122.Release" />
   </ItemGroup>
 </Project>
diff --git a/NRT.Tests/GD4.NRT/GD4.NRT.csproj b/NRT.Tests/GD4.NRT/GD4.NRT.csproj
@@ -10,6 +10,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="[7.2.0]" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1000.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250606-1122.Release" />
   </ItemGroup>
 </Project>
diff --git a/SourceGenerators/AutoloadExtensions/AutoloadAttribute.cs b/SourceGenerators/AutoloadExtensions/AutoloadAttribute.cs
@@ -3,7 +3,7 @@
 namespace Godot;
 
 [AttributeUsage(AttributeTargets.Class)]
-public class AutoloadAttribute([CallerFilePath] string ClassPath = null) : Attribute
+public class AutoloadAttribute([CallerFilePath] string ClassPath = null!) : Attribute
 {
     public string ClassPath { get; } = ClassPath;
 }

diff --git a/SourceGenerators/AutoloadExtensions/AutoloadDataModel.cs b/SourceGenerators/AutoloadExtensions/AutoloadDataModel.cs
@@ -4,11 +4,11 @@ namespace GodotSharp.SourceGenerators.AutoloadExtensions;
 
 internal class AutoloadDataModel : ClassDataModel
 {
-    public record AutoloadData(string Type, string GodotName, string DisplayName);
+    public record AutoloadData(string Type, string? GodotName, string? DisplayName);
 
     public IList<AutoloadData> Autoloads { get; }
 
-    public AutoloadDataModel(Compilation compilation, INamedTypeSymbol symbol, string csPath, string gdRoot, IDictionary<string, string> lookup)
+    public AutoloadDataModel(Compilation compilation, INamedTypeSymbol symbol, string csPath, string? gdRoot, IDictionary<string, string> lookup)
         : base(symbol)
     {
         Autoloads = AutoloadScraper.GetAutoloads(compilation, csPath, gdRoot)

diff --git a/SourceGenerators/AutoloadExtensions/AutoloadScraper.cs b/SourceGenerators/AutoloadExtensions/AutoloadScraper.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
 
@@ -11,7 +12,7 @@ internal static class AutoloadScraper
     private const string AutoloadRegexStr = @"^(?<Name>.+?)=""\*res:\/\/(?<Path>.+?)""$";
     private static readonly Regex AutoloadRegex = new(AutoloadRegexStr, RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
-    public static IEnumerable<Autoload> GetAutoloads(Compilation compilation, string csFile, string gdRoot)
+    public static IEnumerable<Autoload> GetAutoloads(Compilation compilation, string csFile, string? gdRoot)
     {
         var gdFile = GD.GetProjectFile(csFile, gdRoot);
         Log.Debug($"Scraping {gdFile} [Compiling {csFile}]");
@@ -42,7 +43,7 @@ IEnumerable<Autoload> MatchAutoloads(string gdFile)
                 }
             }
 
-            bool TryMatchAutoload(string line, out string name, out string path)
+            bool TryMatchAutoload(string line, [NotNullWhen(true)] out string? name, [NotNullWhen(true)] out string? path)
             {
                 var match = AutoloadRegex.Match(line);
                 if (match.Success)
@@ -58,13 +59,13 @@ bool TryMatchAutoload(string line, out string name, out string path)
                 return false;
             }
 
-            string TryGetType(string path)
+            string? TryGetType(string? path)
             {
                 return Path.GetExtension(path) switch
                 {
-                    ".gd" => MiniGdScraper.TryGetType(compilation, gdRoot, path),
-                    ".cs" => MiniCsScraper.TryGetType(compilation, gdRoot, path),
-                    ".tscn" => MiniTscnScraper.TryGetType(compilation, gdRoot, path),
+                    ".gd" => MiniGdScraper.TryGetType(compilation, gdRoot, path!),
+                    ".cs" => MiniCsScraper.TryGetType(compilation, gdRoot, path!),
+                    ".tscn" => MiniTscnScraper.TryGetType(compilation, gdRoot, path!),
                     _ => null,
                 };
             }
@@ -84,7 +85,7 @@ public static string TryGetType(Compilation compilation, string gdRoot, string p
             var file = Path.Combine(gdRoot, path);
             Log.Debug($">>> Scraping type from gd: {file}");
 
-            string type = null;
+            string? type = null;
             foreach (var line in File.ReadLines(file)
                 .Where(line => line is not "" && !line.StartsWith("#")))
             {
@@ -100,7 +101,7 @@ public static string TryGetType(Compilation compilation, string gdRoot, string p
             Log.Debug($"<<< {type}");
             return type;
 
-            bool TryMatchExtends(string line, ref string type)
+            bool TryMatchExtends(string line, ref string? type)
             {
                 var match = ExtendsRegex1.Match(line);
                 if (match.Success)
@@ -124,7 +125,7 @@ bool TryMatchExtends(string line, ref string type)
                 return false;
             }
 
-            string GetValidType(string type)
+            string GetValidType(string? type)
             {
                 if (type is null)
                 {
@@ -164,7 +165,7 @@ public static string TryGetType(Compilation compilation, string gdRoot, string p
             Log.Debug($"<<< {type}");
             return type;
 
-            static string GetValidType(string type)
+            static string GetValidType(string? type)
             {
                 if (type is null)
                 {
@@ -201,7 +202,7 @@ public static string TryGetType(Compilation compilation, string gdRoot, string t
             var file = Path.Combine(gdRoot, tscn);
             Log.Debug($">>> Scraping type from tscn: {file}");
 
-            string type = null;
+            string? type = null;
             var doneRes = false;
             var doneRoot = false;
             var doneValues = false;
@@ -254,7 +255,7 @@ bool TryMatchRes(string line)
                 return false;
             }
 
-            bool TryMatchRoot(string line, ref string type)
+            bool TryMatchRoot(string line, ref string? type)
             {
                 if (doneRoot) return false;
 
@@ -298,7 +299,7 @@ bool TryMatchRoot(string line, ref string type)
                 return true;
             }
 
-            bool TryMatchValues(string line, ref string type)
+            bool TryMatchValues(string line, ref string? type)
             {
                 if (doneValues) return false;
 
@@ -316,7 +317,7 @@ bool TryMatchValues(string line, ref string type)
 
                 return true;
 
-                bool TryMatchScript(string line, ref string type)
+                bool TryMatchScript(string line, ref string? type)
                 {
                     var match = ScriptRegexGD4.Match(line);
                     if (match.Success)
@@ -338,7 +339,7 @@ bool TryMatchScript(string line, ref string type)
 
                     return false;
 
-                    string TryGetType(string path)
+                    string? TryGetType(string path)
                     {
                         return Path.GetExtension(path) switch
                         {
@@ -350,7 +351,7 @@ string TryGetType(string path)
                 }
             }
 
-            string GetValidType(string type)
+            string GetValidType(string? type)
             {
                 if (type is null)
                 {

diff --git a/SourceGenerators/AutoloadExtensions/AutoloadSourceGenerator.cs b/SourceGenerators/AutoloadExtensions/AutoloadSourceGenerator.cs
@@ -1,4 +1,5 @@
-using Microsoft.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Scriban;
 
@@ -7,6 +8,7 @@ namespace GodotSharp.SourceGenerators.AutoloadExtensions;
 [Generator]
 internal class AutoloadSourceGenerator : SourceGeneratorForDeclaredTypeWithAttribute<Godot.AutoloadAttribute>
 {
+    [field: MaybeNull]
     private static Template AutoloadTemplate => field ??= Template.Parse(Resources.AutoloadTemplate);
 
     protected override IEnumerable<(string Name, string Source)> StaticSources
@@ -17,7 +19,7 @@ internal class AutoloadSourceGenerator : SourceGeneratorForDeclaredTypeWithAttri
         }
     }
 
-    protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(Compilation compilation, SyntaxNode _, INamedTypeSymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
+    protected override (string? GeneratedCode, DiagnosticDetail? Error) GenerateCode(Compilation compilation, SyntaxNode _, INamedTypeSymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
     {
         var model = new AutoloadDataModel(compilation, symbol, ReconstructAttribute().ClassPath, options.TryGetGodotProjectDir(), GetAutoloadRenameLookup());
         Log.Debug($"--- MODEL ---\n{model}\n");
@@ -28,15 +30,15 @@ protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(C
         return (output, null);
 
         Godot.AutoloadAttribute ReconstructAttribute()
-            => new((string)attribute.ConstructorArguments[0].Value);
+            => new((string)attribute.ConstructorArguments[0].Value!);
 
         IDictionary<string, string> GetAutoloadRenameLookup()
         {
             return symbol.GetAttributes()
-                .Where(x => x.AttributeClass.Name == RenameAttribute)
+                .Where(x => x.AttributeClass?.Name == RenameAttribute)
                 .ToDictionary(
-                    x => (string)x.ConstructorArguments[1].Value,   // GodotName
-                    x => (string)x.ConstructorArguments[0].Value);  // DisplayName
+                    x => (string)x.ConstructorArguments[1].Value!,   // GodotName
+                    x => (string)x.ConstructorArguments[0].Value!);  // DisplayName
         }
     }
 

diff --git a/SourceGenerators/CodeCommentsExtensions/CodeCommentsSourceGenerator.cs b/SourceGenerators/CodeCommentsExtensions/CodeCommentsSourceGenerator.cs
@@ -1,4 +1,5 @@
-using Microsoft.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Scriban;
 
@@ -7,9 +8,10 @@ namespace GodotSharp.SourceGenerators.CodeCommentsExtensions;
 [Generator]
 internal class CodeCommentsSourceGenerator : SourceGeneratorForDeclaredTypeWithAttribute<Godot.CodeCommentsAttribute>
 {
+    [field: MaybeNull]
     private static Template CodeCommentsTemplate => field ??= Template.Parse(Resources.CodeCommentsTemplate);
 
-    protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(Compilation compilation, SyntaxNode node, INamedTypeSymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
+    protected override (string? GeneratedCode, DiagnosticDetail? Error) GenerateCode(Compilation compilation, SyntaxNode node, INamedTypeSymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
     {
         var model = new CodeCommentsDataModel(symbol, node, ReconstructAttribute().Strip);
         Log.Debug($"--- MODEL ---\n{model}\n");
@@ -20,6 +22,6 @@ protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(C
         return (output, null);
 
         Godot.CodeCommentsAttribute ReconstructAttribute()
-            => new((string)attribute.ConstructorArguments[0].Value);
+            => new((string)attribute.ConstructorArguments[0].Value!);
     }
 }
diff --git a/SourceGenerators/DiagnosticDetail.cs b/SourceGenerators/DiagnosticDetail.cs
@@ -2,8 +2,8 @@
 
 public record DiagnosticDetail
 {
-    public string Id { get; init; }
-    public string Category { get; init; }
-    public string Title { get; init; }
-    public string Message { get; init; }
+    public string? Id { get; init; }
+    public string? Category { get; init; }
+    public required string Title { get; init; }
+    public required string Message { get; init; }
 }
diff --git a/SourceGenerators/GodotNotifyExtensions/GodotNotifyDataModel.cs b/SourceGenerators/GodotNotifyExtensions/GodotNotifyDataModel.cs
@@ -10,8 +10,8 @@ internal class GodotNotifyDataModel : MemberDataModel
     public string Field { get; }
 
     public string Modifiers { get; }
-    public string GetAccess { get; }
-    public string SetAccess { get; }
+    public string? GetAccess { get; }
+    public string? SetAccess { get; }
 
     public bool ClassIsResource { get; }
     public bool ValueIsResource { get; }
@@ -36,7 +36,7 @@ public GodotNotifyDataModel(IPropertySymbol symbol, SyntaxNode node)
         static bool IsResource(ITypeSymbol type)
             => type.InheritsFrom("Resource");
 
-        static string GetAccessibility(IMethodSymbol accessor, string @default)
+        static string? GetAccessibility(IMethodSymbol? accessor, string @default)
         {
             var accessibility = accessor?.GetDeclaredAccessibility();
             return accessibility is null ? null

diff --git a/SourceGenerators/GodotNotifyExtensions/GodotNotifySourceGenerator.cs b/SourceGenerators/GodotNotifyExtensions/GodotNotifySourceGenerator.cs
@@ -1,4 +1,5 @@
-using Microsoft.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Scriban;
 
@@ -7,9 +8,10 @@ namespace GodotSharp.SourceGenerators.GodotNotifyExtensions;
 [Generator]
 internal class GodotNotifySourceGenerator : SourceGeneratorForDeclaredPropertyWithAttribute<Godot.NotifyAttribute>
 {
+    [field: MaybeNull]
     private static Template GodotNotifyTemplate => field ??= Template.Parse(Resources.GodotNotifyTemplate);
 
-    protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(Compilation compilation, SyntaxNode node, IPropertySymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
+    protected override (string? GeneratedCode, DiagnosticDetail? Error) GenerateCode(Compilation compilation, SyntaxNode node, IPropertySymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
     {
         var model = new GodotNotifyDataModel(symbol, node);
         Log.Debug($"--- MODEL ---\n{model}\n");

diff --git a/SourceGenerators/GodotOverrideExtensions/GodotOverrideSourceGenerator.cs b/SourceGenerators/GodotOverrideExtensions/GodotOverrideSourceGenerator.cs
@@ -1,4 +1,5 @@
-using Microsoft.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Scriban;
 
@@ -7,9 +8,10 @@ namespace GodotSharp.SourceGenerators.GodotOverrideExtensions;
 [Generator]
 internal class GodotOverrideSourceGenerator : SourceGeneratorForDeclaredMethodWithAttribute<Godot.GodotOverrideAttribute>
 {
+    [field: MaybeNull]
     private static Template GodotOverrideTemplate => field ??= Template.Parse(Resources.GodotOverrideTemplate);
 
-    protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(Compilation compilation, SyntaxNode node, IMethodSymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
+    protected override (string? GeneratedCode, DiagnosticDetail? Error) GenerateCode(Compilation compilation, SyntaxNode node, IMethodSymbol symbol, AttributeData attribute, AnalyzerConfigOptions options)
     {
         var model = new GodotOverrideDataModel(symbol, ReconstructAttribute().Replace);
         Log.Debug($"--- MODEL ---\n{model}\n");
@@ -20,6 +22,6 @@ protected override (string GeneratedCode, DiagnosticDetail Error) GenerateCode(C
         return (output, null);
 
         Godot.GodotOverrideAttribute ReconstructAttribute()
-            => new((bool)attribute.ConstructorArguments[0].Value);
+            => new((bool)attribute.ConstructorArguments[0].Value!);
     }
 }
diff --git a/SourceGenerators/InputMapExtensions/InputMapAttribute.cs b/SourceGenerators/InputMapExtensions/InputMapAttribute.cs
@@ -5,7 +5,7 @@ namespace Godot;
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class InputMapAttribute : Attribute
 {
-    public InputMapAttribute([CallerFilePath] string classPath = null)
+    public InputMapAttribute([CallerFilePath] string classPath = null!)
         => ClassPath = classPath;
 
     public string ClassPath { get; }

diff --git a/SourceGenerators/InputMapExtensions/InputMapDataModel.cs b/SourceGenerators/InputMapExtensions/InputMapDataModel.cs
@@ -9,7 +9,7 @@ internal class InputMapDataModel : ClassDataModel
     public IList<InputAction> Actions { get; }
     public ILookup<string, InputAction> NestedActions { get; }
 
-    public InputMapDataModel(INamedTypeSymbol symbol, string csPath, string gdRoot) : base(symbol)
+    public InputMapDataModel(INamedTypeSymbol symbol, string csPath, string? gdRoot) : base(symbol)
     {
         var actions = InputMapScraper
             .GetInputActions(csPath, gdRoot)

diff --git a/SourceGenerators/InputMapExtensions/InputMapScraper.cs b/SourceGenerators/InputMapExtensions/InputMapScraper.cs
@@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
 
 namespace GodotSharp.SourceGenerators.InputMapExtensions;
 
@@ -7,7 +8,7 @@ internal static class InputMapScraper
     private const string InputRegexStr = @"^""?(?<Input>.+?)""?=.*$";
     private static readonly Regex InputRegex = new(InputRegexStr, RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
-    public static IEnumerable<string> GetInputActions(string csFile, string gdRoot)
+    public static IEnumerable<string> GetInputActions(string csFile, string? gdRoot)
     {
         var gdFile = GD.GetProjectFile(csFile, gdRoot);
         Log.Debug($"Scraping {gdFile} [Compiling {csFile}]");
@@ -36,7 +37,7 @@ static IEnumerable<string> MatchInputActions(string gdFile)
                 }
             }
 
-            static bool TryMatchInput(string line, out string action)
+            static bool TryMatchInput(string line, [NotNullWhen(true)] out string? action)
             {
                 var match = InputRegex.Match(line);
                 if (match.Success)