[#2] FIXED Expressing custom types using full namespace

Author: Cat-Lips

CustomGeneratorTests/CustomGeneratorTests.csproj

@@ -9,6 +9,6 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="1.1.1" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="1.1.2" />
   </ItemGroup>
 </Project>

GodotTests/.filenesting.json

@@ -0,0 +1,23 @@
+{
+  "help": "https://go.microsoft.com/fwlink/?linkid=866610",
+
+  "dependentFileProviders": {
+    "add": {
+      "extensionToExtension": {
+        "add": {
+          ".tscn": [
+            ".cs"
+          ]
+        }
+      },
+      "fileToFile": {
+        "add": {
+          "plugin.cfg": [
+            "Plugin.cs",
+            "plugin.gd"
+          ]
+        }
+      }
+    }
+  }
+}

GodotTests/GodotTests.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.0.0-alpha0002" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="1.1.1" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="1.1.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />

GodotTests/TestScenes/InstancingSceneWithSameNameAsNamespace.cs

@@ -0,0 +1,9 @@
+using Godot;
+
+namespace GodotTests.TestScenes
+{
+    [SceneTree]
+    public partial class InstancingSceneWithSameNameAsNamespace : Control
+    {
+    }
+}

GodotTests/TestScenes/InstancingSceneWithSameNameAsNamespace.tscn

@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://TestScenes/InstancingSceneWithSameNameAsNamespace.cs" type="Script" id=1]
+[ext_resource path="res://TestScenes/SceneWithSameNameAsNamespace/SceneWithSameNameAsNamespace.tscn" type="PackedScene" id=2]
+
+[node name="Control" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Control" parent="." instance=ExtResource( 2 )]

GodotTests/TestScenes/SceneWithSameNameAsNamespace/SceneWithSameNameAsNamespace.cs

@@ -0,0 +1,9 @@
+using Godot;
+
+namespace GodotTests.TestScenes.SceneWithSameNameAsNamespace
+{
+    [SceneTree]
+    public partial class SceneWithSameNameAsNamespace : Control
+    {
+    }
+}

GodotTests/TestScenes/SceneWithSameNameAsNamespace/SceneWithSameNameAsNamespace.gd

@@ -0,0 +1,16 @@
+extends Control
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+    pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#    pass

GodotTests/TestScenes/SceneWithSameNameAsNamespace/SceneWithSameNameAsNamespace.tscn

@@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://TestScenes/SceneWithSameNameAsNamespace/SceneWithSameNameAsNamespace.cs" type="Script" id=1]
+
+[node name="Control" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}

SourceGenerators/CompilationExtensions.cs

@@ -0,0 +1,21 @@
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace GodotSharp.SourceGenerators
+{
+    public static class CompilationExtensions
+    {
+        public static string GetNamespace(this Compilation compilation, string type)
+        {
+            return compilation
+                .GetSymbolsWithName(type, SymbolFilter.Type)
+                .First().NamespaceOrNull();
+        }
+
+        public static string GetFullName(this Compilation compilation, string type)
+        {
+            var ns = compilation.GetNamespace(type);
+            return ns is null ? type : $"{ns}.{type}";
+        }
+    }
+}

SourceGenerators/SceneTreeExtensions/SceneTreeDataModel.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.CodeAnalysis;
 
 namespace GodotSharp.SourceGenerators.SceneTreeExtensions
@@ -10,28 +9,13 @@ internal class SceneTreeDataModel
         public string NSClose { get; }
         public string NSIndent { get; }
         public string ClassName { get; }
-        public ICollection<string> Usings { get; }
         public ICollection<SceneTreeNode> Properties { get; }
 
         public SceneTreeDataModel(Compilation compilation, INamedTypeSymbol symbol, string tscnFile)
         {
             ClassName = symbol.ClassDef();
             (NSOpen, NSClose, NSIndent) = symbol.GetNamespaceDeclaration();
-
-            var (childNodes, customTypes) = SceneTreeScraper.GetNodes(tscnFile);
-
-            Properties = childNodes;
-            Usings = customTypes
-                .Select(GetNamespace)
-                .Where(x => x is not null)
-                .ToList();
-
-            string GetNamespace(string type)
-            {
-                return compilation
-                    .GetSymbolsWithName(type, SymbolFilter.Type)
-                    .First().NamespaceOrNull();
-            }
+            Properties = SceneTreeScraper.GetNodes(compilation, tscnFile);
         }
     }
 }