From 21b187ab9f694e25b5ba1068eeab18aee8c408c1 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Fri, 23 Aug 2024 11:37:08 -0500 Subject: [PATCH 1/3] Use nameof for adding new Modules to build targets. --- Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs b/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs index 93296b766..bca6195b0 100644 --- a/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs +++ b/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs @@ -382,7 +382,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing // Get editor target and target files and add module var files = Directory.GetFiles(path); - var targetModuleText = $"Modules.Add(\"{moduleName}\");\n "; + var targetModuleText = $"Modules.Add(nameof({moduleName}));\n "; foreach (var file in files) { if (!file.Contains(".Build.cs", StringComparison.OrdinalIgnoreCase)) From 5307ea85b533c208a5fa9f8a7602b910d1dc7c88 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Fri, 23 Aug 2024 16:27:32 -0500 Subject: [PATCH 2/3] Have new projects use nameof(Game). --- Source/Editor/Editor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp index 4da379fac..b9b0f1fd8 100644 --- a/Source/Editor/Editor.cpp +++ b/Source/Editor/Editor.cpp @@ -476,7 +476,7 @@ int32 Editor::LoadProduct() " base.Init();\n" "\n" " // Reference the modules for game\n" - " Modules.Add(\"Game\");\n" + " Modules.Add(nameof(Game));\n" " }\n" "}\n"), Encoding::UTF8); failed |= File::WriteAllText(projectPath / TEXT("Source/GameEditorTarget.Build.cs"),TEXT( @@ -490,7 +490,7 @@ int32 Editor::LoadProduct() " base.Init();\n" "\n" " // Reference the modules for editor\n" - " Modules.Add(\"Game\");\n" + " Modules.Add(nameof(Game));\n" " }\n" "}\n"), Encoding::UTF8); failed |= File::WriteAllText(projectPath / TEXT("Source/Game/Game.Build.cs"),TEXT( From 22cf2570f583f79db1420803f93a38f5dbcb2000 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Fri, 23 Aug 2024 16:31:33 -0500 Subject: [PATCH 3/3] Add more nameof for finding and template code. --- Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs | 2 +- Source/Editor/Editor.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs index 852fd99c5..d2aa85269 100644 --- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs +++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs @@ -261,7 +261,7 @@ namespace FlaxEditor.CustomEditors.Dedicated if (!file.Contains("GameProjectTarget")) continue; // Skip - if (file.Contains("Modules.Add(\"Game\")")) + if (file.Contains("Modules.Add(\"Game\")") || file.Contains("Modules.Add(nameof(Game))")) { // Assume Game represents the main game module moduleName = "Game"; diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp index b9b0f1fd8..09253851c 100644 --- a/Source/Editor/Editor.cpp +++ b/Source/Editor/Editor.cpp @@ -226,7 +226,7 @@ bool Editor::CheckProjectUpgrade() " base.Init();\n" "\n" " // Reference the modules for game\n" - " Modules.Add(\"{0}\");\n" + " Modules.Add(nameof({0}));\n" " }}\n" "}}\n" ), codeName), Encoding::UTF8); @@ -242,7 +242,7 @@ bool Editor::CheckProjectUpgrade() " base.Init();\n" "\n" " // Reference the modules for editor\n" - " Modules.Add(\"{0}\");\n" + " Modules.Add(nameof({0}));\n" "{1}" " }}\n" "}}\n"