Browse Source

Merge pull request #97588 from TML233/generated-raise-signal

[C#] Change generated On{SignalName} to EmitSignal{SignalName}
Thaddeus Crews 1 year ago
parent
commit
cb3c01a5fe

+ 1 - 1
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/EventSignals_ScriptSignals.generated.cs

@@ -32,7 +32,7 @@ partial class EventSignals
         add => backing_MySignal += value;
         add => backing_MySignal += value;
         remove => backing_MySignal -= value;
         remove => backing_MySignal -= value;
 }
 }
-    protected void OnMySignal(string str, int num)
+    protected void EmitSignalMySignal(string str, int num)
     {
     {
         EmitSignal(SignalName.MySignal, str, num);
         EmitSignal(SignalName.MySignal, str, num);
     }
     }

+ 2 - 2
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs

@@ -282,7 +282,7 @@ namespace Godot.SourceGenerators
                     .Append(" -= value;\n")
                     .Append(" -= value;\n")
                     .Append("}\n");
                     .Append("}\n");
 
 
-                // Generate On{EventName} method to raise the event
+                // Generate EmitSignal{EventName} method to raise the event
 
 
                 var invokeMethodSymbol = signalDelegate.InvokeMethodData.Method;
                 var invokeMethodSymbol = signalDelegate.InvokeMethodData.Method;
                 int paramCount = invokeMethodSymbol.Parameters.Length;
                 int paramCount = invokeMethodSymbol.Parameters.Length;
@@ -291,7 +291,7 @@ namespace Godot.SourceGenerators
                     "private" :
                     "private" :
                     "protected";
                     "protected";
 
 
-                source.Append($"    {raiseMethodModifiers} void On{signalName}(");
+                source.Append($"    {raiseMethodModifiers} void EmitSignal{signalName}(");
                 for (int i = 0; i < paramCount; i++)
                 for (int i = 0; i < paramCount; i++)
                 {
                 {
                     var paramSymbol = invokeMethodSymbol.Parameters[i];
                     var paramSymbol = invokeMethodSymbol.Parameters[i];

+ 2 - 2
modules/mono/editor/bindings_generator.cpp

@@ -3275,10 +3275,10 @@ Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterf
 
 
 		p_output.append(CLOSE_BLOCK_L1);
 		p_output.append(CLOSE_BLOCK_L1);
 
 
-		// Generate On{EventName} method to raise the event.
+		// Generate EmitSignal{EventName} method to raise the event.
 		if (!p_itype.is_singleton) {
 		if (!p_itype.is_singleton) {
 			p_output.append(MEMBER_BEGIN "protected void ");
 			p_output.append(MEMBER_BEGIN "protected void ");
-			p_output << "On" << p_isignal.proxy_name;
+			p_output << "EmitSignal" << p_isignal.proxy_name;
 			if (is_parameterless) {
 			if (is_parameterless) {
 				p_output.append("()\n" OPEN_BLOCK_L1 INDENT2);
 				p_output.append("()\n" OPEN_BLOCK_L1 INDENT2);
 				p_output << "EmitSignal(SignalName." << p_isignal.proxy_name << ");\n";
 				p_output << "EmitSignal(SignalName." << p_isignal.proxy_name << ");\n";