Style: Apply clang-format grouping rules

2026-03-16 22:19:08 +01:00
parent 764bda8d6c
commit e33e98a26f
260 changed files with 482 additions and 448 deletions
@@ -50,6 +50,7 @@

 #ifdef TOOLS_ENABLED
 #include "core/config/engine.h"
+
 #include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
 #endif // TOOLS_ENABLED

@@ -32,11 +32,11 @@
 #include "gdextension.compat.inc"

 #include "core/config/project_settings.h"
+#include "core/extension/gdextension_library_loader.h"
+#include "core/extension/gdextension_manager.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/object/method_bind.h"
-#include "gdextension_library_loader.h"
-#include "gdextension_manager.h"

 extern void gdextension_setup_interface();
 extern GDExtensionInterfaceFunctionPtr gdextension_get_proc_address(const char *p_name);
@@ -32,8 +32,8 @@

 #include "gdextension_interface_header_generator.h"

+#include "core/extension/gdextension_interface_dump.gen.h"
 #include "core/io/json.h"
-#include "gdextension_interface_dump.gen.h"

 static const char *FILE_HEADER =
 		"/**************************************************************************/\n"
@@ -32,10 +32,10 @@

 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/extension/gdextension.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
 #include "core/version.h"
-#include "gdextension.h"

 Vector<SharedObject> GDExtensionLibraryLoader::find_extension_dependencies(const String &p_path, Ref<ConfigFile> p_config, std::function<bool(String)> p_has_feature) {
 	Vector<SharedObject> dependencies_shared_objects;
@@ -30,12 +30,12 @@

 #pragma once

-#include <functional>
-
 #include "core/extension/gdextension_loader.h"
 #include "core/io/config_file.h"
 #include "core/os/shared_object.h"

+#include <functional>
+
 class GDExtensionLibraryLoader : public GDExtensionLoader {
 	GDSOFTCLASS(GDExtensionLibraryLoader, GDExtensionLoader);

@@ -30,11 +30,10 @@

 #pragma once

-#include "core/io/stream_peer.h"
-#include "core/templates/ring_buffer.h"
-
 #include "core/extension/ext_wrappers.gen.h"
+#include "core/io/stream_peer.h"
 #include "core/object/gdvirtual.gen.h"
+#include "core/templates/ring_buffer.h"
 #include "core/variant/native_ptr.h"

 class PacketPeer : public RefCounted {
@@ -30,10 +30,9 @@

 #pragma once

-#include "core/object/ref_counted.h"
-
 #include "core/extension/ext_wrappers.gen.h"
 #include "core/object/gdvirtual.gen.h"
+#include "core/object/ref_counted.h"
 #include "core/variant/native_ptr.h"

 class StreamPeer : public RefCounted {
@@ -31,7 +31,6 @@
 #pragma once

 #include "core/io/stream_peer.h"
-
 #include "core/templates/ring_buffer.h"

 class StreamPeerGZIP : public StreamPeer {
@@ -30,7 +30,7 @@

 #include "color.h"

-#include "color_names.inc"
+#include "core/math/color_names.inc"
 #include "core/math/math_funcs.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

+#include "core/object/object.h"
 // object.h needs to be the first include *before* method_bind.h
 // FIXME: Find out why and fix potential cyclical dependencies.
-#include "core/object/object.h"
-
-#include "method_bind.h"
+#include "core/object/method_bind.h"

 uint32_t MethodBind::get_hash() const {
 	MethodInfo mi;
@@ -33,7 +33,6 @@
 #include "core/variant/array.h"
 #include "core/variant/dictionary.h"
 #include "core/variant/typed_array.h"
-#include "property_info.h"

 MethodInfo::operator Dictionary() const {
 	Dictionary d;
@@ -30,8 +30,8 @@

 #pragma once

+#include "core/object/property_info.h"
 #include "core/variant/variant.h"
-#include "property_info.h"

 enum MethodFlags {
 	METHOD_FLAG_NORMAL = 1,
@@ -31,8 +31,8 @@
 #pragma once

 #include "core/object/object.h"
+#include "core/os/time_enums.h"
 #include "core/variant/type_info.h"
-#include "time_enums.h"

 // This Time class conforms with as many of the ISO 8601 standards as possible.
 // * As per ISO 8601:2004 4.3.2.1, all dates follow the Proleptic Gregorian
@@ -96,10 +96,10 @@ void godot_cleanup_profiler();
 #elif defined(GODOT_USE_PERFETTO)
 // Use the perfetto profiler.

-#include <perfetto.h>
-
 #include "core/typedefs.h"

+#include <perfetto.h>
+
 PERFETTO_DEFINE_CATEGORIES(
 		perfetto::Category("godot")
 				.SetDescription("All Godot Events"), );
@@ -29,6 +29,7 @@
 /**************************************************************************/

 #include "a_hash_map.h"
+
 #include "core/variant/variant.h"

 // Explicit instantiation.
@@ -34,12 +34,12 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Dictionary);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, String);

-#include "container_type_validate.h"
 #include "core/math/math_funcs.h"
 #include "core/object/script_language.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/vector.h"
 #include "core/variant/callable.h"
+#include "core/variant/container_type_validate.h"
 #include "core/variant/dictionary.h"

 struct ArrayPrivate {
@@ -34,6 +34,7 @@
 #include "core/typedefs.h"

 #include <pthread.h>
+
 #include <new> // For hardware interference size

 class String;
@@ -33,12 +33,12 @@
 #import "app_delegate_service.h"
 #import "godot_view_controller.h"

+#include "core/object/class_db.h"
+
 #import <CoreHaptics/CoreHaptics.h>
 #import <UIKit/UIKit.h>
 #include <sys/sysctl.h>

-#include "core/object/class_db.h"
-
 void AppleEmbedded::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rate_url", "app_id"), &AppleEmbedded::get_rate_url);
 	ClassDB::bind_method(D_METHOD("supports_haptic_engine"), &AppleEmbedded::supports_haptic_engine);
@@ -31,6 +31,7 @@
 #import "godot_app_delegate.h"

 #import "app_delegate_service.h"
+
 #include "core/typedefs.h"

@implementation GDTApplicationDelegate
@@ -31,8 +31,8 @@
 #include "core/string/ustring.h"

 #import <UIKit/UIKit.h>
-
 #include <unistd.h>
+
 #include <cstdio>

 void change_to_launch_dir(char **p_args) {
@@ -56,10 +56,12 @@
 #import <UIKit/UIKit.h>
 #import <dlfcn.h>
 #include <sys/sysctl.h>
+
 #include <iterator>

 #if defined(RD_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
+
 #import <QuartzCore/CAMetalLayer.h>

 #if defined(VULKAN_ENABLED)
@@ -37,6 +37,7 @@
 #include "core/templates/vector.h"

 #import <CoreMIDI/CoreMIDI.h>
+
 #include <cstdio>

 class MIDIDriverCoreMidi : public MIDIDriver {
@@ -45,7 +45,6 @@ GODOT_CLANG_WARNING_POP

 #if !defined(_MSC_VER)
 #include <guiddef.h>
-
 #include <thirdparty/directx_headers/include/dxguids/dxguids.h>
 #endif

@@ -36,14 +36,12 @@
 #include "drivers/d3d12/d3d12_hooks.h"
 #include "drivers/d3d12/rendering_context_driver_d3d12.h"

-#include <dxgi1_6.h>
-
 #include <drivers/d3d12/godot_d3d12ma.h>
 #include <drivers/d3d12/godot_nir.h>
+#include <dxgi1_6.h>

 #if !defined(_MSC_VER)
 #include <guiddef.h>
-
 #include <thirdparty/directx_headers/include/dxguids/dxguids.h>
 #endif

@@ -39,7 +39,6 @@
 #include "servers/rendering/rendering_device_driver.h"

 #include <drivers/d3d12/godot_d3dx12.h>
-
 #include <wrl/client.h>

 #ifdef DEV_ENABLED
@@ -36,9 +36,7 @@
 #include <drivers/d3d12/godot_d3d12ma.h>
 #include <drivers/d3d12/godot_d3dx12.h>
 #include <drivers/d3d12/godot_nir.h>
-
 #include <wrl/client.h>
-
 #include <zlib.h>

 extern "C" {
@@ -32,12 +32,11 @@

 #ifdef EGL_ENABLED

-// These must come first to avoid windows.h mess.
-#include "platform_gl.h"
-
 #include "core/templates/local_vector.h"
 #include "servers/display/display_server_enums.h"

+#include <platform_gl.h>
+
 class EGLManager {
 private:
 	// An EGL-side representation of a display with its own rendering
@@ -30,7 +30,7 @@

 #include "rasterizer_util_gles3.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 bool RasterizerUtilGLES3::gles_over_gl = true;

@@ -38,7 +38,7 @@
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/rendering_server_types.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 class StringBuilder;

@@ -34,11 +34,8 @@

 #include "core/templates/hash_set.h"

-// FIXME: platform_gl.h includes windows.h via egl.h, which defines ConnectFlags.
-// This breaks include project_settings.h in config.cpp, so we include object.h first.
-#include "core/object/object.h" // IWYU pragma: keep.
-
-#include "platform_gl.h"
+#include <platform_gl.h>
+#undef ConnectFlags // Defined by windows.h through egl.h, breaks object.h.

 #ifdef ANDROID_ENABLED
 typedef void (*PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei);
@@ -38,7 +38,7 @@
 #include "servers/rendering/storage/light_storage.h"
 #include "servers/rendering/storage/utilities.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 class RenderSceneBuffersGLES3;

@@ -42,7 +42,7 @@
 #include "servers/rendering/storage/mesh_storage.h"
 #include "servers/rendering/storage/utilities.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 namespace GLES3 {

@@ -38,7 +38,7 @@
 #include "servers/rendering/storage/particles_storage.h"
 #include "servers/rendering/storage/utilities.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 namespace GLES3 {

@@ -35,7 +35,7 @@
 #include "drivers/gles3/effects/glow.h"
 #include "servers/rendering/storage/render_scene_buffers.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 class RenderSceneBuffersGLES3 : public RenderSceneBuffers {
 	GDCLASS(RenderSceneBuffersGLES3, RenderSceneBuffers);
@@ -41,7 +41,7 @@
 #include "servers/rendering/rendering_server_types.h"
 #include "servers/rendering/storage/texture_storage.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 namespace GLES3 {

@@ -35,7 +35,7 @@
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/utilities.h"

-#include "platform_gl.h"
+#include <platform_gl.h>

 namespace GLES3 {

@@ -58,7 +58,6 @@
 #include <MetalFX/MetalFX.hpp>
 #include <spirv_cross.hpp>
 #include <spirv_msl.hpp>
-
 #include <unistd.h>

 // Common scaling multipliers.
@@ -53,6 +53,7 @@
 #include "servers/rendering/rendering_device_driver.h"

 #include <Metal/Metal.hpp>
+
 #include <cstddef>

 /** The buffer index to use for vertex content. */
@@ -34,6 +34,7 @@

 #include <os/signpost.h>
 #include <simd/simd.h>
+
 #include <shared_mutex>
 #include <string>

@@ -36,6 +36,7 @@
 #include "sha256_digest.h"

 #include <CoreFoundation/CoreFoundation.h>
+
 #include <memory>
 #include <optional>

@@ -63,6 +63,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations")
 #include <Metal/Metal.h>
 #endif
 #include <Metal/Metal.hpp>
+
 #include <iterator>

 #pragma mark -
@@ -37,11 +37,10 @@
 #include "core/os/os.h"
 #include "core/templates/sort_array.h"

+#include <objc/message.h>
 #include <os/log.h>
 #include <os/signpost.h>

-#include <objc/message.h>
-
 #pragma mark - Logging

 os_log_t LOG_DRIVER;
@@ -62,9 +62,10 @@
 #include "core/templates/hash_map.h"
 #include "drivers/apple/foundation_helpers.h"

+#include <Metal/Metal.hpp>
 #include <os/log.h>
 #include <os/signpost.h>
-#include <Metal/Metal.hpp>
+
 #include <algorithm>

 #ifndef MTLGPUAddress
@@ -36,6 +36,7 @@
 #include "servers/rendering/rendering_device_driver.h"

 #include <Metal/Metal.hpp>
+
 #include <variant>

 class RenderingShaderContainerFormatMetal;
@@ -30,13 +30,13 @@

 #pragma once

+#include "core/templates/hashfuncs.h"
+#include "core/templates/local_vector.h"
+
 #include <CommonCrypto/CommonDigest.h>
 #include <simd/simd.h>
 #include <zlib.h>

-#include "core/templates/hashfuncs.h"
-#include "core/templates/local_vector.h"
-
 struct SHA256Digest {
 	unsigned char data[CC_SHA256_DIGEST_LENGTH];

@@ -43,6 +43,7 @@
 #include <sys/statfs.h>
 #endif
 #include <sys/statvfs.h>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -41,6 +41,7 @@
 #include <sys/xattr.h>
 #endif
 #include <unistd.h>
+
 #include <cerrno>

 #if defined(TOOLS_ENABLED)
@@ -39,6 +39,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <cerrno>
 #include <csignal>

@@ -44,6 +44,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -78,6 +78,7 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
+
 #include <cerrno>
 #include <csignal>
 #include <cstdio>
@@ -36,8 +36,8 @@
 #include "core/os/os.h"

 #include <functiondiscoverykeys.h>
-
 #include <wrl/client.h>
+
 using Microsoft::WRL::ComPtr;

 // Define IAudioClient3 if not already defined by MinGW headers
@@ -37,9 +37,10 @@
 #include "core/templates/safe_refcount.h"
 #include "servers/audio/audio_server.h"

+#include <windows.h>
+
 #include <audioclient.h>
 #include <mmdeviceapi.h>
-#include <windows.h>

 class AudioDriverWASAPI : public AudioDriver {
 	class AudioDeviceWASAPI {
@@ -31,6 +31,7 @@
 #if defined(WINDOWS_ENABLED)

 #include "dir_access_windows.h"
+
 #include "file_access_windows.h"

 #include "core/os/memory.h"
@@ -38,6 +39,7 @@
 #include "core/string/print_string.h"

 #include <windows.h>
+
 #include <cstdio>
 #include <cwchar>

@@ -36,13 +36,13 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"

+#include <io.h>
 #include <share.h> // _SH_DENYNO
 #include <shlwapi.h>
-
-#include <io.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <tchar.h>
+
 #include <cerrno>
 #include <cwchar>

@@ -34,7 +34,7 @@

 #include <winsock2.h>
 #include <ws2tcpip.h>
-
+// Include winsock2 before iphlpapi.
 #include <iphlpapi.h>

 static IPAddress _sockaddr2ip(struct sockaddr *p_addr) {
@@ -32,10 +32,10 @@

 #include "net_socket_winsock.h"

+#include <mswsock.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>

-#include <mswsock.h>
 // Workaround missing flag in MinGW
 #if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
 #define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
@@ -36,6 +36,7 @@
 #include "servers/audio/audio_server.h"

 #include <windows.h>
+
 #include <wrl/client.h>
 #include <xaudio2.h>

@@ -30,7 +30,6 @@

 #include "animation_track_editor.h"

-#include "animation_track_editor_plugins.h"
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/input/input.h"
@@ -39,6 +38,7 @@
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_bezier_editor.h"
 #include "editor/animation/animation_player_editor_plugin.h"
+#include "editor/animation/animation_track_editor_plugins.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
@@ -30,12 +30,12 @@

 #include "animation_tree_editor_plugin.h"

-#include "animation_blend_space_1d_editor.h"
-#include "animation_blend_space_2d_editor.h"
-#include "animation_blend_tree_editor_plugin.h"
-#include "animation_state_machine_editor.h"
 #include "core/object/callable_mp.h"
 #include "core/string/string_buffer.h"
+#include "editor/animation/animation_blend_space_1d_editor.h"
+#include "editor/animation/animation_blend_space_2d_editor.h"
+#include "editor/animation/animation_blend_tree_editor_plugin.h"
+#include "editor/animation/animation_state_machine_editor.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_bottom_panel.h"
@@ -33,9 +33,9 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
 #include "core/io/plist.h"
+#include "editor/export/lipo.h"
+#include "editor/export/macho.h"
 #include "editor/file_system/editor_paths.h"
-#include "lipo.h"
-#include "macho.h"

 #include "modules/regex/regex.h"

@@ -51,12 +51,12 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
+#include "editor/export/editor_export_plugin.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-#include "editor_export_plugin.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/main/node.h"
 #include "scene/resources/packed_scene.h"
@@ -32,8 +32,8 @@

 #include "core/os/shared_object.h"
 #include "core/variant/typed_array.h"
-#include "editor_export_platform.h"
-#include "editor_export_preset.h"
+#include "editor/export/editor_export_platform.h"
+#include "editor/export/editor_export_preset.h"
 #include "scene/main/node.h"

 class EditorExportPlugin : public RefCounted {
@@ -34,7 +34,6 @@
 #include "core/object/worker_thread_pool.h"
 #include "core/os/condition_variable.h"
 #include "core/templates/rb_set.h"
-
 #include "editor/export/editor_export_plugin.h"

 class ShaderRD;
@@ -31,7 +31,6 @@
 #pragma once

 #include "core/io/resource_importer.h"
-
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
@@ -30,11 +30,11 @@

 #include "resource_importer_texture_atlas.h"

-#include "atlas_import_failed.xpm"
 #include "core/config/project_settings.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/math/geometry_2d.h"
+#include "editor/import/atlas_import_failed.xpm"
 #include "editor/import/editor_atlas_packer.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/bit_map.h"
@@ -51,6 +51,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/mesh.h"
+
 #include "thirdparty/clipper2/include/clipper2/clipper.h"

 #define PRECISION 1
@@ -37,22 +37,19 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "scene/main/scene_tree.h"
-
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_properties.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
-
+#include "scene/main/scene_tree.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"

@@ -30,15 +30,14 @@

 #pragma once

-#include "scene/gui/margin_container.h"
-#include "tile_atlas_view.h"
-
 #include "core/os/thread.h"
 #include "editor/docks/editor_dock.h"
+#include "editor/scene/2d/tiles/tile_atlas_view.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/item_list.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
@@ -30,27 +30,23 @@

 #include "tile_set_atlas_source_editor.h"

-#include "tiles_editor_plugin.h"
-
+#include "core/input/input.h"
+#include "core/math/geometry_2d.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/scene/2d/tiles/tile_set_editor.h"
+#include "editor/scene/2d/tiles/tiles_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
-
-#include "core/input/input.h"
-#include "core/math/geometry_2d.h"
-#include "core/os/keyboard.h"
-
 #include "servers/navigation_2d/navigation_server_2d.h"

 void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::set_id(int p_id) {
@@ -43,7 +43,6 @@
 #include "editor/settings/editor_command_palette.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
@@ -30,13 +30,13 @@

 #pragma once

-#include "atlas_merging_dialog.h"
 #include "editor/docks/editor_dock.h"
+#include "editor/scene/2d/tiles/atlas_merging_dialog.h"
+#include "editor/scene/2d/tiles/tile_proxies_manager_dialog.h"
+#include "editor/scene/2d/tiles/tile_set_atlas_source_editor.h"
+#include "editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h"
 #include "scene/gui/tab_bar.h"
 #include "scene/resources/2d/tile_set.h"
-#include "tile_proxies_manager_dialog.h"
-#include "tile_set_atlas_source_editor.h"
-#include "tile_set_scenes_collection_source_editor.h"

 class AcceptDialog;
 class SpinBox;
@@ -40,7 +40,6 @@
 #include "editor/scene/2d/tiles/tile_set_editor.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
-
 #include "scene/gui/button.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
@@ -31,9 +31,8 @@
 #pragma once

 #include "editor/plugins/editor_plugin.h"
-
-#include "tile_map_layer_editor.h"
-#include "tile_set_editor.h"
+#include "editor/scene/2d/tiles/tile_map_layer_editor.h"
+#include "editor/scene/2d/tiles/tile_set_editor.h"

 class TilesEditorUtils : public Object {
 	GDCLASS(TilesEditorUtils, Object);
@@ -33,7 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/object/callable_mp.h"
 #include "editor/editor_node.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/foldable_container.h"
 #include "scene/gui/subviewport_container.h"
@@ -30,7 +30,6 @@

 #include "curve_editor_plugin.h"

-#include "canvas_item_editor_plugin.h"
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
 #include "core/object/callable_mp.h"
@@ -41,6 +40,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_spin_slider.h"
+#include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/flow_container.h"
@@ -30,10 +30,9 @@

 #pragma once

-#include "editor/script/script_editor_base.h"
-#include "script_editor_plugin.h"
-
 #include "editor/gui/code_editor.h"
+#include "editor/script/script_editor_base.h"
+#include "editor/script/script_editor_plugin.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
@@ -55,7 +55,6 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "editor/translations/editor_translation.h"
 #include "main/main.h"
-#include "modules/regex/regex.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/main/node.h"
@@ -64,6 +63,8 @@
 #include "scene/resources/animation.h"
 #include "servers/display/display_server.h"

+#include "modules/regex/regex.h"
+
 // PRIVATE METHODS

 Ref<EditorSettings> EditorSettings::singleton = nullptr;
@@ -63,8 +63,6 @@
 #include "main/main_timer_sync.h"
 #include "main/performance.h"
 #include "main/splash.gen.h"
-#include "modules/register_module_types.h"
-#include "platform/register_platform_apis.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/property_list_helper.h"
@@ -84,6 +82,9 @@
 #include "servers/text/text_server.h"
 #include "servers/text/text_server_dummy.h"

+#include "modules/register_module_types.h"
+#include "platform/register_platform_apis.h"
+
 // 2D
 #ifndef NAVIGATION_2D_DISABLED
 #include "servers/navigation_2d/navigation_server_2d.h"
@@ -30,12 +30,11 @@

 #include "image_compress_betsy.h"

-#include "betsy_bc1.h"
-
 #include "alpha_stitch.glsl.gen.h"
 #include "bc1.glsl.gen.h"
 #include "bc4.glsl.gen.h"
 #include "bc6h.glsl.gen.h"
+#include "betsy_bc1.h"
 #include "rgb_to_rgba.glsl.gen.h"

 #include "core/config/project_settings.h"
@@ -31,6 +31,7 @@
 #include "camera_android.h"

 #include "core/os/os.h"
+
 #include "platform/android/display_server_android.h"
 #include "platform/android/java_godot_io_wrapper.h"
 #include "platform/android/os_android.h"
@@ -40,6 +40,7 @@
 #include <camera/NdkCameraManager.h>
 #include <camera/NdkCameraMetadataTags.h>
 #include <media/NdkImageReader.h>
+
 #include <optional>

 enum class CameraFacing {
@@ -34,7 +34,6 @@

 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
-
 #include "tests/test_macros.h"

 namespace TestCSG {
@@ -30,10 +30,11 @@

 #include "editor_scene_importer_fbx2gltf.h"

+#include "editor_scene_importer_ufbx.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
-#include "editor_scene_importer_ufbx.h"

 #include "modules/gltf/gltf_document.h"

@@ -30,17 +30,17 @@

 #include "register_types.h"

-#include "../gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "fbx_document.h"

 #include "core/config/engine.h"
 #include "core/object/class_db.h"

+#include "modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scene_importer_fbx2gltf.h"
 #include "editor/editor_scene_importer_ufbx.h"
-
-#include "core/config/engine.h"
+//
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"

@@ -30,8 +30,6 @@

 #include "gdscript.h"

-#include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "gdscript_analyzer.h"
 #include "gdscript_cache.h"
 #include "gdscript_compiler.h"
@@ -40,6 +38,9 @@
 #include "gdscript_tokenizer_buffer.h"
 #include "gdscript_warning.h"

+#include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/gdscript_docgen.h"
 #endif
@@ -52,7 +53,6 @@
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
 #include "core/io/file_access.h"
-
 #include "scene/resources/packed_scene.h"
 #include "scene/scene_string_names.h"

@@ -29,7 +29,6 @@
 /**************************************************************************/

 #include "gdscript.h"
-
 #include "gdscript_analyzer.h"
 #include "gdscript_parser.h"
 #include "gdscript_tokenizer.h"
@@ -32,10 +32,11 @@

 #include "../gdscript.h"
 #include "../gdscript_analyzer.h"
-#include "editor/settings/editor_settings.h"
 #include "gdscript_language_protocol.h"
 #include "gdscript_workspace.h"

+#include "editor/settings/editor_settings.h"
+
 int get_indent_size() {
 	if (EditorSettings::get_singleton()) {
 		return EditorSettings::get_singleton()->get_setting("text_editor/behavior/indent/size");
@@ -30,6 +30,8 @@

 #include "gdscript_language_protocol.h"

+#include "godot_lsp.h"
+
 #include "core/config/project_settings.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
@@ -39,7 +41,6 @@
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
-#include "modules/gdscript/language_server/godot_lsp.h"

 #define LSP_CLIENT_V(m_ret_val) \
 	ERR_FAIL_COND_V(latest_client_id == LSP_NO_CLIENT, m_ret_val); \
@@ -30,10 +30,10 @@

 #pragma once

-#include "core/error/error_macros.h"
 #include "gdscript_extend_parser.h"
 #include "godot_lsp.h"

+#include "core/error/error_macros.h"
 #include "core/variant/variant.h"

 class GDScriptWorkspace : public RefCounted {
@@ -44,7 +44,6 @@
 #include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "scene/resources/packed_scene.h"
-
 #include "tests/test_macros.h"

 namespace GDScriptTests {
@@ -30,9 +30,8 @@

 #pragma once

-#include "gdscript_test_runner.h"
-
 #include "../gdscript_cache.h"
+#include "gdscript_test_runner.h"

 #include "core/io/file_access.h"
 #include "tests/test_macros.h"
@@ -32,8 +32,6 @@

 #ifdef TOOLS_ENABLED

-#include "tests/test_macros.h"
-
 #include "../gdscript.h"
 #include "gdscript_test_runner.h"

@@ -47,6 +45,7 @@
 #include "editor/settings/editor_settings.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
+#include "tests/test_macros.h"

 #include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.

@@ -34,8 +34,7 @@

 #ifndef GDSCRIPT_NO_LSP

-#include "tests/test_macros.h"
-
+#include "../gdscript_analyzer.h"
 #include "../language_server/gdscript_extend_parser.h"
 #include "../language_server/gdscript_language_protocol.h"
 #include "../language_server/gdscript_workspace.h"
@@ -44,8 +43,8 @@

 #include "core/io/dir_access.h"
 #include "editor/file_system/editor_file_system.h"
+#include "tests/test_macros.h"

-#include "modules/gdscript/gdscript_analyzer.h"
 #include "modules/regex/regex.h"

 #include "thirdparty/doctest/doctest.h"
@@ -52,8 +52,7 @@
 #include "editor/editor_scene_exporter_gltf_plugin.h"
 #include "editor/editor_scene_importer_blend.h"
 #include "editor/editor_scene_importer_gltf.h"
-
-#include "core/config/engine.h"
+//
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
@@ -31,7 +31,6 @@
 #pragma once

 #include "gltf_defines.h"
-
 #include "structures/gltf_node.h"
 #include "structures/gltf_skeleton.h"
 #include "structures/gltf_skin.h"
@@ -31,7 +31,6 @@
 #pragma once

 #include "../gltf_defines.h"
-
 #include "gltf_buffer_view.h"

 class GLTFAccessor : public Resource {
@@ -30,9 +30,10 @@

 #pragma once

+#include "gltf_accessor.h"
+
 #include "core/math/expression.h"
 #include "core/variant/typed_array.h"
-#include "gltf_accessor.h"

 // Object model: https://github.com/KhronosGroup/glTF/blob/main/specification/2.0/ObjectModel.adoc
 // KHR_animation_pointer: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_animation_pointer
@@ -34,6 +34,10 @@

 #ifdef TOOLS_ENABLED

+#include "../editor/editor_scene_importer_gltf.h"
+#include "../gltf_document.h"
+#include "../gltf_state.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/object/class_db.h"
@@ -43,10 +47,6 @@
 #include "scene/resources/packed_scene.h"
 #include "tests/test_utils.h"

-#include "modules/gltf/editor/editor_scene_importer_gltf.h"
-#include "modules/gltf/gltf_document.h"
-#include "modules/gltf/gltf_state.h"
-
 namespace TestGltf {

 static Node *gltf_import(const String &p_file) {
@@ -29,6 +29,7 @@
 /**************************************************************************/

 #include "godot_area_2d.h"
+
 #include "godot_body_2d.h"
 #include "godot_space_2d.h"

@@ -29,6 +29,7 @@
 /**************************************************************************/

 #include "godot_area_pair_2d.h"
+
 #include "godot_collision_solver_2d.h"

 bool GodotAreaPair2D::setup(real_t p_step) {
--- a/Show More
+++ b/Show More