From 56ab2fdd05a7fef6ef91ed7fe132ad7b02e88eee Mon Sep 17 00:00:00 2001 From: D8H Date: Thu, 23 Jan 2025 14:11:13 +0100 Subject: [PATCH] Revert "Fix used extension check false positive from usused object or behavior events (#7331)" (#7340) This reverts commit cb24f191fd07a379a2f8c06e29c20de3e4a596bf. Don't show in changelog --- .../IDE/Events/UsedExtensionsFinder.cpp | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp b/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp index 5fb3c7458819..f66d88fe2c07 100644 --- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp +++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp @@ -69,16 +69,9 @@ bool UsedExtensionsFinder::DoVisitInstruction(gd::Instruction& instruction, project.GetCurrentPlatform(), instruction.GetType()) : gd::MetadataProvider::GetExtensionAndActionMetadata( project.GetCurrentPlatform(), instruction.GetType()); - // Unused event-based objects or events-based behaviors may use object and - // behavior instructions that should not be detected as extension usage. - // The extension of actually used objects and behaviors will be detected on - // scene objects. This is why object or behavior instructions usually don't - // have any import. - if (!metadata.GetMetadata().GetIncludeFiles().empty()) { - result.AddUsedExtension(metadata.GetExtension()); - for (auto &&includeFile : metadata.GetMetadata().GetIncludeFiles()) { - result.AddUsedIncludeFiles(includeFile); - } + result.AddUsedExtension(metadata.GetExtension()); + for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) { + result.AddUsedIncludeFiles(includeFile); } gd::ParameterMetadataTools::IterateOverParameters( @@ -206,16 +199,9 @@ void UsedExtensionsFinder::OnVisitFunctionCallNode(FunctionCallNode& node) { return; } - // Unused event-based objects or events-based behaviors may use object and - // behavior expressions that should not be detected as extension usage. - // The extension of actually used objects and behaviors will be detected on - // scene objects. This is why object or behavior expressions usually don't - // have any import. - if (!metadata.GetMetadata().GetIncludeFiles().empty()) { - result.AddUsedExtension(metadata.GetExtension()); - for (auto &&includeFile : metadata.GetMetadata().GetIncludeFiles()) { - result.AddUsedIncludeFiles(includeFile); - } + result.AddUsedExtension(metadata.GetExtension()); + for (auto&& includeFile : metadata.GetMetadata().GetIncludeFiles()) { + result.AddUsedIncludeFiles(includeFile); } };