[#142] Idiomatic source defaults

Author: Cat-Lips

Godot 4 Tests/TestScenes/Feature148.ResourceTree/ResourceTreeTests.cs

@@ -8,23 +8,35 @@ namespace GodotTests.TestScenes;
 
 #region Test Cases
 
-[ResourceTree("", ResI.LoadRes, xclude: ["TestScenes"])]
+[ResourceTree("res://", ResI.LoadRes, xclude: ["TestScenes"])]
 public static partial class RootResWithLoad;
 
-[ResourceTree("", ResI.ResPaths, xclude: ["TestScenes"])]
+[ResourceTree("res://", ResI.ResPaths, xclude: ["TestScenes"])]
 public static partial class RootResWithResPaths;
 
-[ResourceTree("/", ResI.DirPaths, xclude: ["TestScenes"])]
+[ResourceTree("res://", ResI.DirPaths, xclude: ["TestScenes"])]
 public static partial class RootResWithDirPaths;
 
-[ResourceTree(".", ResI.LoadRes | ResI.ResPaths, xclude: ["TestScenes"])]
+[ResourceTree("res://", ResI.LoadRes | ResI.ResPaths, xclude: ["TestScenes"])]
 public static partial class RootResWithLoadAndResPaths;
 
-[ResourceTree("Assets", ResI.DirPaths)]
+[ResourceTree("/", ResI.DirPaths)]
 public static partial class AbsoluteRes;
-
+[ResourceTree("Assets", ResI.DirPaths)]
+public static partial class AbsoluteResDir1;
+[ResourceTree("/Assets", ResI.DirPaths)]
+public static partial class AbsoluteResDir2;
+
+[ResourceTree(null, ResI.DirPaths)]
+public static partial class RelativeRes1;
+[ResourceTree(".", ResI.DirPaths)]
+public static partial class RelativeRes2;
+[ResourceTree("", ResI.DirPaths)]
+public static partial class RelativeRes3;
 [ResourceTree("Resources", ResI.DirPaths)]
-public static partial class RelativeRes;
+public static partial class RelativeResDir1;
+[ResourceTree("./Resources", ResI.DirPaths)]
+public static partial class RelativeResDir2;
 
 [ResourceTree("Resources", resx: ResX.All, xtras: ["csv", "cfg", "txt", "zip"])]
 public static partial class ResWithTypes;
@@ -104,10 +116,20 @@ void TestRootResWithLoadAndResPaths()
         }
 
         static void TestAbsoluteRes()
-            => AbsoluteRes.ResPath.Should().Be("res://Assets");
+        {
+            AbsoluteRes.ResPath.Should().Be("res://");
+            AbsoluteResDir1.ResPath.Should().Be("res://Assets");
+            AbsoluteResDir2.ResPath.Should().Be("res://Assets");
+        }
 
         static void TestRelativeRes()
-            => RelativeRes.ResPath.Should().Be("res://TestScenes/Feature148.ResourceTree/Resources");
+        {
+            RelativeRes1.ResPath.Should().Be("res://TestScenes/Feature148.ResourceTree");
+            RelativeRes2.ResPath.Should().Be("res://TestScenes/Feature148.ResourceTree");
+            RelativeRes3.ResPath.Should().Be("res://TestScenes/Feature148.ResourceTree");
+            RelativeResDir1.ResPath.Should().Be("res://TestScenes/Feature148.ResourceTree/Resources");
+            RelativeResDir2.ResPath.Should().Be("res://TestScenes/Feature148.ResourceTree/Resources");
+        }
 
         static void TestResTypes()
         {

SourceGenerators/Utilities/Extensions/GodotExtensions.cs

@@ -50,12 +50,12 @@ static string FILE(string resPath, SyntaxNode node, AnalyzerConfigOptions option
             if (!Path.HasExtension(resPath))
                 resPath = Path.ChangeExtension(resPath, ext);
 
-            var absPath = Path.Combine(gdRoot, resPath.Replace("res://", ""));
-            if (File.Exists(absPath)) return Path.GetFullPath(absPath);
-
             var relPath = Path.Combine(Path.GetDirectoryName(csFile), resPath);
             if (File.Exists(relPath)) return Path.GetFullPath(relPath);
 
+            var absPath = Path.Combine(gdRoot, resPath.Replace("res://", ""));
+            if (File.Exists(absPath)) return Path.GetFullPath(absPath);
+
             //
             throw new Exception($"Could not find {resPath}\n - {absPath}\n - {relPath}");
         }
@@ -68,18 +68,20 @@ public static (string SystemPath, DiagnosticDetail Error) GetRealDir(string sour
 
         static string DIR(string source, SyntaxNode node, AnalyzerConfigOptions options)
         {
+            source = string.IsNullOrEmpty(source) ? "." : source;
+
             var csFile = node.SyntaxTree.FilePath;
-            if (source is null) return Path.GetDirectoryName(csFile);
+            if (source is ".") return Path.GetDirectoryName(csFile);
 
             var gdRoot = options.TryGetGodotProjectDir() ?? GetProjectRoot(csFile);
             if (source is "/") return gdRoot;
 
-            var absPath = Path.Combine(gdRoot, source.Replace("res://", ""));
-            if (Directory.Exists(absPath)) return Path.GetFullPath(absPath);
-
             var relPath = Path.Combine(Path.GetDirectoryName(csFile), source);
             if (Directory.Exists(relPath)) return Path.GetFullPath(relPath);
 
+            var absPath = Path.Combine(gdRoot, source.Replace("res://", "").TrimStart('/'));
+            if (Directory.Exists(absPath)) return Path.GetFullPath(absPath);
+
             //
             throw new Exception($"Could not find {source}\n - {absPath}\n - {relPath}");
         }