#50 Ignoring nodes with unsupported parent

Cat-Lips · Cat-Lips · commit 26a8e03c72a8 · 2024-01-15T06:46:44.000+11:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@
 */obj/
 *.log
 *.import
+*.material
+*.csproj.*
diff --git a/CustomGeneratorTests/CustomGeneratorTests.csproj b/CustomGeneratorTests/CustomGeneratorTests.csproj
@@ -6,7 +6,7 @@
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3-240111-1047.Release" PrivateAssets="all" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3-240115-0620.Release" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/Godot 3 Tests/Godot 3 Tests.csproj b/Godot 3 Tests/Godot 3 Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3-240111-1047.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3-240115-0620.Release" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />
diff --git a/Godot 3 Tests/Run.cs b/Godot 3 Tests/Run.cs
@@ -45,6 +45,8 @@ private static IEnumerable<Func<ITest>> Tests
                 yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;
                 yield return ITest.GetTest<TraverseInstancedScene>;
                 yield return ITest.GetTest<UniqueSceneNameAccessTest>;
+                yield return ITest.GetTest<UnsupportedInheritedOverride>;
+                yield return ITest.GetTest<UnsupportedInstancedOverride>;
             }
         }
 
diff --git a/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/Test.glb b/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/Test.glb
diff --git a/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/TestScript.cs b/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/TestScript.cs
@@ -0,0 +1,5 @@
+using Godot;
+
+public class TestScript : Spatial
+{
+}
diff --git a/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs b/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs
@@ -0,0 +1,14 @@
+using Godot;
+using GodotSharp.BuildingBlocks.TestRunner;
+
+namespace GodotTests.TestScenes
+{
+    [SceneTree]
+    public partial class UnsupportedInheritedOverride : Spatial, ITest
+    {
+        void ITest.InitTests()
+        {
+            // If it compiles, test passes
+        }
+    }
+}
diff --git a/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.tscn b/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.tscn
@@ -0,0 +1,29 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" type="PackedScene" id=1]
+[ext_resource path="res://TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs" type="Script" id=2]
+[ext_resource path="res://TestScenes/Issue50.UnsupportedOverrides/TestScript.cs" type="Script" id=3]
+
+[node name="Test" instance=ExtResource( 1 )]
+visible = false
+script = ExtResource( 2 )
+
+[node name="Cube" parent="." index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
+
+[node name="Node" type="Spatial" parent="Cube" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
+
+[node name="Cube001" parent="Cube" index="1"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
+
+[node name="Node001" type="Spatial" parent="Cube/Cube001" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
diff --git a/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs b/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs
@@ -0,0 +1,14 @@
+using Godot;
+using GodotSharp.BuildingBlocks.TestRunner;
+
+namespace GodotTests.TestScenes
+{
+    [SceneTree]
+    public partial class UnsupportedInstancedOverride : Spatial, ITest
+    {
+        void ITest.InitTests()
+        {
+            // If it compiles, test passes
+        }
+    }
+}
diff --git a/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.tscn b/Godot 3 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.tscn
@@ -0,0 +1,34 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs" type="Script" id=1]
+[ext_resource path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" type="PackedScene" id=2]
+[ext_resource path="res://TestScenes/Issue50.UnsupportedOverrides/TestScript.cs" type="Script" id=3]
+
+[node name="Root" type="Spatial"]
+visible = false
+script = ExtResource( 1 )
+
+[node name="Test" parent="." instance=ExtResource( 2 )]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
+
+[node name="Cube" parent="Test" index="0"]
+visible = false
+script = ExtResource( 3 )
+
+[node name="Node" type="Spatial" parent="Test/Cube" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
+
+[node name="Cube001" parent="Test/Cube" index="1"]
+visible = false
+script = ExtResource( 3 )
+
+[node name="Node001" type="Spatial" parent="Test/Cube/Cube001" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource( 3 )
+
+[editable path="Test"]
diff --git a/Godot 4 Tests/Godot 4 Tests.csproj b/Godot 4 Tests/Godot 4 Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Godot.NET.Sdk/4.3.0-dev.1">
+﻿<Project Sdk="Godot.NET.Sdk/4.3.0-dev.2">
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
     <TargetFramework>net8.0</TargetFramework>
@@ -11,9 +11,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3-240111-1047.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3-240115-0620.Release" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Godot 4 Tests/Run.cs b/Godot 4 Tests/Run.cs
@@ -48,6 +48,8 @@ private static IEnumerable<Func<ITest>> Tests
                 yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;
                 yield return ITest.GetTest<TraverseInstancedScene>;
                 yield return ITest.GetTest<UniqueSceneNameAccessTest>;
+                yield return ITest.GetTest<UnsupportedInheritedOverride>;
+                yield return ITest.GetTest<UnsupportedInstancedOverride>;
             }
         }
 
diff --git a/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/Test.glb b/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/Test.glb
diff --git a/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/TestScript.cs b/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/TestScript.cs
@@ -0,0 +1,5 @@
+using Godot;
+
+public partial class TestScript : Node3D
+{
+}
diff --git a/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs b/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs
@@ -0,0 +1,14 @@
+using Godot;
+using GodotSharp.BuildingBlocks.TestRunner;
+
+namespace GodotTests.TestScenes
+{
+    [SceneTree]
+    public partial class UnsupportedInheritedOverride : Node3D, ITest
+    {
+        void ITest.InitTests()
+        {
+            // If it compiles, test passes
+        }
+    }
+}
diff --git a/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.tscn b/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.tscn
@@ -0,0 +1,29 @@
+[gd_scene load_steps=4 format=3 uid="uid://beryxh3sw6624"]
+
+[ext_resource type="PackedScene" uid="uid://b2eoocswr2m6o" path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" id="1"]
+[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs" id="2"]
+[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/TestScript.cs" id="3"]
+
+[node name="Test" instance=ExtResource("1")]
+visible = false
+script = ExtResource("2")
+
+[node name="Cube" parent="." index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
+
+[node name="Node" type="Node3D" parent="Cube" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
+
+[node name="Cube_001" parent="Cube" index="1"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
+
+[node name="Node_001" type="Node3D" parent="Cube/Cube_001" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
diff --git a/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs b/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs
@@ -0,0 +1,14 @@
+using Godot;
+using GodotSharp.BuildingBlocks.TestRunner;
+
+namespace GodotTests.TestScenes
+{
+    [SceneTree]
+    public partial class UnsupportedInstancedOverride : Node3D, ITest
+    {
+        void ITest.InitTests()
+        {
+            // If it compiles, test passes
+        }
+    }
+}
diff --git a/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.tscn b/Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.tscn
@@ -0,0 +1,34 @@
+[gd_scene load_steps=4 format=3 uid="uid://c5rmhgdvxoosm"]
+
+[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs" id="1"]
+[ext_resource type="PackedScene" uid="uid://b2eoocswr2m6o" path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" id="2"]
+[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/TestScript.cs" id="3"]
+
+[node name="Root" type="Node3D"]
+visible = false
+script = ExtResource("1")
+
+[node name="Test" parent="." instance=ExtResource("2")]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
+
+[node name="Cube" parent="Test" index="0"]
+visible = false
+script = ExtResource("3")
+
+[node name="Node" type="Node3D" parent="Test/Cube" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
+
+[node name="Cube_001" parent="Test/Cube" index="1"]
+visible = false
+script = ExtResource("3")
+
+[node name="Node_001" type="Node3D" parent="Test/Cube/Cube_001" index="0"]
+unique_name_in_owner = true
+visible = false
+script = ExtResource("3")
+
+[editable path="Test"]
diff --git a/SourceGenerators/SceneTreeExtensions/SceneTreeScraper.cs b/SourceGenerators/SceneTreeExtensions/SceneTreeScraper.cs
@@ -131,8 +131,6 @@ void AddNode(string nodeName, string nodePath)
                             {
                                 if (HasResource())
                                     AddInstancedScene();
-                                else if (nodeType is null)
-                                    OverrideNode();
                                 else
                                     AddChildNode();
                             }
@@ -154,7 +152,7 @@ void AddInheritedScene()
                                     {
                                         var node = new SceneTreeNode(x.Value.Name, x.Value.Type, x.Value.Path);
                                         var parent = x.Parent.IsRoot ? "." : x.Parent.Value.Path;
-                                        AddNode(node, parent);
+                                        AddNode(node, nodeLookup[parent]);
                                     }
                                 });
                             }
@@ -170,13 +168,13 @@ void AddInstancedScene()
                                     if (x.IsRoot)
                                     {
                                         curNode = new SceneTreeNode(nodeName, x.Value.Type, nodePath);
-                                        AddNode(curNode, parentPath);
+                                        AddNode(curNode, nodeLookup[parentPath]);
                                     }
                                     else
                                     {
                                         var node = new SceneTreeNode(x.Value.Name, x.Value.Type, $"{nodePath}/{x.Value.Path}", traverseInstancedScenes);
                                         var parent = x.Parent.IsRoot ? nodePath : $"{nodePath}/{x.Parent.Value.Path}";
-                                        AddNode(node, parent);
+                                        AddNode(node, nodeLookup[parent]);
                                     }
                                 });
                             }
@@ -186,23 +184,41 @@ void AddRootNode()
                                 curNode = new SceneTreeNode(nodeName, $"Godot.{nodeType}", nodePath);
                                 Log.Debug($" - RootNode [{curNode}]");
                                 Debug.Assert(parentPath is null);
-                                AddNode(curNode, parentPath);
+                                AddNode(curNode);
                             }
 
                             void AddChildNode()
                             {
+                                var parent = nodeLookup.Get(parentPath);
+
+                                if (UnsupportedParent())
+                                {
+                                    curNode = null;
+                                    Log.Debug(" - ChildNode ignored (parent not supported)");
+                                    return;
+                                }
+
+                                if (ParentOverride())
+                                {
+                                    curNode = nodeLookup.Get(nodePath)?.Value;
+                                    Log.Debug(curNode is null
+                                        ? " - ChildNode ignored (parent not supported)"
+                                        : $" - ChildNode (override) [{curNode}]");
+                                    return;
+                                }
+
                                 curNode = new SceneTreeNode(nodeName, $"Godot.{nodeType}", nodePath);
                                 Log.Debug($" - ChildNode [{curNode}]");
-                                AddNode(curNode, parentPath);
-                            }
+                                AddNode(curNode, parent);
 
-                            void OverrideNode()
-                            {
-                                curNode = nodeLookup[nodePath].Value;
-                                Log.Debug($" - ChildNode (override) [{curNode}]");
+                                bool UnsupportedParent()
+                                    => parent is null;
+
+                                bool ParentOverride()
+                                    => nodeType is null;
                             }
 
-                            void AddNode(SceneTreeNode node, string parent = null)
+                            void AddNode(SceneTreeNode node, TreeNode<SceneTreeNode> parent = null)
                             {
                                 if (sceneTree is null) // Root
                                 {
@@ -212,7 +228,7 @@ void AddNode(SceneTreeNode node, string parent = null)
                                 else
                                 {
                                     Debug.Assert(parent is not null);
-                                    nodeLookup.Add(node.Path, nodeLookup[parent].Add(node));
+                                    nodeLookup.Add(node.Path, parent.Add(node));
                                 }
                             }
 
@@ -275,6 +291,7 @@ void ValueMatch()
                     void ScriptMatch()
                     {
                         if (value is "null") return;
+                        if (curNode is null) return;
                         var match = ResIdRegex.Match(value);
                         if (!match.Success) return;
                         var resourceId = match.Groups["Id"].Value;
@@ -289,6 +306,7 @@ void ScriptMatch()
 
                     void UniqueNameMatch()
                     {
+                        if (curNode is null) return;
                         if (bool.TryParse(value, out var result) && result is true)
                         {
                             uniqueNodes.Add(curNode);

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ private static IEnumerable<Func<ITest>> Tests`
`45`	`45`	`yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;`
`46`	`46`	`yield return ITest.GetTest<TraverseInstancedScene>;`
`47`	`47`	`yield return ITest.GetTest<UniqueSceneNameAccessTest>;`
	`48`	`+ yield return ITest.GetTest<UnsupportedInheritedOverride>;`
	`49`	`+ yield return ITest.GetTest<UnsupportedInstancedOverride>;`
`48`	`50`	`}`
`49`	`51`	`}`
`50`	`52`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +using Godot;
++
 +public class TestScript : Spatial
 +{
 +}